From 5e44c4d5d55b17a83b40664a556aee88166b83cc Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 10 Apr 2019 15:30:47 +0300
Subject: [PATCH 001/104] Change versions of welcom module

---
 packages/client/package.json | 2 +-
 packages/server/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index e3b2afa..d69a9ac 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -47,7 +47,7 @@
     "@restapp/i18n-common-react": "^0.1.0",
     "@restapp/module-client-react": "^0.1.0",
     "@restapp/validation-common-react": "^0.1.0",
-    "@restapp/welcome-client-react": "^1.0.0",
+    "@restapp/welcome-client-react": "^0.1.0",
     "antd": "^3.10.0",
     "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.1.1",
diff --git a/packages/server/package.json b/packages/server/package.json
index 5ad2263..8682c08 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -54,7 +54,7 @@
     "@restapp/core-common": "^0.1.0",
     "@restapp/database-server-ts": "^0.1.0",
     "@restapp/testing-server-ts": "^0.1.0",
-    "@restapp/welcome-server-ts": "^1.0.0",
+    "@restapp/welcome-server-ts": "^0.1.0",
     "@types/pdfmake": "^0.1.3",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",

From f020440e8ea616afd27689236a2c8fc319a0868e Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 08:33:28 +0300
Subject: [PATCH 002/104] Create request middleware

---
 modules/core/common/createReduxStore.ts | 37 +++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index de0181c..63a7586 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -8,11 +8,44 @@ export const getStoreReducer = (reducers: any) =>
     ...reducers
   });
 
+const requestMiddleware: Middleware = _state => next => action => {
+  const { type, request, ...rest } = action;
+  if (!request) {
+    return next(action);
+  }
+
+  if (!type) {
+    request();
+    return next(action);
+  }
+
+  const [REQUEST, SUCCESS, FAIL] = type;
+  next({ type: REQUEST, ...rest });
+
+  (async () => {
+    try {
+      const { data } = await request();
+      next({
+        type: SUCCESS,
+        payload: data,
+        ...rest
+      });
+    } catch (error) {
+      next({
+        type: FAIL,
+        payload: error,
+        ...rest
+      });
+    }
+  })();
+};
+
 const createReduxStore = (reducers: Reducer, initialState: DeepPartial<any>, routerMiddleware?: Middleware): Store => {
+  const middleware = routerMiddleware ? [routerMiddleware, requestMiddleware] : [requestMiddleware];
   return createStore(
     getStoreReducer(reducers),
-    initialState, // initial state
-    routerMiddleware ? composeWithDevTools(applyMiddleware(routerMiddleware)) : undefined
+    initialState, // initial state,
+    composeWithDevTools(applyMiddleware(...middleware))
   );
 };
 

From fcba3ef2bd014ae15baeca58e88f17d97e6c93f5 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 08:40:05 +0300
Subject: [PATCH 003/104] Add locales

---
 .../client-react/locales/en/translations.json | 193 ++++++++++++++++++
 modules/user/client-react/locales/index.ts    |   5 +
 .../client-react/locales/ru/translations.json | 191 +++++++++++++++++
 modules/user/client-react/package.json        |   6 +
 4 files changed, 395 insertions(+)
 create mode 100644 modules/user/client-react/locales/en/translations.json
 create mode 100644 modules/user/client-react/locales/index.ts
 create mode 100644 modules/user/client-react/locales/ru/translations.json
 create mode 100644 modules/user/client-react/package.json

diff --git a/modules/user/client-react/locales/en/translations.json b/modules/user/client-react/locales/en/translations.json
new file mode 100644
index 0000000..76234b7
--- /dev/null
+++ b/modules/user/client-react/locales/en/translations.json
@@ -0,0 +1,193 @@
+{
+  "loading": "App is loading...",
+  "navLink": {
+    "users": "Users",
+    "signIn": "Sign In",
+    "logout": "Log out",
+    "profile": "Profile",
+    "editProfile": "Edit profile",
+    "editUser": "Edit user",
+    "forgotPassword": "Forgot password",
+    "register": "Register",
+    "resetPassword": "Reset password"
+  },
+  "forgotPass": {
+    "title": "Forgot password",
+    "meta": "A Forgot Password page example",
+    "errorMsg": "Reset password failed!",
+    "form": {
+      "title": "Password Reset",
+      "submitMsg": "Instructions for resetting your password were emailed to you.",
+      "fldEmail": "Email",
+      "btnSubmit": "Send instructions"
+    }
+  },
+
+  "login": {
+    "title": "Login",
+    "meta": "A Login page example",
+    "errorMsg": "Login failed!",
+    "cardTitle": "Available logins",
+    "notRegText": "Not registered yet?",
+    "fbBtn": "Log in with Facebook",
+    "googleBtn": "Log in with Google",
+    "githubBtn": "Log in with GitHub",
+    "linkedinBtn": "Log in with LinkedIn",
+    "form": {
+      "title": "Sign In",
+      "field": {
+        "usernameOrEmail": "Username or Email",
+        "pass": "Password"
+      },
+      "btnSubmit": "Login"
+    },
+    "btn": {
+      "forgotPass": "Forgot your password?",
+      "notReg": "Not registered yet?",
+      "sign": "Sign Up"
+    }
+  },
+
+  "profile": {
+    "title": "Profile",
+    "headerText": "Profile info",
+    "meta": "A Profile page example",
+    "loadMsg": "Loading...",
+    "errorMsg": "No current user is logged in",
+    "editProfileText": "Edit Profile",
+    "card": {
+      "title": "Profile",
+      "group": {
+        "name": "User Name",
+        "email": "Email",
+        "role": "Role",
+        "full": "Full Name"
+      },
+      "fldEmail": "Email",
+      "btnSubmit": "Send instructions"
+    }
+  },
+
+  "reg": {
+    "title": "Register",
+    "meta": "A Registration page example",
+    "errorMsg": "Registration failed!",
+    "form": {
+      "title": "Sign Up",
+      "field": {
+        "name": "Username",
+        "email": "Email",
+        "pass": "Password",
+        "passConf": "Password Confirmation"
+      },
+      "btnSubmit": "Register"
+    },
+    "confirmationMsgTitle": "Verify Your Email Address",
+    "confirmationMsgBody": "We now need to verify your email address. We've sent you the email. Please click the link in that email to continue. ",
+    "confirmationBtn": "Go back to Login page",
+    "successRegTitle": "Email Has Been Verified Successfully",
+    "successRegBody": "Your email has been verified successfully. You can sign in using your login and password."
+  },
+
+  "resetPass": {
+    "title": "Reset password",
+    "meta": "A Reset Password page example",
+    "errorMsg": "Password reset failed!",
+    "form": {
+      "title": "Reset Password",
+      "field": {
+        "pass": "Password",
+        "passConf": "Password Confirmation"
+      },
+      "btnSubmit": "Reset password"
+    }
+  },
+
+  "userEdit": {
+    "title": "Edit User",
+    "meta": "An Edit User page example",
+    "errorMsg": "User editing failed!",
+    "loadMsg": "Loading...",
+    "form": {
+      "title": "User",
+      "titleEdit": "Edit",
+      "titleCreate": "Create",
+      "field": {
+        "name": "Username",
+        "email": "Email",
+        "role": {
+          "label": "Role",
+          "user": "user",
+          "admin": "admin"
+        },
+        "active": "Is Active",
+        "firstName": "First Name",
+        "lastName": "Last Name",
+        "pass": "Password",
+        "passConf": "Password Confirmation"
+      },
+      "btnSubmit": "Save"
+    },
+    "select": {
+      "okText": "Done",
+      "dismissText": "Cancel"
+    },
+    "btnBack": "Back"
+  },
+  "userAdd": {
+    "errorMsg": "Add user failed!"
+  },
+
+  "users": {
+    "title": "Users",
+    "meta": "A User List page example",
+    "loadMsg": "Loading...",
+    "list": {
+      "title": "Users",
+      "item": {
+        "filter": "Filter",
+        "search": "Search ...",
+        "role": {
+          "label": "Role",
+          "all": "All",
+          "user": "user",
+          "admin": "admin"
+        },
+        "active": "Is Active"
+      }
+    },
+    "select": {
+      "okText": "Done",
+      "dismissText": "Cancel"
+    },
+    "btnModalSubmit": "Submit",
+    "btnModalClose": "Close",
+    "orderByText": "Order by",
+    "column": {
+      "name": "Username",
+      "email": "Email",
+      "role": "Role",
+      "active": "Is Active",
+      "actions": "Actions"
+    },
+    "btn": {
+      "add": "Add user",
+      "delete": "Delete"
+    }
+  },
+
+  "nativeMock": "Hello, ",
+  "mobile": {
+    "login": {
+      "usernameOrEmail": {
+        "label": "Username or Email",
+        "placeholder": "Enter Your Username or Email"
+      },
+      "pass": {
+        "label": "Password",
+        "placeholder": "Enter Your Password"
+      }
+    },
+    "logout": "Log out"
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/locales/index.ts b/modules/user/client-react/locales/index.ts
new file mode 100644
index 0000000..d9fb121
--- /dev/null
+++ b/modules/user/client-react/locales/index.ts
@@ -0,0 +1,5 @@
+/*
+ * The index.js can be empty, it's just needed to point the loader to the root directory of the locales.
+ * https://github.com/alienfast/i18next-loader#option-2-use-with-import-syntax
+ */
+export default {};
diff --git a/modules/user/client-react/locales/ru/translations.json b/modules/user/client-react/locales/ru/translations.json
new file mode 100644
index 0000000..80f778d
--- /dev/null
+++ b/modules/user/client-react/locales/ru/translations.json
@@ -0,0 +1,191 @@
+{
+  "loading": "Приложение загружается...",
+  "navLink": {
+    "users": "Пользователи",
+    "sign": "Вход в систему",
+    "logout": "Выход",
+    "profile": "Профиль",
+    "editProfile": "Редактирование профиля",
+    "editUser": "Редактирование пользователя",
+    "forgotPassword": "Забыли пароль",
+    "register": "Регистрация",
+    "resetPassword": "Сброс пароля"
+  },
+  "forgotPass": {
+    "title": "Забыли пароль",
+    "meta": "Пример страницы Забыли пароль?",
+    "errorMsg": "Сброс пароля не выполнен!",
+    "form": {
+      "title": "Сброс пароля",
+      "submitMsg": "Инструкции по сбросу пароля были отправлены вам на электронную почту.",
+      "fldEmail": "Электронная почта",
+      "btnSubmit": "Отправить инструкции"
+    }
+  },
+
+  "login": {
+    "title": "Вход",
+    "meta": "Пример страницы с входом",
+    "errorMsg": "Ошибка входа!",
+    "cardTitle": "Доступные учетные записи",
+    "notRegText": "Ещё не зарегистрированы?",
+    "fbBtn": "Войти через Facebook",
+    "googleBtn": "Войти через Google",
+    "githubBtn": "Войти через GitHub",
+    "linkedinBtn": "Войти через LinkedIn",
+    "form": {
+      "title": "Вход в систему",
+      "field": {
+        "usernameOrEmail": "Имя пользователя или эл.почта",
+        "pass": "Пароль"
+      },
+      "btnSubmit": "Войти"
+    },
+    "btn": {
+      "forgotPass": "Забыли пароль?",
+      "notReg": "Ещё не зарегистрированы?",
+      "sign": "Зарегистрироваться"
+    }
+  },
+
+  "profile": {
+    "title": "Профиль",
+    "headerText": "Информация о профиле",
+    "meta": "Пример страницы с профилем",
+    "loadMsg": "Загрузка...",
+    "errorMsg": "Нет текущего пользователя",
+    "editProfileText": "Редактировать профиль",
+    "card": {
+      "title": "Профиль",
+      "group": {
+        "name": "Имя пользователя",
+        "email": "Электронная почта",
+        "role": "Роль",
+        "full": "Полное имя"
+      }
+    }
+  },
+
+  "reg": {
+    "title": "Регистрация",
+    "meta": "Пример страницы с регистрацией",
+    "errorMsg": "Ошибка регистрации!",
+    "form": {
+      "title": "Регистрация",
+      "field": {
+        "name": "Имя пользователя",
+        "email": "Электронная почта",
+        "pass": "Пароль",
+        "passConf": "Подтверждение пароля"
+      },
+      "btnSubmit": "Зарегистрироваться"
+    },
+    "confirmationMsgTitle": "Подтвердите свой адрес электронной почты",
+    "confirmationMsgBody": "Теперь нам нужно подтвердить ваш адрес электронной почты. Мы отправили вам электронное письмо. Пожалуйста, нажмите на ссылку в этом письме, чтобы продолжить.",
+    "confirmationBtn": "Вернуться на страница регистрации",
+    "successRegTitle": "Адрес электронной почты был успешно подтвержден",
+    "successRegBody": "Ваш адрес электронной почты был успешно подтвержден. Вы можете войти в приложение, используя свой логин и пароль."
+  },
+
+  "resetPass": {
+    "title": "Сброс пароля",
+    "meta": "Пример страницы со сбросом пароля",
+    "errorMsg": "Сброс пароля не выполнен!",
+    "form": {
+      "title": "Сброс пароля",
+      "field": {
+        "pass": "Пароля",
+        "passConf": "Подтверждение пароля"
+      },
+      "btnSubmit": "Сбросить пароль"
+    }
+  },
+
+  "userEdit": {
+    "title": "Редактирование пользователя",
+    "meta": "Пример страницы с редактированием пользователя",
+    "errorMsg": "Не удалось изменить пользователя!",
+    "loadMsg": "Загрузка...",
+    "form": {
+      "title": "пользователя",
+      "titleEdit": "Редактировать",
+      "titleCreate": "Создать",
+      "field": {
+        "name": "Имя пользователя",
+        "email": "Электронная почта",
+        "role": {
+          "label": "Роль",
+          "user": "пользователь",
+          "admin": "админ"
+        },
+        "active": "Активен",
+        "firstName": "Имя",
+        "lastName": "Фамилия",
+        "pass": "Пароль",
+        "passConf": "Подтверждение пароля"
+      },
+      "btnSubmit": "Сохранить"
+    },
+    "select": {
+      "okText": "Подтвердить",
+      "dismissText": "Отмена"
+    },
+    "btnBack": "Назад"
+  },
+  "userAdd": {
+    "errorMsg": "Не удалось добавить пользователя!"
+  },
+
+  "users": {
+    "title": "Список пользователей",
+    "meta": "Пример страницы со списком пользователей",
+    "loadMsg": "Загрузка...",
+    "list": {
+      "title": "Список пользователей",
+      "item": {
+        "filter": "Фильтр",
+        "search": "Поиск ...",
+        "role": {
+          "label": "Роль",
+          "all": "Все",
+          "user": "пользователь",
+          "admin": "админ"
+        },
+        "active": "Активен"
+      }
+    },
+    "select": {
+      "okText": "Подтвердить",
+      "dismissText": "Отмена"
+    },
+    "btnModalSubmit": "Сохранить",
+    "btnModalClose": "Закрыть",
+    "orderByText": "Сортировать",
+    "column": {
+      "name": "Имя пользователя",
+      "email": "Электронная почта",
+      "role": "Роль",
+      "active": "Активен",
+      "actions": "Действия"
+    },
+    "btn": {
+      "add": "Добавить пользователя",
+      "delete": "Удалить"
+    }
+  },
+
+  "nativeMock": "Привет, ",
+  "mobile": {
+    "login": {
+      "usernameOrEmail": {
+        "label": "Имя пользователя или email",
+        "placeholder": "Введите имя пользователя или эл.почту"
+      },
+      "pass": {
+        "label": "Пароль",
+        "placeholder": "Введите пароль"
+      }
+    },
+    "logout": "Выйти"
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/package.json b/modules/user/client-react/package.json
new file mode 100644
index 0000000..526f145
--- /dev/null
+++ b/modules/user/client-react/package.json
@@ -0,0 +1,6 @@
+
+{
+  "name": "@restapp/user-client-react",
+  "version": "0.1.0",
+  "private": true
+}
\ No newline at end of file

From e65edd9bb83704489bdd8cee5a4fdc0409e4bc88 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 08:55:39 +0300
Subject: [PATCH 004/104] Add auth base components

---
 .../client-react/containers/Auth.native.tsx   |  1 +
 modules/user/client-react/containers/Auth.tsx | 41 ++++++++++++
 .../user/client-react/containers/AuthBase.tsx | 67 +++++++++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 modules/user/client-react/containers/Auth.native.tsx
 create mode 100644 modules/user/client-react/containers/Auth.tsx
 create mode 100644 modules/user/client-react/containers/AuthBase.tsx

diff --git a/modules/user/client-react/containers/Auth.native.tsx b/modules/user/client-react/containers/Auth.native.tsx
new file mode 100644
index 0000000..b8bad20
--- /dev/null
+++ b/modules/user/client-react/containers/Auth.native.tsx
@@ -0,0 +1 @@
+export * from './AuthBase';
diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
new file mode 100644
index 0000000..08f7122
--- /dev/null
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -0,0 +1,41 @@
+import * as React from 'react';
+import { Route, Redirect, RouteComponentProps } from 'react-router-dom';
+import { withLoadedUser } from './AuthBase';
+import { UserRole, User } from '..';
+import { WithUserProps } from './AuthBase';
+
+interface AuthRouteProps extends WithUserProps {
+  role?: UserRole | UserRole[];
+  redirect?: string;
+  redirectOnLoggedIn?: boolean;
+  component?: React.ComponentType<RouteComponentProps<any>> | React.ComponentType<any>;
+}
+
+const AuthRoute: React.ComponentType<AuthRouteProps> = withLoadedUser(
+  ({ currentUser, role, redirect = '/register', redirectOnLoggedIn, component: Component, ...rest }) => {
+    const RenderComponent: React.FunctionComponent<any> = props => {
+      // The users is not logged in
+      if (redirectOnLoggedIn && currentUser) {
+        return <Redirect to={{ pathname: redirect }} />;
+      }
+
+      return isRoleMatch(role, currentUser) ? (
+        <Component currentUser={currentUser} {...props} {...rest} />
+      ) : (
+        <Redirect to={{ pathname: redirect }} />
+      );
+    };
+
+    return <Route {...rest} render={RenderComponent} />;
+  }
+);
+
+const isRoleMatch = (role: UserRole | UserRole[], currentUser: User) => {
+  if (!role) {
+    return true;
+  }
+  return currentUser && (Array.isArray(role) ? role : [role]).includes(currentUser.role);
+};
+
+export * from './AuthBase';
+export { AuthRoute };
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
new file mode 100644
index 0000000..cf6f1d1
--- /dev/null
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -0,0 +1,67 @@
+import * as React from 'react';
+import { RouteProps } from 'react-router';
+import { History } from 'history';
+import { connect } from 'react-redux';
+import { CURRENT_USER } from '../actions';
+import { User, UserRole } from '..';
+import { ActionType } from '../reducers';
+
+export interface WithUserProps extends RouteProps {
+  currentUser?: User;
+  currentUserLoading?: boolean;
+  refetchCurrentUser?: any;
+  children?: Element | any;
+  getCurrentUser?: () => void;
+}
+
+interface IfLoggedInComponent {
+  role?: UserRole | UserRole[];
+  currentUser?: User;
+  refetchCurrentUser?: any;
+  elseComponent?: Element | any;
+  children?: Element | any;
+}
+
+export interface WithLogoutProps extends WithUserProps {
+  logout?: () => void;
+  history?: History;
+  clearUser?: () => void;
+}
+
+const withUser = (Component: React.ComponentType<any>) => {
+  const WithUser = ({ currentUser, ...rest }: WithUserProps) => {
+    return <Component currentUser={currentUser} {...rest} />;
+  };
+  return connect(({ user: { loading, currentUser } }: any) => ({
+    currentUserLoading: loading,
+    currentUser
+  }))(WithUser);
+};
+
+const hasRole = (role: UserRole | UserRole[], currentUser: User) => {
+  return currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
+};
+
+const withLoadedUser = (Component: React.ComponentType<any>) => {
+  const WithLoadedUser = ({ currentUserLoading, ...props }: WithUserProps) => {
+    return currentUserLoading ? null : <Component {...props} />;
+  };
+
+  return withUser(WithLoadedUser);
+};
+
+const IfNotLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({
+  currentUser,
+  children,
+  refetchCurrentUser,
+  ...restProps
+}) =>
+  !currentUser
+    ? React.cloneElement(children, {
+        ...restProps
+      })
+    : null;
+
+const IfNotLoggedIn: React.ComponentType<IfLoggedInComponent> = withLoadedUser(IfNotLoggedInComponent);
+
+export { withUser, hasRole, withLoadedUser, IfNotLoggedIn };

From 907aad71167368b78daeaad4fe82cff7b1823ea2 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 09:01:11 +0300
Subject: [PATCH 005/104] Add Data root component

---
 .../containers/DataRootComponent.native.tsx           |  9 +++++++++
 .../client-react/containers/DataRootComponent.tsx     | 11 +++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 modules/user/client-react/containers/DataRootComponent.native.tsx
 create mode 100644 modules/user/client-react/containers/DataRootComponent.tsx

diff --git a/modules/user/client-react/containers/DataRootComponent.native.tsx b/modules/user/client-react/containers/DataRootComponent.native.tsx
new file mode 100644
index 0000000..9684a75
--- /dev/null
+++ b/modules/user/client-react/containers/DataRootComponent.native.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+class DataRootComponent extends React.Component {
+  public render() {
+    return this.props.children;
+  }
+}
+
+export default DataRootComponent;
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
new file mode 100644
index 0000000..4dc0f40
--- /dev/null
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -0,0 +1,11 @@
+import * as React from 'react';
+
+interface DataRootComponent {
+  children?: Element | any;
+}
+
+const DataRootComponent: React.FunctionComponent<DataRootComponent> = props => {
+  return props.children;
+};
+
+export default DataRootComponent;

From 84ed7076dd6a1eaf65395496f971d57159b2c7b6 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 09:31:28 +0300
Subject: [PATCH 006/104] Add config

---
 config/auth.js  | 8 ++++++++
 config/index.js | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 config/auth.js

diff --git a/config/auth.js b/config/auth.js
new file mode 100644
index 0000000..68329a8
--- /dev/null
+++ b/config/auth.js
@@ -0,0 +1,8 @@
+export default {
+  password: {
+    requireEmailConfirmation: false,
+    sendPasswordChangesEmail: false,
+    minLength: 8,
+    enabled: true
+  }
+};
diff --git a/config/index.js b/config/index.js
index 1cab3e5..a420c20 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,4 +1,5 @@
 export { default as app } from './app';
+export { default as auth } from './auth';
 export { default as db } from './db';
 export { default as mailer } from './mailer';
 export { default as analytics } from './analytics';

From 236aff7ade5a53d7b120ade3e025078216f6d16c Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 09:32:32 +0300
Subject: [PATCH 007/104] Add universalcoockie interface

---
 modules/module/client-react/BaseModule.ts        |  6 +++++-
 .../user/client-react/containers/AuthBase.tsx    | 16 +++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/modules/module/client-react/BaseModule.ts b/modules/module/client-react/BaseModule.ts
index f9cdda3..8fd9aca 100644
--- a/modules/module/client-react/BaseModule.ts
+++ b/modules/module/client-react/BaseModule.ts
@@ -4,10 +4,14 @@ import { ReducersMapObject } from 'redux';
 
 import CommonModule, { CommonModuleShape } from '@restapp/module-common';
 
+interface UniversalCookieRequest {
+  universalCookies?: any;
+}
+
 /**
  * A function that creates React Element that wraps root element of a React tree
  */
-type RootComponentFactory = (req: Request) => React.ReactElement<any>;
+type RootComponentFactory = (req: Request & UniversalCookieRequest) => React.ReactElement<any>;
 
 /**
  * Common module interface for React and React Native feature modules.
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index cf6f1d1..cbaefcf 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -2,9 +2,7 @@ import * as React from 'react';
 import { RouteProps } from 'react-router';
 import { History } from 'history';
 import { connect } from 'react-redux';
-import { CURRENT_USER } from '../actions';
 import { User, UserRole } from '..';
-import { ActionType } from '../reducers';
 
 export interface WithUserProps extends RouteProps {
   currentUser?: User;
@@ -50,17 +48,9 @@ const withLoadedUser = (Component: React.ComponentType<any>) => {
   return withUser(WithLoadedUser);
 };
 
-const IfNotLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({
-  currentUser,
-  children,
-  refetchCurrentUser,
-  ...restProps
-}) =>
-  !currentUser
-    ? React.cloneElement(children, {
-        ...restProps
-      })
-    : null;
+const IfNotLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({ currentUser, children }) => {
+  return !currentUser ? React.cloneElement(children, {}) : null;
+};
 
 const IfNotLoggedIn: React.ComponentType<IfLoggedInComponent> = withLoadedUser(IfNotLoggedInComponent);
 

From 4393437ae1d83f2600075a9fb53b2f292bcc2295 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 09:33:48 +0300
Subject: [PATCH 008/104] Add register functionality with reducers

---
 modules/user/client-react/actions/index.ts    |   3 +
 modules/user/client-react/actions/register.ts |   6 +
 .../client-react/components/RegisterForm.tsx  |  70 +++++++++++
 .../client-react/components/RegisterView.tsx  |  55 +++++++++
 .../user/client-react/containers/Register.tsx |  46 +++++++
 modules/user/client-react/index.tsx           | 112 ++++++++++++++++++
 modules/user/client-react/reducers/index.ts   |  52 ++++++++
 packages/client/src/modules.ts                |   3 +-
 8 files changed, 346 insertions(+), 1 deletion(-)
 create mode 100644 modules/user/client-react/actions/index.ts
 create mode 100644 modules/user/client-react/actions/register.ts
 create mode 100644 modules/user/client-react/components/RegisterForm.tsx
 create mode 100644 modules/user/client-react/components/RegisterView.tsx
 create mode 100644 modules/user/client-react/containers/Register.tsx
 create mode 100644 modules/user/client-react/index.tsx
 create mode 100644 modules/user/client-react/reducers/index.ts

diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
new file mode 100644
index 0000000..98c39af
--- /dev/null
+++ b/modules/user/client-react/actions/index.ts
@@ -0,0 +1,3 @@
+import REGISTER from './register';
+
+export { REGISTER };
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
new file mode 100644
index 0000000..7fd53e1
--- /dev/null
+++ b/modules/user/client-react/actions/register.ts
@@ -0,0 +1,6 @@
+import axios from 'axios';
+import { RegisterSubmitProps } from '..';
+
+const REGISTER = async (value: RegisterSubmitProps) => axios.post(`${__API_URL__}/register`, { ...value });
+
+export default REGISTER;
diff --git a/modules/user/client-react/components/RegisterForm.tsx b/modules/user/client-react/components/RegisterForm.tsx
new file mode 100644
index 0000000..e4067b5
--- /dev/null
+++ b/modules/user/client-react/components/RegisterForm.tsx
@@ -0,0 +1,70 @@
+import * as React from 'react';
+import { withFormik } from 'formik';
+import { isFormError, FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate } from '@restapp/i18n-client-react';
+
+import { match, email, minLength, required, validate } from '@restapp/validation-common-react';
+import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
+
+import { FormProps, RegisterSubmitProps } from '..';
+import settings from '../../../../settings';
+
+const registerFormSchema = {
+  username: [required, minLength(3)],
+  email: [required, email],
+  password: [required, minLength(settings.auth.password.minLength)],
+  passwordConfirmation: [match('password'), required, minLength(settings.auth.password.minLength)]
+};
+
+const RegisterForm = ({ values, handleSubmit, submitting, errors, t }: FormProps<RegisterSubmitProps>) => {
+  return (
+    <Form name="register" onSubmit={handleSubmit}>
+      <Field
+        name="username"
+        component={RenderField}
+        type="text"
+        label={t('reg.form.field.name')}
+        value={values.username}
+      />
+      <Field name="email" component={RenderField} type="text" label={t('reg.form.field.email')} value={values.email} />
+      <Field
+        name="password"
+        component={RenderField}
+        type="password"
+        label={t('reg.form.field.pass')}
+        value={values.password}
+      />
+      <Field
+        name="passwordConfirmation"
+        component={RenderField}
+        type="password"
+        label={t('reg.form.field.passConf')}
+        value={values.passwordConfirmation}
+      />
+      <div className="text-center">
+        {errors && errors.errorMsg && <Alert color="error">{errors.errorMsg}</Alert>}
+        <Button color="primary" type="submit" disabled={submitting}>
+          {t('reg.form.btnSubmit')}
+        </Button>
+      </div>
+    </Form>
+  );
+};
+
+const RegisterFormWithFormik = withFormik<FormProps<RegisterSubmitProps>, RegisterSubmitProps>({
+  mapPropsToValues: () => ({ username: '', email: '', password: '', passwordConfirmation: '' }),
+  validate: values => validate(values, registerFormSchema),
+  async handleSubmit(values, { setErrors, props: { onSubmit } }) {
+    onSubmit(values).catch((e: any) => {
+      if (isFormError(e)) {
+        setErrors(e.errors);
+      } else {
+        throw e;
+      }
+    });
+  },
+  enableReinitialize: true,
+  displayName: 'SignUpForm' // helps with React DevTools
+});
+
+export default translate('user')(RegisterFormWithFormik(RegisterForm));
diff --git a/modules/user/client-react/components/RegisterView.tsx b/modules/user/client-react/components/RegisterView.tsx
new file mode 100644
index 0000000..5578ca5
--- /dev/null
+++ b/modules/user/client-react/components/RegisterView.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react';
+import Helmet from 'react-helmet';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText } from '@restapp/look-client-react';
+
+import RegisterForm from '../components/RegisterForm';
+
+import settings from '../../../../settings';
+
+import { RegisterSubmitProps } from '..';
+
+interface RegisterViewProps {
+  t: TranslateFunction;
+  onSubmit: (values: RegisterSubmitProps) => void;
+  isRegistered: boolean;
+}
+
+const RegisterView = ({ t, onSubmit, isRegistered }: RegisterViewProps) => {
+  const renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - ${t('reg.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('reg.meta')}`
+        }
+      ]}
+    />
+  );
+
+  const renderConfirmationModal = () => (
+    <Card>
+      <CardGroup style={{ textAlign: 'center' }}>
+        <CardTitle>{t('reg.confirmationMsgTitle')}</CardTitle>
+        <CardText>{t('reg.confirmationMsgBody')}</CardText>
+      </CardGroup>
+    </Card>
+  );
+
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      <LayoutCenter>
+        <h1 className="text-center">{t('reg.form.title')}</h1>
+        {isRegistered && settings.auth.password.requireEmailConfirmation ? (
+          renderConfirmationModal()
+        ) : (
+          <RegisterForm onSubmit={onSubmit} />
+        )}
+      </LayoutCenter>
+    </PageLayout>
+  );
+};
+
+export default translate('user')(RegisterView);
diff --git a/modules/user/client-react/containers/Register.tsx b/modules/user/client-react/containers/Register.tsx
new file mode 100644
index 0000000..b514064
--- /dev/null
+++ b/modules/user/client-react/containers/Register.tsx
@@ -0,0 +1,46 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+
+import RegisterView from '../components/RegisterView';
+
+import { CommonProps, RegisterSubmitProps } from '..';
+import { REGISTER } from '../actions';
+import settings from '../../../../settings';
+
+interface RegisterProps extends CommonProps {
+  register: (values: RegisterSubmitProps) => void;
+}
+
+const Register: React.FunctionComponent<RegisterProps> = props => {
+  const { t, register, history } = props;
+
+  const [isRegistered, setIsRegistered] = React.useState(false);
+
+  const onSubmit = async (values: RegisterSubmitProps) => {
+    try {
+      await register(values);
+      if (!settings.auth.password.requireEmailConfirmation) {
+        history.push('/');
+      } else {
+        setIsRegistered(true);
+      }
+    } catch (e) {
+      throw new FormError(t('reg.errorMsg'), e);
+    }
+  };
+
+  return <RegisterView {...props} isRegistered={isRegistered} onSubmit={onSubmit} />;
+};
+
+export default connect(
+  _state => ({}),
+  dispatch => ({
+    register: (value: RegisterSubmitProps) =>
+      dispatch({
+        type: null,
+        request: () => REGISTER(value)
+      })
+  })
+)(translate('user')(Register));
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
new file mode 100644
index 0000000..8014aad
--- /dev/null
+++ b/modules/user/client-react/index.tsx
@@ -0,0 +1,112 @@
+import * as React from 'react';
+import * as H from 'history';
+import { CookiesProvider } from 'react-cookie';
+import { NavLink } from 'react-router-dom';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { MenuItem } from '@restapp/look-client-react';
+import ClientModule from '@restapp/module-client-react';
+import { FormikErrors } from 'formik';
+
+import resources from './locales';
+import DataRootComponent from './containers/DataRootComponent';
+import Register from './containers/Register';
+
+import reducers from './reducers';
+
+import { AuthRoute, IfNotLoggedIn } from './containers/Auth';
+
+export enum UserRole {
+  admin = 'admin',
+  user = 'user'
+}
+
+export interface UserProfile {
+  fullName?: string;
+  firstName?: string;
+  lastName?: string;
+}
+
+export interface User {
+  id?: number | string;
+  username: string;
+  role: UserRole;
+  isActive: boolean;
+  email: string;
+  profile?: UserProfile;
+  auth?: any;
+}
+
+export interface LoginSubmitProps {
+  usernameOrEmail: string;
+  password: string;
+}
+export interface ResetPasswordSubmitProps {
+  password: string;
+  passwordConfirmation: string;
+}
+export interface ForgotPasswordSubmitProps {
+  email: string;
+}
+
+export interface RegisterSubmitProps {
+  username: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+}
+
+export interface CommonProps {
+  t?: TranslateFunction;
+  history?: H.History;
+}
+
+interface HandleSubmitProps<P> {
+  setErrors: (errors: FormikErrors<P>) => void;
+  props: P;
+}
+
+interface Errors {
+  errorMsg?: string;
+}
+export interface FormProps<V> {
+  handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;
+  onSubmit: (values: V) => Promise<void> | void | any;
+  submitting?: boolean;
+  errors: Errors;
+  values: V;
+  t?: TranslateFunction;
+}
+
+export interface OrderBy {
+  column: string;
+  order: string;
+}
+
+export interface Filter {
+  searchText: string;
+  role: string;
+  isActive: boolean;
+}
+
+export * from './containers/Auth';
+
+const NavLinkLoginWithI18n = translate('user')(({ t }: any) => (
+  <NavLink to="/register" className="nav-link" activeClassName="active">
+    {t('navLink.signUp')}
+  </NavLink>
+));
+
+export default new ClientModule({
+  route: [<AuthRoute exact path="/register" component={Register} />],
+  navItemRight: [
+    <IfNotLoggedIn key="/register">
+      <MenuItem>
+        <NavLinkLoginWithI18n />
+      </MenuItem>
+    </IfNotLoggedIn>
+  ],
+  localization: [{ ns: 'user', resources }],
+  reducer: [{ user: reducers }],
+  dataRootComponent: [DataRootComponent],
+  rootComponentFactory: [req => (req ? <CookiesProvider cookies={req.universalCookies} /> : <CookiesProvider />)]
+});
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
new file mode 100644
index 0000000..11df66c
--- /dev/null
+++ b/modules/user/client-react/reducers/index.ts
@@ -0,0 +1,52 @@
+import { User } from '..';
+
+export enum ActionType {
+  SET_CURRENT_USER = 'SET_CURRENT_USER',
+  CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
+  SET_LOADING = 'SET_LOADING'
+}
+
+export interface UserModuleState {
+  currentUser: User;
+  loading: boolean;
+}
+
+export interface UserModuleActionProps {
+  type: ActionType | ActionType[];
+  payload?: any;
+  request?: () => Promise<any>;
+  [key: string]: any;
+}
+
+const defaultState: UserModuleState = {
+  currentUser: null,
+  loading: false
+};
+
+export default function(state = defaultState, action: UserModuleActionProps) {
+  switch (action.type) {
+    case ActionType.SET_LOADING:
+      return {
+        ...state,
+        loading: true
+      };
+
+    case ActionType.CLEAR_CURRENT_USER:
+      return {
+        ...state,
+        currentUser: null,
+        loading: false,
+        ...action.payload
+      };
+
+    case ActionType.SET_CURRENT_USER:
+      return {
+        ...state,
+        currentUser: action.payload,
+        loading: false
+      };
+
+    default:
+      return state;
+  }
+}
diff --git a/packages/client/src/modules.ts b/packages/client/src/modules.ts
index 85cdc5c..3e3038d 100644
--- a/packages/client/src/modules.ts
+++ b/packages/client/src/modules.ts
@@ -1,4 +1,5 @@
 import welcome from '@restapp/welcome-client-react';
+import user from '@restapp/user-client-react';
 import core from '@restapp/core-client-react';
 import look from '@restapp/look-client-react';
 import i18n from '@restapp/i18n-client-react';
@@ -9,6 +10,6 @@ import '@restapp/favicon-common';
 
 const pageNotFound = require('@restapp/page-not-found-client-react').default;
 
-const modules = new ClientModule(welcome, look, validation, defaultRouter, i18n, pageNotFound, core);
+const modules = new ClientModule(user, welcome, look, validation, defaultRouter, i18n, pageNotFound, core);
 
 export default modules;

From e404dda868671dc7175141e279b6919228b0395b Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 09:57:50 +0300
Subject: [PATCH 009/104] Add register functionality for mobile app

---
 .../components/RegisterForm.native.tsx        | 102 ++++++++++++
 .../components/RegisterView.native.tsx        |  69 ++++++++
 .../containers/Register.native.tsx            |  70 ++++++++
 .../containers/UserScreenNavigator.native.tsx |  89 ++++++++++
 modules/user/client-react/index.native.tsx    | 156 ++++++++++++++++++
 packages/mobile/src/modules.ts                |   3 +-
 6 files changed, 488 insertions(+), 1 deletion(-)
 create mode 100644 modules/user/client-react/components/RegisterForm.native.tsx
 create mode 100644 modules/user/client-react/components/RegisterView.native.tsx
 create mode 100644 modules/user/client-react/containers/Register.native.tsx
 create mode 100644 modules/user/client-react/containers/UserScreenNavigator.native.tsx
 create mode 100644 modules/user/client-react/index.native.tsx

diff --git a/modules/user/client-react/components/RegisterForm.native.tsx b/modules/user/client-react/components/RegisterForm.native.tsx
new file mode 100644
index 0000000..9623215
--- /dev/null
+++ b/modules/user/client-react/components/RegisterForm.native.tsx
@@ -0,0 +1,102 @@
+import * as React from 'react';
+import { View, StyleSheet } from 'react-native';
+import { withFormik } from 'formik';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
+import { isFormError, FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate } from '@restapp/i18n-client-react';
+
+import { RenderField, Button, primary, FormView } from '@restapp/look-client-react-native';
+import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
+import { match, email, minLength, required, validate } from '@restapp/validation-common-react';
+
+import settings from '../../../../settings';
+
+import { FormProps, RegisterSubmitProps } from '../index.native';
+
+const registerFormSchema = {
+  username: [required, minLength(3)],
+  email: [required, email],
+  password: [required, minLength(settings.auth.password.minLength)],
+  passwordConfirmation: [match('password'), required, minLength(settings.auth.password.minLength)]
+};
+
+const RegisterForm = ({ values, handleSubmit, t }: FormProps<RegisterSubmitProps>) => {
+  return (
+    <FormView contentContainerStyle={{ flexGrow: 1 }} style={styles.formView}>
+      <View style={styles.formContainer}>
+        <Field
+          name="username"
+          component={RenderField}
+          type="text"
+          placeholder={t('reg.form.field.name')}
+          value={values.username}
+          placeholderTextColor={placeholderColor}
+        />
+        <Field
+          name="email"
+          component={RenderField}
+          type="email"
+          placeholder={t('reg.form.field.email')}
+          value={values.email}
+          keyboardType="email-address"
+          placeholderTextColor={placeholderColor}
+        />
+        <Field
+          name="password"
+          component={RenderField}
+          type="password"
+          placeholder={t('reg.form.field.pass')}
+          value={values.password}
+          secureTextEntry={true}
+          placeholderTextColor={placeholderColor}
+        />
+        <Field
+          name="passwordConfirmation"
+          component={RenderField}
+          type="password"
+          placeholder={t('reg.form.field.passConf')}
+          value={values.passwordConfirmation}
+          secureTextEntry={true}
+          placeholderTextColor={placeholderColor}
+        />
+        <View style={styles.submit}>
+          <Button type={primary} onPress={handleSubmit}>
+            {t('reg.form.btnSubmit')}
+          </Button>
+        </View>
+        <KeyboardSpacer />
+      </View>
+    </FormView>
+  );
+};
+
+const RegisterFormWithFormik = withFormik<FormProps<RegisterSubmitProps>, RegisterSubmitProps>({
+  mapPropsToValues: () => ({ username: '', email: '', password: '', passwordConfirmation: '' }),
+  validate: values => validate(values, registerFormSchema),
+  async handleSubmit(values, { setErrors, props: { onSubmit } }) {
+    onSubmit(values).catch((e: any) => {
+      if (isFormError(e)) {
+        setErrors(e.errors);
+      } else {
+        throw e;
+      }
+    });
+  },
+  enableReinitialize: true,
+  displayName: 'SignUpForm' // helps with React DevTools
+});
+
+const styles = StyleSheet.create({
+  submit,
+  formView: {
+    flex: 1,
+    alignSelf: 'stretch'
+  },
+  formContainer: {
+    paddingHorizontal: 20,
+    flex: 1,
+    justifyContent: 'center'
+  }
+});
+
+export default translate('user')(RegisterFormWithFormik(RegisterForm));
diff --git a/modules/user/client-react/components/RegisterView.native.tsx b/modules/user/client-react/components/RegisterView.native.tsx
new file mode 100644
index 0000000..273c367
--- /dev/null
+++ b/modules/user/client-react/components/RegisterView.native.tsx
@@ -0,0 +1,69 @@
+import * as React from 'react';
+import { Button, primary } from '@restapp/look-client-react-native';
+import { View, Text, StyleSheet } from 'react-native';
+import { TranslateFunction, translate } from '@restapp/i18n-client-react';
+
+import RegisterForm from '../components/RegisterForm.native';
+
+import { RegisterSubmitProps } from '../index.native';
+
+interface RegisterViewProps {
+  t: TranslateFunction;
+  onSubmit: (values: RegisterSubmitProps) => void;
+  isRegistered: boolean;
+  hideModal: () => void;
+}
+
+class RegisterView extends React.PureComponent<RegisterViewProps> {
+  public renderModal = () => {
+    const { t, hideModal } = this.props;
+    return (
+      <View style={styles.modalWrapper}>
+        <Text style={styles.modalTitle}>{t('reg.confirmationMsgTitle')}</Text>
+        <Text style={styles.modalBody}>{t('reg.confirmationMsgBody')}</Text>
+        <View style={styles.button}>
+          <Button onPress={hideModal} type={primary}>
+            {t('reg.confirmationBtn')}
+          </Button>
+        </View>
+      </View>
+    );
+  };
+
+  public render() {
+    const { onSubmit, isRegistered } = this.props;
+    return (
+      <View style={styles.container}>{isRegistered ? this.renderModal() : <RegisterForm onSubmit={onSubmit} />}</View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    justifyContent: 'center',
+    alignItems: 'stretch',
+    flex: 1
+  },
+  modalWrapper: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'stretch',
+    margin: 20
+  },
+  modalTitle: {
+    fontSize: 18,
+    fontWeight: 'bold',
+    marginBottom: 20,
+    textAlign: 'center'
+  },
+  modalBody: {
+    fontSize: 16,
+    marginBottom: 20
+  },
+  button: {
+    flex: 1,
+    paddingTop: 10
+  }
+});
+
+export default translate('user')(RegisterView);
diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/containers/Register.native.tsx
new file mode 100644
index 0000000..80eb7b4
--- /dev/null
+++ b/modules/user/client-react/containers/Register.native.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+import RegisterView from '../components/RegisterView.native';
+
+import settings from '../../../../settings';
+import { REGISTER } from '../actions';
+import { CommonProps, RegisterSubmitProps } from '../index.native';
+
+interface RegisterProps extends CommonProps {
+  register: (values: RegisterSubmitProps) => void;
+}
+
+interface RegisterState {
+  isRegistered: boolean;
+}
+
+class Register extends React.Component<RegisterProps, RegisterState> {
+  public state = {
+    isRegistered: false
+  };
+
+  public onSubmit = async (values: RegisterSubmitProps) => {
+    const { t, register, navigation } = this.props;
+
+    try {
+      await register(values);
+      if (!settings.auth.password.requireEmailConfirmation) {
+        navigation.goBack();
+      } else {
+        this.setState({ isRegistered: true });
+      }
+    } catch (e) {
+      throw new FormError(t('reg.errorMsg'), e);
+    }
+  };
+
+  public hideModal = () => {
+    this.props.navigation.goBack();
+  };
+
+  public toggleModal = () => {
+    this.setState(prevState => ({ isRegistered: !prevState.isRegistered }));
+  };
+
+  public render() {
+    const { isRegistered } = this.state;
+    return (
+      <RegisterView {...this.props} isRegistered={isRegistered} hideModal={this.hideModal} onSubmit={this.onSubmit} />
+    );
+  }
+}
+
+const withConnect = connect(
+  _state => ({}),
+  dispatch => ({
+    register: (value: RegisterSubmitProps) =>
+      dispatch({
+        type: null,
+        request: () => REGISTER(value)
+      })
+  })
+);
+
+export default compose(
+  translate('user'),
+  withConnect(Register)
+);
diff --git a/modules/user/client-react/containers/UserScreenNavigator.native.tsx b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
new file mode 100644
index 0000000..a15bb09
--- /dev/null
+++ b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
@@ -0,0 +1,89 @@
+import { createAppContainer, createDrawerNavigator } from 'react-navigation';
+import React from 'react';
+import { pickBy } from 'lodash';
+import { compose } from 'redux';
+import { DrawerComponent } from '@restapp/look-client-react-native';
+
+import { UserRole } from '../index.native';
+import { withUser } from './Auth';
+
+interface User {
+  id: number | string;
+  role: UserRole;
+}
+
+interface UserScreenNavigator {
+  currentUser: User;
+  context: any;
+  currentUserLoading: boolean;
+  routeConfigs: any;
+}
+
+class UserScreenNavigator extends React.Component<UserScreenNavigator> {
+  public shouldComponentUpdate(nextProps: UserScreenNavigator) {
+    const { currentUserLoading, currentUser } = this.props;
+    /**
+     * After a user edits the profile the CurrentUser being updated in the State as well.
+     * That leads to the Navigator re-rendering and, as a result, takes the user back to the initial route.
+     * In order to let the user get back to his/her profile we need to prevent the Navigator
+     * re-render action after profile was edited
+     */
+    return !(
+      !currentUserLoading &&
+      currentUser &&
+      nextProps.currentUser &&
+      currentUser.id === nextProps.currentUser.id &&
+      currentUser.role === nextProps.currentUser.role
+    );
+  }
+
+  public navItemsFilter = () => {
+    const { currentUser, currentUserLoading, routeConfigs } = this.props;
+
+    const userFilter = (value: any) => {
+      if (!value.userInfo) {
+        return true;
+      }
+      const { showOnLogin, role } = value.userInfo;
+      return showOnLogin && (!role || (Array.isArray(role) ? role : [role]).includes(currentUser.role));
+    };
+
+    const guestFilter = (value: any) => !value.userInfo || (value.userInfo && !value.userInfo.showOnLogin);
+
+    return pickBy(routeConfigs, currentUser && !currentUserLoading ? userFilter : guestFilter);
+  };
+  public getInitialRoute = () => {
+    const { currentUser } = this.props;
+    return currentUser ? 'Profile' : 'Login';
+  };
+
+  public render() {
+    const MainScreenNavigatorComponent = createAppContainer(
+      createDrawerNavigator(
+        { ...this.navItemsFilter() },
+        {
+          // eslint-disable-next-line
+          contentComponent: props => <DrawerComponent {...props} drawerItems={this.props.routeConfigs} />,
+          initialRouteName: this.getInitialRoute()
+        }
+      )
+    );
+
+    return <MainScreenNavigatorComponent />;
+  }
+}
+
+const drawerNavigator: any = (routeConfigs: any) => {
+  const withRoutes = (Component: React.ComponentType<any>) => {
+    const ownProps = { routeConfigs };
+    const WithRoutesComponent = ({ ...props }) => <Component {...props} {...ownProps} />;
+    return WithRoutesComponent;
+  };
+
+  return compose(
+    withUser,
+    withRoutes
+  )(UserScreenNavigator);
+};
+
+export default drawerNavigator;
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
new file mode 100644
index 0000000..05c575a
--- /dev/null
+++ b/modules/user/client-react/index.native.tsx
@@ -0,0 +1,156 @@
+import * as React from 'react';
+import {
+  createStackNavigator,
+  NavigationContainer,
+  NavigationScreenProp,
+  NavigationRoute,
+  NavigationParams
+} from 'react-navigation';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
+import ClientModule from '@restapp/module-client-react-native';
+import { FormikErrors } from 'formik';
+import resources from './locales';
+import DataRootComponent from './containers/DataRootComponent.native';
+import UserScreenNavigator from './containers/UserScreenNavigator.native';
+import Register from './containers/Register.native';
+
+import reducers from './reducers';
+
+export enum UserRole {
+  admin = 'admin',
+  user = 'user'
+}
+
+export interface UserProfile {
+  fullName?: string;
+  firstName?: string;
+  lastName?: string;
+}
+
+export interface User {
+  id?: number | string;
+  username: string;
+  role: UserRole;
+  isActive: boolean;
+  email: string;
+  profile?: UserProfile;
+  auth?: any;
+}
+
+export interface NavigationOptionsProps {
+  navigation: NavigationScreenProp<NavigationRoute<NavigationParams>, NavigationParams>;
+}
+
+export interface CommonProps extends NavigationOptionsProps {
+  error?: string;
+  t?: TranslateFunction;
+}
+
+export interface LoginSubmitProps {
+  usernameOrEmail: string;
+  password: string;
+}
+
+export interface ResetPasswordSubmitProps {
+  password: string;
+  passwordConfirmation: string;
+}
+
+export interface ForgotPasswordSubmitProps {
+  email: string;
+}
+
+export interface RegisterSubmitProps {
+  username: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+}
+
+interface HandleSubmitProps<P> {
+  setErrors: (errors: FormikErrors<P>) => void;
+  props: P;
+}
+
+interface Errors {
+  errorMsg?: string;
+}
+
+export interface FormProps<V> {
+  handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;
+  onSubmit: (values: V) => Promise<void> | void | any;
+  submitting?: boolean;
+  errors: Errors;
+  values: V;
+  t?: TranslateFunction;
+}
+
+export interface OrderBy {
+  column: string;
+  order: string;
+}
+
+export interface Filter {
+  searchText: string;
+  role: string;
+  isActive: boolean;
+}
+
+class RegisterScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.register" style="subTitle" />,
+    headerForceInset: {}
+  });
+  public render() {
+    return <Register navigation={this.props.navigation} />;
+  }
+}
+
+const AuthScreen = createStackNavigator(
+  {
+    Register: { screen: RegisterScreen }
+  },
+  {
+    cardStyle: {
+      backgroundColor: '#fff'
+    },
+    navigationOptions: {
+      headerStyle: { backgroundColor: '#fff' }
+    }
+  }
+);
+
+export * from './containers/Auth.native';
+
+const HeaderTitleWithI18n = translate('user')(HeaderTitle);
+
+export const ref: { navigator: NavigationContainer } = {
+  navigator: null
+};
+
+const MainScreenNavigator = () => {
+  const Navigator = ref.navigator;
+  return <Navigator />;
+};
+
+export default new ClientModule({
+  drawerItem: [
+    {
+      Login: {
+        screen: AuthScreen,
+        userInfo: {
+          showOnLogin: false
+        },
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.signUp" />
+        }
+      }
+    }
+  ],
+  localization: [{ ns: 'user', resources }],
+  router: <MainScreenNavigator />,
+  reducer: [{ user: reducers }],
+  dataRootComponent: [DataRootComponent],
+  onAppCreate: [(module: ClientModule) => (ref.navigator = UserScreenNavigator(module.drawerItems))]
+});
diff --git a/packages/mobile/src/modules.ts b/packages/mobile/src/modules.ts
index ba8e395..09a076e 100644
--- a/packages/mobile/src/modules.ts
+++ b/packages/mobile/src/modules.ts
@@ -1,4 +1,5 @@
 import welcome from '@restapp/welcome-client-react';
+import user from '@restapp/user-client-react';
 import core from '@restapp/core-client-react-native';
 import i18n from '@restapp/i18n-client-react';
 import validation from '@restapp/validation-common-react';
@@ -6,6 +7,6 @@ import defaultRouter from '@restapp/router-client-react-native';
 
 import ClientModule from '@restapp/module-client-react-native';
 
-const modules = new ClientModule(welcome, validation, defaultRouter, i18n, core);
+const modules = new ClientModule(user, welcome, validation, defaultRouter, i18n, core);
 
 export default modules;

From 0f369c29b5d574254145c93734161f45bb887ac6 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 10:08:11 +0300
Subject: [PATCH 010/104] Update ServerModule

---
 modules/module/server-ts/ServerModule.ts | 45 +++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/modules/module/server-ts/ServerModule.ts b/modules/module/server-ts/ServerModule.ts
index 7aba114..056aec7 100644
--- a/modules/module/server-ts/ServerModule.ts
+++ b/modules/module/server-ts/ServerModule.ts
@@ -1,5 +1,6 @@
-import { Express } from 'express';
+import { isEmpty } from 'lodash';
 import CommonModule, { CommonModuleShape } from '@restapp/module-common';
+import { Express, Request, Response } from 'express';
 
 /**
  * Create GraphQL context function params
@@ -30,6 +31,22 @@ type CreateContextFunc = (props: CreateContextFuncProps) => { [key: string]: any
  */
 type MiddlewareFunc = (app: Express, appContext: { [key: string]: any }) => void;
 
+/**
+ * A function with reuqest.
+ *
+ * @param req HTTP request
+ * @param res HTTP response
+ * @param next following handler
+ */
+type RequestHandler = (req: Request, res: Response, next: any) => void;
+
+export enum RestMethod {
+  POST = 'post',
+  GET = 'get',
+  PUT = 'put',
+  DELETE = 'delete'
+}
+
 /**
  * Server feature modules interface
  */
@@ -40,6 +57,14 @@ export interface ServerModuleShape extends CommonModuleShape {
   beforeware?: MiddlewareFunc[];
   // A list of functions to register normal-priority middlewares
   middleware?: MiddlewareFunc[];
+  accessMiddleware?: RequestHandler;
+  apiRouteParams?: Array<{
+    method: RestMethod;
+    route: string;
+    middleware?: RequestHandler[];
+    controller: RequestHandler;
+    isAuthRoute?: boolean;
+  }>;
 }
 
 interface ServerModule extends ServerModuleShape {}
@@ -72,6 +97,24 @@ class ServerModule extends CommonModule {
     }
     return context;
   }
+
+  public get apiRoutes() {
+    return this.apiRouteParams.map(({ method, route, controller, isAuthRoute, middleware }) => {
+      return (app: Express, modules: ServerModule) => {
+        const handlers = [];
+
+        if (isAuthRoute) {
+          handlers.push(modules.accessMiddleware);
+        }
+        if (!isEmpty(middleware)) {
+          handlers.push(...middleware);
+        }
+        handlers.push(controller);
+
+        app[method](`/api/${route}`, ...handlers);
+      };
+    });
+  }
 }
 
 export default ServerModule;

From c5993f43d31428169153bdc12e525158617111cb Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 10:27:52 +0300
Subject: [PATCH 011/104] Add initial setup for server user module

---
 modules/user/server-ts/index.ts               |   3 +
 .../server-ts/locales/en/translations.json    |  23 ++
 modules/user/server-ts/locales/index.ts       |   5 +
 .../server-ts/locales/ru/translations.json    |  23 ++
 modules/user/server-ts/migration/002_user.js  |  96 ++++++
 modules/user/server-ts/package.json           |   5 +
 modules/user/server-ts/seeds/.eslintrc        |   5 +
 modules/user/server-ts/seeds/002_user.js      |  36 +++
 modules/user/server-ts/sql.ts                 | 285 ++++++++++++++++++
 packages/server/package.json                  |   4 +-
 packages/server/src/modules.ts                |   3 +-
 yarn.lock                                     |  14 +-
 12 files changed, 493 insertions(+), 9 deletions(-)
 create mode 100644 modules/user/server-ts/index.ts
 create mode 100644 modules/user/server-ts/locales/en/translations.json
 create mode 100644 modules/user/server-ts/locales/index.ts
 create mode 100644 modules/user/server-ts/locales/ru/translations.json
 create mode 100644 modules/user/server-ts/migration/002_user.js
 create mode 100644 modules/user/server-ts/package.json
 create mode 100644 modules/user/server-ts/seeds/.eslintrc
 create mode 100644 modules/user/server-ts/seeds/002_user.js
 create mode 100644 modules/user/server-ts/sql.ts

diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
new file mode 100644
index 0000000..20bcfdc
--- /dev/null
+++ b/modules/user/server-ts/index.ts
@@ -0,0 +1,3 @@
+import ServerModule from '@restapp/module-server-ts';
+
+export default new ServerModule();
diff --git a/modules/user/server-ts/locales/en/translations.json b/modules/user/server-ts/locales/en/translations.json
new file mode 100644
index 0000000..b67acdb
--- /dev/null
+++ b/modules/user/server-ts/locales/en/translations.json
@@ -0,0 +1,23 @@
+{
+  "accessDenied": "Access Denied",
+  "usernameIsExisted": "Username already exists.",
+  "emailIsExisted": "E-mail already exists.",
+  "passwordLength": "Password must be {{length}} characters or more.",
+  "userIsNotExisted": "User does not exist.",
+  "userCannotDeleteYourself": "You can not delete your self.",
+  "userCouldNotDeleted": "Could not delete user. Please try again later.",
+  "auth": {
+    "password": {
+      "validPasswordEmail": "Please enter a valid username or e-mail.",
+      "emailConfirmation": "Please confirm your e-mail first.",
+      "validPassword": "Please enter a valid password.",
+      "usernameIsExisted": "Username already exists",
+      "emailIsExisted": "E-mail already exists.",
+      "passwordsIsNotMatch": "Passwords do not match.",
+      "passwordLength": "Password must be {{length}} characters or more.",
+      "invalidToken": "Invalid token",
+      "forgotPassword": "Instructions were send to your email",
+      "resestPassword": "Your password has been updated succesfully"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/server-ts/locales/index.ts b/modules/user/server-ts/locales/index.ts
new file mode 100644
index 0000000..d9fb121
--- /dev/null
+++ b/modules/user/server-ts/locales/index.ts
@@ -0,0 +1,5 @@
+/*
+ * The index.js can be empty, it's just needed to point the loader to the root directory of the locales.
+ * https://github.com/alienfast/i18next-loader#option-2-use-with-import-syntax
+ */
+export default {};
diff --git a/modules/user/server-ts/locales/ru/translations.json b/modules/user/server-ts/locales/ru/translations.json
new file mode 100644
index 0000000..457fff7
--- /dev/null
+++ b/modules/user/server-ts/locales/ru/translations.json
@@ -0,0 +1,23 @@
+{
+  "accessDenied": "Доступ запрещен",
+  "usernameIsExisted": "Данное имя пользователя уже используется.",
+  "emailIsExisted": "Данный e-mail уже используется.",
+  "passwordLength": "Длина пароля должна составлять {{length}} символов и больше.",
+  "userIsNotExisted": "Такого пользователя не существует.",
+  "userCannotDeleteYourself": "Вы не можете удалить себя",
+  "userCouldNotDeleted": "Невозможно удалить пользователя. Побробуйте повторить попытку позже.",
+  "auth": {
+    "password": {
+      "validPasswordEmail": "Пожалуйста, введите Ваш username или e-mail.",
+      "emailConfirmation": "Пожалуйста, подтвердите Ваш e-mail",
+      "validPassword": "Пожалуйста, введите действительный пароль.",
+      "usernameIsExisted": "Данное имя пользователя уже используется",
+      "emailIsExisted": "Данный e-mail уже используется.",
+      "passwordsIsNotMatch": "Пароли не совпадают.",
+      "passwordLength": "Длина пароля должна составлять {{length}} символов и больше.",
+      "invalidToken": "Не действительный токен",
+      "forgotPassword": "Интсрукции были отправлены на ваш email",
+      "resestPassword": "Ваш пароль был успешно обновлен"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/server-ts/migration/002_user.js b/modules/user/server-ts/migration/002_user.js
new file mode 100644
index 0000000..d60f829
--- /dev/null
+++ b/modules/user/server-ts/migration/002_user.js
@@ -0,0 +1,96 @@
+exports.up = function(knex, Promise) {
+  return Promise.all([
+    knex.schema.createTable('user', table => {
+      table.increments();
+      table.string('username').unique();
+      table.string('email').unique();
+      table.string('password_hash');
+      table.string('role').defaultTo('user');
+      table.boolean('is_active').defaultTo(false);
+      table.timestamps(false, true);
+    }),
+    knex.schema.createTable('user_profile', table => {
+      table.increments();
+      table.string('first_name');
+      table.string('last_name');
+      table
+        .integer('user_id')
+        .unsigned()
+        .references('id')
+        .inTable('user')
+        .onDelete('CASCADE');
+      table.timestamps(false, true);
+    }),
+    knex.schema.createTable('auth_certificate', table => {
+      table.increments();
+      table.string('serial').unique();
+      table
+        .integer('user_id')
+        .unsigned()
+        .references('id')
+        .inTable('user')
+        .onDelete('CASCADE');
+      table.timestamps(false, true);
+    }),
+    knex.schema.createTable('auth_facebook', table => {
+      table.increments();
+      table.string('fb_id').unique();
+      table.string('display_name');
+      table
+        .integer('user_id')
+        .unsigned()
+        .references('id')
+        .inTable('user')
+        .onDelete('CASCADE');
+      table.timestamps(false, true);
+    }),
+    knex.schema.createTable('auth_google', table => {
+      table.increments();
+      table.string('google_id').unique();
+      table.string('display_name');
+      table
+        .integer('user_id')
+        .unsigned()
+        .references('id')
+        .inTable('user')
+        .onDelete('CASCADE');
+      table.timestamps(false, true);
+    }),
+    knex.schema.createTable('auth_github', table => {
+      table.increments();
+      table.string('gh_id').unique();
+      table.string('display_name');
+      table
+        .integer('user_id')
+        .unsigned()
+        .references('id')
+        .inTable('user')
+        .onDelete('CASCADE');
+      table.timestamps(false, true);
+    }),
+    knex.schema.createTable('auth_linkedin', table => {
+      table.increments();
+      table.string('ln_id').unique();
+      table.string('display_name');
+      table
+        .integer('user_id')
+        .unsigned()
+        .references('id')
+        .inTable('user')
+        .onDelete('CASCADE');
+      table.timestamps(false, true);
+    })
+  ]);
+};
+
+exports.down = function(knex, Promise) {
+  return Promise.all([
+    knex.schema.dropTable('auth_certificate'),
+    knex.schema.dropTable('auth_facebook'),
+    knex.schema.dropTable('auth_google'),
+    knex.schema.dropTable('auth_github'),
+    knex.schema.dropTable('auth_linkedin'),
+    knex.schema.dropTable('user_profile'),
+    knex.schema.dropTable('user')
+  ]);
+};
diff --git a/modules/user/server-ts/package.json b/modules/user/server-ts/package.json
new file mode 100644
index 0000000..e8dd2bb
--- /dev/null
+++ b/modules/user/server-ts/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@restapp/user-server-ts",
+  "version": "0.1.0",
+  "private": true
+}
\ No newline at end of file
diff --git a/modules/user/server-ts/seeds/.eslintrc b/modules/user/server-ts/seeds/.eslintrc
new file mode 100644
index 0000000..712a899
--- /dev/null
+++ b/modules/user/server-ts/seeds/.eslintrc
@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "import/prefer-default-export": 0
+  }
+}
\ No newline at end of file
diff --git a/modules/user/server-ts/seeds/002_user.js b/modules/user/server-ts/seeds/002_user.js
new file mode 100644
index 0000000..7acf33c
--- /dev/null
+++ b/modules/user/server-ts/seeds/002_user.js
@@ -0,0 +1,36 @@
+import bcrypt from 'bcryptjs';
+import { returnId, truncateTables } from '@restapp/database-server-ts';
+
+export async function seed(knex, Promise) {
+  await truncateTables(knex, Promise, [
+    'user',
+    'user_profile',
+    'auth_certificate',
+    'auth_facebook',
+    'auth_github',
+    'auth_linkedin'
+  ]);
+
+  const id = await returnId(knex('user')).insert({
+    username: 'admin',
+    email: 'admin@example.com',
+    password_hash: await bcrypt.hash('admin123', 12),
+    role: 'admin',
+    is_active: true
+  });
+
+  await returnId(
+    knex('auth_certificate').insert({
+      serial: 'admin-123',
+      user_id: id[0]
+    })
+  );
+
+  await returnId(knex('user')).insert({
+    username: 'user',
+    email: 'user@example.com',
+    password_hash: await bcrypt.hash('user1234', 12),
+    role: 'user',
+    is_active: true
+  });
+}
diff --git a/modules/user/server-ts/sql.ts b/modules/user/server-ts/sql.ts
new file mode 100644
index 0000000..45c0e28
--- /dev/null
+++ b/modules/user/server-ts/sql.ts
@@ -0,0 +1,285 @@
+// Helpers
+import { camelizeKeys, decamelizeKeys, decamelize } from 'humps';
+import { has } from 'lodash';
+import bcrypt from 'bcryptjs';
+import { knex, returnId } from '@restapp/database-server-ts';
+
+export interface UserShape {
+  id: number;
+  username: string;
+  role: string;
+  isActive: boolean;
+  email: string;
+  passwordHash: string;
+  userId: number;
+}
+
+interface OrderBy {
+  column: string;
+  order: string;
+}
+
+interface Filter {
+  role: string;
+  isActive: boolean;
+  searchText: string;
+}
+
+interface SocialInterface {
+  id: number;
+  displayName: string;
+  userId: number;
+}
+
+export interface Profile {
+  firstName?: string;
+  lastName?: string;
+  id?: number;
+  username: string;
+  email: string;
+  role?: string;
+  isActive: boolean;
+}
+
+const userColumns = ['u.id', 'u.username', 'u.role', 'u.is_active', 'u.email', 'up.first_name', 'up.last_name'];
+const userColumnsWithSocial = [
+  ...userColumns,
+  'fa.fb_id',
+  'fa.display_name AS fbDisplayName',
+  'lna.ln_id',
+  'lna.display_name AS lnDisplayName',
+  'gha.gh_id',
+  'gha.display_name AS ghDisplayName',
+  'ga.google_id',
+  'ga.display_name AS googleDisplayName'
+];
+const userColumnsWithPassword = [...userColumns, 'u.password_hash'];
+
+class UserDAO {
+  public async getUsers(orderBy: OrderBy, filter: Filter) {
+    const queryBuilder = knex
+      .select(...userColumnsWithSocial)
+      .from('user AS u')
+      .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+      .leftJoin('auth_facebook AS fa', 'fa.user_id', 'u.id')
+      .leftJoin('auth_google AS ga', 'ga.user_id', 'u.id')
+      .leftJoin('auth_github AS gha', 'gha.user_id', 'u.id')
+      .leftJoin('auth_linkedin AS lna', 'lna.user_id', 'u.id');
+
+    // add order by
+    if (orderBy && orderBy.column) {
+      const column = orderBy.column;
+      let order = 'asc';
+      if (orderBy.order) {
+        order = orderBy.order;
+      }
+
+      queryBuilder.orderBy(decamelize(column), order);
+    }
+
+    // add filter conditions
+    if (filter) {
+      if (has(filter, 'role') && filter.role !== '') {
+        queryBuilder.where(function() {
+          this.where('u.role', filter.role);
+        });
+      }
+
+      if (has(filter, 'isActive') && filter.isActive !== null) {
+        queryBuilder.where(function() {
+          this.where('u.is_active', filter.isActive);
+        });
+      }
+
+      if (has(filter, 'searchText') && filter.searchText !== '') {
+        queryBuilder.where(function() {
+          this.where(knex.raw('LOWER(??) LIKE LOWER(?)', ['username', `%${filter.searchText}%`]))
+            .orWhere(knex.raw('LOWER(??) LIKE LOWER(?)', ['email', `%${filter.searchText}%`]))
+            .orWhere(knex.raw('LOWER(??) LIKE LOWER(?)', ['first_name', `%${filter.searchText}%`]))
+            .orWhere(knex.raw('LOWER(??) LIKE LOWER(?)', ['last_name', `%${filter.searchText}%`]));
+        });
+      }
+    }
+
+    return camelizeKeys(await queryBuilder);
+  }
+
+  public async getUser(id: number) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithSocial)
+        .from('user AS u')
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .leftJoin('auth_facebook AS fa', 'fa.user_id', 'u.id')
+        .leftJoin('auth_google AS ga', 'ga.user_id', 'u.id')
+        .leftJoin('auth_github AS gha', 'gha.user_id', 'u.id')
+        .leftJoin('auth_linkedin AS lna', 'lna.user_id', 'u.id')
+        .where('u.id', '=', id)
+        .first()
+    );
+  }
+
+  public async getUserWithPassword(id: number) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithPassword)
+        .from('user AS u')
+        .where('u.id', '=', id)
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .first()
+    );
+  }
+
+  public register({ username, email, role = 'user', isActive }: Profile, passwordHash?: string | false) {
+    return knex('user').insert(decamelizeKeys({ username, email, role, passwordHash, isActive }));
+  }
+
+  public createFacebookAuth({ id, displayName, userId }: SocialInterface) {
+    return returnId(knex('auth_facebook')).insert({ fb_id: id, display_name: displayName, user_id: userId });
+  }
+
+  public createGithubAuth({ id, displayName, userId }: SocialInterface) {
+    return returnId(knex('auth_github')).insert({ gh_id: id, display_name: displayName, user_id: userId });
+  }
+
+  public createGoogleOAuth({ id, displayName, userId }: SocialInterface) {
+    return returnId(knex('auth_google')).insert({ google_id: id, display_name: displayName, user_id: userId });
+  }
+
+  public createLinkedInAuth({ id, displayName, userId }: SocialInterface) {
+    return returnId(knex('auth_linkedin')).insert({ ln_id: id, display_name: displayName, user_id: userId });
+  }
+
+  public editUser({ id, username, email, role, isActive }: Profile, passwordHash: string) {
+    const localAuthInput = passwordHash ? { email, passwordHash } : { email };
+    return knex('user')
+      .update(decamelizeKeys({ username, role, isActive, ...localAuthInput }))
+      .where({ id });
+  }
+
+  public async isUserProfileExists(userId: number) {
+    return !!(await knex('user_profile')
+      .count('id as count')
+      .where(decamelizeKeys({ userId }))
+      .first()).count;
+  }
+
+  public editUserProfile({ id, profile }: { id: number; profile: any }, isExists?: boolean) {
+    if (isExists) {
+      return knex('user_profile')
+        .update(decamelizeKeys(profile))
+        .where({ user_id: id });
+    } else {
+      return returnId(knex('user_profile')).insert({ ...decamelizeKeys(profile), user_id: id });
+    }
+  }
+
+  public deleteUser(id: number) {
+    return knex('user')
+      .where('id', '=', id)
+      .del();
+  }
+
+  public async updatePassword(id: number, newPassword: string) {
+    const passwordHash = await bcrypt.hash(newPassword, 12);
+
+    return knex('user')
+      .update({ password_hash: passwordHash })
+      .where({ id });
+  }
+
+  public updateActive(id: number, isActive: number) {
+    return knex('user')
+      .update({ is_active: isActive })
+      .where({ id });
+  }
+
+  public async getUserByEmail(email: string) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithPassword)
+        .from('user AS u')
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .where({ email })
+        .first()
+    );
+  }
+
+  public async getUserByFbIdOrEmail(id: number, email: string) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithPassword, 'fa.fb_id')
+        .from('user AS u')
+        .leftJoin('auth_facebook AS fa', 'fa.user_id', 'u.id')
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .where('fa.fb_id', '=', id)
+        .orWhere('u.email', '=', email)
+        .first()
+    );
+  }
+
+  public async getUserByLnInIdOrEmail(id: number, email: string = '') {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithPassword, 'lna.ln_id')
+        .from('user AS u')
+        .leftJoin('auth_linkedin AS lna', 'lna.user_id', 'u.id')
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .where('lna.ln_id', '=', id)
+        .orWhere('u.email', '=', email)
+        .first()
+    );
+  }
+
+  public async getUserByGHIdOrEmail(id: number, email: string) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithPassword, 'gha.gh_id')
+        .from('user AS u')
+        .leftJoin('auth_github AS gha', 'gha.user_id', 'u.id')
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .where('gha.gh_id', '=', id)
+        .orWhere('u.email', '=', email)
+        .first()
+    );
+  }
+
+  public async getUserByGoogleIdOrEmail(id: number, email: string) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithPassword, 'ga.google_id')
+        .from('user AS u')
+        .leftJoin('auth_google AS ga', 'ga.user_id', 'u.id')
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .where('ga.google_id', '=', id)
+        .orWhere('u.email', '=', email)
+        .first()
+    );
+  }
+
+  public async getUserByUsername(username: string) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumns)
+        .from('user AS u')
+        .where('u.username', '=', username)
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .first()
+    );
+  }
+
+  public async getUserByUsernameOrEmail(usernameOrEmail: string) {
+    return camelizeKeys(
+      await knex
+        .select(...userColumnsWithPassword)
+        .from('user AS u')
+        .where('u.username', '=', usernameOrEmail)
+        .orWhere('u.email', '=', usernameOrEmail)
+        .leftJoin('user_profile AS up', 'up.user_id', 'u.id')
+        .first()
+    );
+  }
+}
+const userDAO = new UserDAO();
+
+export default userDAO;
diff --git a/packages/server/package.json b/packages/server/package.json
index 27755cd..ac3ed97 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -54,6 +54,7 @@
     "@restapp/core-common": "^0.1.0",
     "@restapp/database-server-ts": "^0.1.0",
     "@restapp/testing-server-ts": "^0.1.0",
+    "@restapp/user-server-ts": "^0.1.0",
     "@restapp/welcome-server-ts": "^0.1.0",
     "@types/pdfmake": "^0.1.3",
     "bcryptjs": "^2.4.3",
@@ -105,6 +106,7 @@
   },
   "devDependencies": {
     "@alienfast/i18next-loader": "^1.0.15",
+    "@types/bcryptjs": "^2.4.2",
     "@types/chai": "^4.1.4",
     "@types/chai-http": "^3.0.5",
     "@types/humps": "^1.1.2",
@@ -141,4 +143,4 @@
   "peerDependencies": {
     "@larix/zen": "^0.1.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/server/src/modules.ts b/packages/server/src/modules.ts
index 4de5266..fe5ba12 100644
--- a/packages/server/src/modules.ts
+++ b/packages/server/src/modules.ts
@@ -4,10 +4,11 @@ import i18n from '@restapp/i18n-server-ts';
 import validation from '@restapp/validation-common-react';
 import cookies from '@restapp/cookies-server-ts';
 import mailer from '@restapp/mailer-server-ts';
+import user from '@restapp/user-server-ts';
 import '@restapp/debug-server-ts';
 
 import ServerModule from '@restapp/module-server-ts';
 
-const modules: ServerModule = new ServerModule(welcome, cookies, i18n, validation, mailer, core);
+const modules: ServerModule = new ServerModule(welcome, cookies, i18n, validation, mailer, core, user);
 
 export default modules;
diff --git a/yarn.lock b/yarn.lock
index 8ec7a10..284fecd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1980,6 +1980,11 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
+"@types/bcryptjs@^2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.2.tgz#e3530eac9dd136bfdfb0e43df2c4c5ce1f77dfae"
+  integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
+
 "@types/bluebird@*":
   version "3.5.26"
   resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.26.tgz#a38c438ae84fa02431d6892edf86e46edcbca291"
@@ -9179,7 +9184,7 @@ immediate@^3.2.2:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c"
   integrity sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=
 
-immutability-helper@2.8.1, immutability-helper@^2.6.2:
+immutability-helper@^2.6.2:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.8.1.tgz#3c5ec05fcd83676bfae7146f319595243ad904f4"
   integrity sha512-8AVB5EUpRBUdXqfe4cFsFECsOIZ9hX/Arl8B8S9/tmwpYv3UWvOsXUPOjkuZIMaVxfSWkxCzkng1rjmEoSWrxQ==
@@ -10028,11 +10033,6 @@ items@2.x.x:
   resolved "https://registry.yarnpkg.com/items/-/items-2.1.2.tgz#0849354595805d586dac98e7e6e85556ea838558"
   integrity sha512-kezcEqgB97BGeZZYtX/MA8AG410ptURstvnz5RAgyFZ8wQFPMxHY8GpTq+/ZHKT3frSlIthUq7EvLt9xn3TvXg==
 
-iterall@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
-  integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
-
 jest-changed-files@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
@@ -18324,7 +18324,7 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-watchpack@^1.5.0, "watchpack@https://github.com/Globegitter/watchpack":
+watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://github.com/Globegitter/watchpack#d903e64a910ab068299f824b04a5e216a15672e9"
   dependencies:

From 96a444c7f4ffd89991234d60d09619224faa7e46 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 10:30:55 +0300
Subject: [PATCH 012/104] Update createServerApp

---
 modules/core/server-ts/app.ts                | 5 +++++
 modules/core/server-ts/middleware/context.ts | 8 ++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 modules/core/server-ts/middleware/context.ts

diff --git a/modules/core/server-ts/app.ts b/modules/core/server-ts/app.ts
index deddb35..dd85004 100644
--- a/modules/core/server-ts/app.ts
+++ b/modules/core/server-ts/app.ts
@@ -6,6 +6,7 @@ import ServerModule from '@restapp/module-server-ts';
 
 import websiteMiddleware from './middleware/website';
 import errorMiddleware from './middleware/error';
+import contextMiddleware from './middleware/context';
 
 export const createServerApp = (modules: ServerModule) => {
   const app = express();
@@ -24,6 +25,10 @@ export const createServerApp = (modules: ServerModule) => {
   }
 
   if (!isApiExternal) {
+    app.use(contextMiddleware(modules));
+    if (modules.apiRoutes) {
+      modules.apiRoutes.forEach(applyMiddleware => applyMiddleware(app, modules));
+    }
     app.get('/api', (req, res, next) => res.json({ message: 'REST API: Success' }));
   }
 
diff --git a/modules/core/server-ts/middleware/context.ts b/modules/core/server-ts/middleware/context.ts
new file mode 100644
index 0000000..cdd1cd0
--- /dev/null
+++ b/modules/core/server-ts/middleware/context.ts
@@ -0,0 +1,8 @@
+import ServerModule from '@restapp/module-server-ts';
+
+const contextMiddleware = ({ appContext }: ServerModule) => (req: any, res: any, next: () => void) => {
+  res.locals.appContext = appContext;
+  next();
+};
+
+export default contextMiddleware;

From 83185c704abfbc952d1e28a6453995815376191a Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 11:03:18 +0300
Subject: [PATCH 013/104] Add emailTemplate

---
 modules/user/server-ts/emailTemplate.ts | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 modules/user/server-ts/emailTemplate.ts

diff --git a/modules/user/server-ts/emailTemplate.ts b/modules/user/server-ts/emailTemplate.ts
new file mode 100644
index 0000000..8f4d9e2
--- /dev/null
+++ b/modules/user/server-ts/emailTemplate.ts
@@ -0,0 +1,32 @@
+import { UserShape } from './sql';
+import settings from '../../../settings';
+
+const { app } = settings;
+
+const accountCreated = (url: string, user: UserShape) =>
+  `<p>Hi, ${user.username}!</p>
+   <p>Welcome to ${app.name}. Please click the following link to confirm your email:</p>
+   <p><a href="${url}">${url}</a></p>
+   <p>Below are your login information</p>
+   <p>Your email is: ${user.email}</p>`;
+
+const passwordUpdated = (url: string) =>
+  `<p>Your account password has been updated.</p>
+   <p>To view or edit your account settings, please visit the “Profile” page at</p>
+   <p><a href="${url}">${url}</a></p>`;
+
+const confirmEmail = (url: string, user: UserShape) =>
+  `<p>Hi, ${user.username}!</p>
+   <p>Welcome to ${app.name}. Please click the following link to confirm your email:</p>
+   <p><a href="${url}">${url}</a></p>
+   <p>Below are your login information</p>
+   <p>Your email is: ${user.email}</p>`;
+
+const passwordReset = (url: string) => `Please click this link to reset your password: <a href="${url}">${url}</a>`;
+
+export default {
+  accountCreated,
+  passwordUpdated,
+  confirmEmail,
+  passwordReset
+};

From 05e59c74b805d4b4b4a1b30808020f8bd67a3960 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 11:09:47 +0300
Subject: [PATCH 014/104] Add password sub-module

---
 modules/user/server-ts/index.ts               | 11 ++-
 .../user/server-ts/password/controllers.ts    | 69 +++++++++++++++++++
 modules/user/server-ts/password/index.ts      | 20 ++++++
 packages/server/package.json                  |  3 +-
 yarn.lock                                     |  7 ++
 5 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 modules/user/server-ts/password/controllers.ts
 create mode 100644 modules/user/server-ts/password/index.ts

diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index 20bcfdc..dca713e 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -1,3 +1,12 @@
 import ServerModule from '@restapp/module-server-ts';
+import password from './password';
 
-export default new ServerModule();
+import resources from './locales';
+
+export interface ValidationErrors {
+  username?: string;
+  email?: string;
+  password?: string;
+}
+
+export default new ServerModule(password, { localization: [{ ns: 'user', resources }] });
diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
new file mode 100644
index 0000000..3981d5c
--- /dev/null
+++ b/modules/user/server-ts/password/controllers.ts
@@ -0,0 +1,69 @@
+import { UserShape } from './../sql';
+import { pick, isEmpty } from 'lodash';
+import jwt from 'jsonwebtoken';
+import { log } from '@restapp/core-common';
+import { mailer } from '@restapp/mailer-server-ts';
+
+import userDAO from '../sql';
+import settings from '../../../../settings';
+import { ValidationErrors } from '../';
+import emailTemplate from '../emailTemplate';
+import { createPasswordHash } from '.';
+
+const {
+  auth: { password, secret },
+  app
+} = settings;
+
+export const register = async ({ body, t }: any, res: any) => {
+  const errors: ValidationErrors = {};
+  const userExists = await userDAO.getUserByUsername(body.username);
+  if (userExists) {
+    errors.username = t('user:auth.password.usernameIsExisted');
+  }
+
+  const emailExists = (await userDAO.getUserByEmail(body.email)) as UserShape;
+  if (emailExists) {
+    errors.email = t('user:auth.password.emailIsExisted');
+  }
+
+  if (!isEmpty(errors)) {
+    return res.send({
+      error: {
+        message: 'Failed reset password',
+        errors
+      }
+    });
+  }
+
+  let userId = 0;
+  if (!emailExists) {
+    const passwordHash = await createPasswordHash(body.password);
+    const isActive = !password.requireEmailConfirmation;
+    [userId] = await userDAO.register({ ...body, isActive }, passwordHash);
+
+    // if user has previously logged with facebook auth
+  } else {
+    await userDAO.updatePassword(emailExists.userId, body.password);
+    userId = emailExists.userId;
+  }
+
+  const user = (await userDAO.getUser(userId)) as UserShape;
+
+  if (mailer && password.requireEmailConfirmation && !emailExists) {
+    // async email
+    jwt.sign({ identity: pick(user, 'id') }, secret, { expiresIn: '1d' }, (err, emailToken) => {
+      const encodedToken = Buffer.from(emailToken).toString('base64');
+      const url = `${__WEBSITE_URL__}/confirmation/${encodedToken}`;
+      mailer.sendMail({
+        from: `${app.name} <${process.env.EMAIL_USER}>`,
+        to: user.email,
+        subject: 'Confirm Email',
+        html: emailTemplate.confirmEmail(url, user)
+      });
+      log.info(`Sent registration confirmation email to: ${user.email}`);
+    });
+  }
+
+  res.json(user);
+};
diff --git a/modules/user/server-ts/password/index.ts b/modules/user/server-ts/password/index.ts
new file mode 100644
index 0000000..cb9ac42
--- /dev/null
+++ b/modules/user/server-ts/password/index.ts
@@ -0,0 +1,20 @@
+import bcrypt from 'bcryptjs';
+
+import ServerModule, { RestMethod } from '@restapp/module-server-ts';
+
+import { register } from './controllers';
+import settings from '../../../../settings';
+
+export const createPasswordHash = (pswd: string) => bcrypt.hash(pswd, 12);
+
+export default (settings.auth.password.enabled
+  ? new ServerModule({
+      apiRouteParams: [
+        {
+          method: RestMethod.POST,
+          route: 'register',
+          controller: register
+        }
+      ]
+    })
+  : undefined);
diff --git a/packages/server/package.json b/packages/server/package.json
index ac3ed97..dcd8c09 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -112,6 +112,7 @@
     "@types/humps": "^1.1.2",
     "@types/i18next": "^8.4.4",
     "@types/i18next-express-middleware": "^0.0.33",
+    "@types/jsonwebtoken": "^8.3.2",
     "@types/knex": "^0.14.20",
     "@types/mkdirp": "^0.5.2",
     "@types/nodemailer": "^4.6.2",
@@ -143,4 +144,4 @@
   "peerDependencies": {
     "@larix/zen": "^0.1.0"
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 284fecd..541e8ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2142,6 +2142,13 @@
     "@types/tough-cookie" "*"
     parse5 "^4.0.0"
 
+"@types/jsonwebtoken@^8.3.2":
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz#e3d5245197152346fae7ee87d5541aa5a92d0362"
+  integrity sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/knex@^0.14.20":
   version "0.14.26"
   resolved "https://registry.yarnpkg.com/@types/knex/-/knex-0.14.26.tgz#18c1b5d5a7e44bb0d394209f7e0e965b2987ce57"

From 90c5115c9db5579f7d10342df1c1a3e62e9bd438 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 11:10:00 +0300
Subject: [PATCH 015/104] Add bodyParser for app

---
 modules/core/server-ts/app.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/core/server-ts/app.ts b/modules/core/server-ts/app.ts
index dd85004..fdaaad8 100644
--- a/modules/core/server-ts/app.ts
+++ b/modules/core/server-ts/app.ts
@@ -1,4 +1,5 @@
 import express from 'express';
+import bodyParser from 'body-parser';
 import path from 'path';
 
 import { isApiExternal } from '@restapp/core-common';
@@ -26,6 +27,9 @@ export const createServerApp = (modules: ServerModule) => {
 
   if (!isApiExternal) {
     app.use(contextMiddleware(modules));
+    app.use(bodyParser.urlencoded({ extended: false }));
+    app.use(bodyParser.json());
+
     if (modules.apiRoutes) {
       modules.apiRoutes.forEach(applyMiddleware => applyMiddleware(app, modules));
     }

From d2f2a5ffb9196a34f1a20a0ac5416cef20e73eb3 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 11:16:07 +0300
Subject: [PATCH 016/104] Change form error handler

---
 .../containers/Register.native.tsx            | 19 +++++++++---------
 .../user/client-react/containers/Register.tsx | 20 +++++++++----------
 modules/user/client-react/index.native.tsx    |  2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/containers/Register.native.tsx
index 80eb7b4..666ab79 100644
--- a/modules/user/client-react/containers/Register.native.tsx
+++ b/modules/user/client-react/containers/Register.native.tsx
@@ -10,7 +10,7 @@ import { REGISTER } from '../actions';
 import { CommonProps, RegisterSubmitProps } from '../index.native';
 
 interface RegisterProps extends CommonProps {
-  register: (values: RegisterSubmitProps) => void;
+  register: (values: RegisterSubmitProps) => any;
 }
 
 interface RegisterState {
@@ -25,15 +25,14 @@ class Register extends React.Component<RegisterProps, RegisterState> {
   public onSubmit = async (values: RegisterSubmitProps) => {
     const { t, register, navigation } = this.props;
 
-    try {
-      await register(values);
-      if (!settings.auth.password.requireEmailConfirmation) {
-        navigation.goBack();
-      } else {
-        this.setState({ isRegistered: true });
-      }
-    } catch (e) {
-      throw new FormError(t('reg.errorMsg'), e);
+    const { data } = await register(values);
+    if (data.error) {
+      throw new FormError(t('reg.errorMsg'), data.error);
+    }
+    if (!settings.auth.password.requireEmailConfirmation) {
+      navigation.goBack();
+    } else {
+      this.setState({ isRegistered: true });
     }
   };
 
diff --git a/modules/user/client-react/containers/Register.tsx b/modules/user/client-react/containers/Register.tsx
index b514064..0a513bf 100644
--- a/modules/user/client-react/containers/Register.tsx
+++ b/modules/user/client-react/containers/Register.tsx
@@ -10,7 +10,7 @@ import { REGISTER } from '../actions';
 import settings from '../../../../settings';
 
 interface RegisterProps extends CommonProps {
-  register: (values: RegisterSubmitProps) => void;
+  register: (values: RegisterSubmitProps) => any;
 }
 
 const Register: React.FunctionComponent<RegisterProps> = props => {
@@ -19,15 +19,15 @@ const Register: React.FunctionComponent<RegisterProps> = props => {
   const [isRegistered, setIsRegistered] = React.useState(false);
 
   const onSubmit = async (values: RegisterSubmitProps) => {
-    try {
-      await register(values);
-      if (!settings.auth.password.requireEmailConfirmation) {
-        history.push('/');
-      } else {
-        setIsRegistered(true);
-      }
-    } catch (e) {
-      throw new FormError(t('reg.errorMsg'), e);
+    const { data } = await register(values);
+    if (data.error) {
+      throw new FormError(t('reg.errorMsg'), data.error);
+    }
+
+    if (!settings.auth.password.requireEmailConfirmation) {
+      history.push('/');
+    } else {
+      setIsRegistered(true);
     }
   };
 
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index 05c575a..d9eb2e0 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -7,7 +7,7 @@ import {
   NavigationParams
 } from 'react-navigation';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
+import { HeaderTitle } from '@restapp/look-client-react-native';
 import ClientModule from '@restapp/module-client-react-native';
 import { FormikErrors } from 'formik';
 import resources from './locales';

From 79cea349f54eaf710a50bc4f5036070a3b778390 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 14:16:39 +0300
Subject: [PATCH 017/104] Add status for errors response in register

---
 modules/user/server-ts/password/controllers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 3981d5c..59c5106 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -28,7 +28,7 @@ export const register = async ({ body, t }: any, res: any) => {
   }
 
   if (!isEmpty(errors)) {
-    return res.send({
+    return res.status(422).send({
       error: {
         message: 'Failed reset password',
         errors

From 1cd7ed295512e0bb0f51e57b81c5711700942c63 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 14:17:20 +0300
Subject: [PATCH 018/104] Fix typo in migrations

---
 modules/user/server-ts/{migration => migrations}/002_user.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modules/user/server-ts/{migration => migrations}/002_user.js (100%)

diff --git a/modules/user/server-ts/migration/002_user.js b/modules/user/server-ts/migrations/002_user.js
similarity index 100%
rename from modules/user/server-ts/migration/002_user.js
rename to modules/user/server-ts/migrations/002_user.js

From 65e6ab8eebdc142db27120f814b9fc721955aded Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 14:41:13 +0300
Subject: [PATCH 019/104] Fix redux middleware

---
 modules/core/common/createReduxStore.ts       | 21 ++++++++++---------
 modules/user/client-react/actions/register.ts | 10 ++++++---
 .../containers/Register.native.tsx            | 14 +++++--------
 .../user/client-react/containers/Register.tsx | 16 ++++++--------
 modules/user/client-react/reducers/index.ts   | 13 ++++++++++--
 .../{migration => migrations}/002_user.js     |  0
 yarn.lock                                     |  9 ++++++--
 7 files changed, 47 insertions(+), 36 deletions(-)
 rename modules/user/server-ts/{migration => migrations}/002_user.js (100%)

diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 63a7586..edd869c 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -9,35 +9,36 @@ export const getStoreReducer = (reducers: any) =>
   });
 
 const requestMiddleware: Middleware = _state => next => action => {
-  const { type, request, ...rest } = action;
-  if (!request) {
-    return next(action);
-  }
+  const { types, callAPI, ...rest } = action;
 
-  if (!type) {
-    request();
+  if (!types) {
     return next(action);
   }
 
-  const [REQUEST, SUCCESS, FAIL] = type;
+  const [REQUEST, SUCCESS, FAIL] = types;
+
   next({ type: REQUEST, ...rest });
 
-  (async () => {
+  const handleCallApi = async () => {
     try {
-      const { data } = await request();
+      const { data } = await callAPI();
       next({
         type: SUCCESS,
         payload: data,
         ...rest
       });
+      return data;
     } catch (error) {
       next({
         type: FAIL,
         payload: error,
         ...rest
       });
+      return error;
     }
-  })();
+  };
+
+  return handleCallApi();
 };
 
 const createReduxStore = (reducers: Reducer, initialState: DeepPartial<any>, routerMiddleware?: Middleware): Store => {
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index 7fd53e1..9a3ee6d 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -1,6 +1,10 @@
 import axios from 'axios';
 import { RegisterSubmitProps } from '..';
+import { ActionType } from '../reducers';
 
-const REGISTER = async (value: RegisterSubmitProps) => axios.post(`${__API_URL__}/register`, { ...value });
-
-export default REGISTER;
+export default function REGISTER(value: RegisterSubmitProps) {
+  return {
+    types: [null, ActionType.REGISTER, null],
+    callAPI: async () => axios.post(`${__API_URL__}/register`, { ...value })
+  };
+}
diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/containers/Register.native.tsx
index 666ab79..136d277 100644
--- a/modules/user/client-react/containers/Register.native.tsx
+++ b/modules/user/client-react/containers/Register.native.tsx
@@ -25,10 +25,12 @@ class Register extends React.Component<RegisterProps, RegisterState> {
   public onSubmit = async (values: RegisterSubmitProps) => {
     const { t, register, navigation } = this.props;
 
-    const { data } = await register(values);
+    const data = await register(values);
+
     if (data.error) {
       throw new FormError(t('reg.errorMsg'), data.error);
     }
+
     if (!settings.auth.password.requireEmailConfirmation) {
       navigation.goBack();
     } else {
@@ -53,14 +55,8 @@ class Register extends React.Component<RegisterProps, RegisterState> {
 }
 
 const withConnect = connect(
-  _state => ({}),
-  dispatch => ({
-    register: (value: RegisterSubmitProps) =>
-      dispatch({
-        type: null,
-        request: () => REGISTER(value)
-      })
-  })
+  null,
+  { register: REGISTER }
 );
 
 export default compose(
diff --git a/modules/user/client-react/containers/Register.tsx b/modules/user/client-react/containers/Register.tsx
index 0a513bf..8154d75 100644
--- a/modules/user/client-react/containers/Register.tsx
+++ b/modules/user/client-react/containers/Register.tsx
@@ -11,6 +11,7 @@ import settings from '../../../../settings';
 
 interface RegisterProps extends CommonProps {
   register: (values: RegisterSubmitProps) => any;
+  data: any;
 }
 
 const Register: React.FunctionComponent<RegisterProps> = props => {
@@ -19,9 +20,10 @@ const Register: React.FunctionComponent<RegisterProps> = props => {
   const [isRegistered, setIsRegistered] = React.useState(false);
 
   const onSubmit = async (values: RegisterSubmitProps) => {
-    const { data } = await register(values);
+    const data = await register(values);
+
     if (data.error) {
-      throw new FormError(t('reg.errorMsg'), data.error);
+      throw new FormError(t('reg.errorMsg'), data.error.errors);
     }
 
     if (!settings.auth.password.requireEmailConfirmation) {
@@ -35,12 +37,6 @@ const Register: React.FunctionComponent<RegisterProps> = props => {
 };
 
 export default connect(
-  _state => ({}),
-  dispatch => ({
-    register: (value: RegisterSubmitProps) =>
-      dispatch({
-        type: null,
-        request: () => REGISTER(value)
-      })
-  })
+  null,
+  { register: REGISTER }
 )(translate('user')(Register));
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index 11df66c..87478dd 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -3,12 +3,14 @@ import { User } from '..';
 export enum ActionType {
   SET_CURRENT_USER = 'SET_CURRENT_USER',
   CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
-  SET_LOADING = 'SET_LOADING'
+  SET_LOADING = 'SET_LOADING',
+  REGISTER = 'REGISTER'
 }
 
 export interface UserModuleState {
   currentUser: User;
   loading: boolean;
+  register: any;
 }
 
 export interface UserModuleActionProps {
@@ -20,11 +22,18 @@ export interface UserModuleActionProps {
 
 const defaultState: UserModuleState = {
   currentUser: null,
-  loading: false
+  loading: false,
+  register: null
 };
 
 export default function(state = defaultState, action: UserModuleActionProps) {
   switch (action.type) {
+    case ActionType.REGISTER:
+      return {
+        ...state,
+        register: action.payload
+      };
+
     case ActionType.SET_LOADING:
       return {
         ...state,
diff --git a/modules/user/server-ts/migration/002_user.js b/modules/user/server-ts/migrations/002_user.js
similarity index 100%
rename from modules/user/server-ts/migration/002_user.js
rename to modules/user/server-ts/migrations/002_user.js
diff --git a/yarn.lock b/yarn.lock
index 541e8ac..695d965 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9191,7 +9191,7 @@ immediate@^3.2.2:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c"
   integrity sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=
 
-immutability-helper@^2.6.2:
+immutability-helper@2.8.1, immutability-helper@^2.6.2:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.8.1.tgz#3c5ec05fcd83676bfae7146f319595243ad904f4"
   integrity sha512-8AVB5EUpRBUdXqfe4cFsFECsOIZ9hX/Arl8B8S9/tmwpYv3UWvOsXUPOjkuZIMaVxfSWkxCzkng1rjmEoSWrxQ==
@@ -10040,6 +10040,11 @@ items@2.x.x:
   resolved "https://registry.yarnpkg.com/items/-/items-2.1.2.tgz#0849354595805d586dac98e7e6e85556ea838558"
   integrity sha512-kezcEqgB97BGeZZYtX/MA8AG410ptURstvnz5RAgyFZ8wQFPMxHY8GpTq+/ZHKT3frSlIthUq7EvLt9xn3TvXg==
 
+iterall@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
+  integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
+
 jest-changed-files@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
@@ -18331,7 +18336,7 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-watchpack@^1.5.0:
+watchpack@^1.5.0, "watchpack@https://github.com/Globegitter/watchpack":
   version "1.6.0"
   resolved "https://github.com/Globegitter/watchpack#d903e64a910ab068299f824b04a5e216a15672e9"
   dependencies:

From be7ded238a273ef1af61c0a842569b55953cfab3 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 15:41:53 +0300
Subject: [PATCH 020/104] Add auth module

---
 .../server-ts/access/AccessModule.ts          | 31 ++++++++
 .../authentication/server-ts/access/index.ts  | 20 +++++
 .../server-ts/access/jwt/controllers.ts       | 41 ++++++++++
 .../server-ts/access/jwt/createTokens.ts      | 20 +++++
 .../server-ts/access/jwt/index.ts             | 74 +++++++++++++++++++
 .../server-ts/access/session/controllers.ts   |  5 ++
 .../server-ts/access/session/index.ts         | 69 +++++++++++++++++
 modules/authentication/server-ts/index.ts     |  7 ++
 .../server-ts/locales/en/translations.json    |  7 ++
 .../authentication/server-ts/locales/index.ts |  5 ++
 .../server-ts/locales/ru/translations.json    |  7 ++
 modules/authentication/server-ts/package.json |  8 ++
 .../server-ts/social/AuthModule.ts            | 13 ++++
 .../server-ts/social/facebook/controllers.ts  | 15 ++++
 .../server-ts/social/facebook/index.ts        | 51 +++++++++++++
 .../server-ts/social/github/controllers.ts    | 15 ++++
 .../server-ts/social/github/index.ts          | 51 +++++++++++++
 .../server-ts/social/google/controllers.ts    | 25 +++++++
 .../server-ts/social/google/index.ts          | 53 +++++++++++++
 .../authentication/server-ts/social/index.ts  |  7 ++
 .../server-ts/social/linkedIn/controllers.ts  | 15 ++++
 .../server-ts/social/linkedIn/index.ts        | 51 +++++++++++++
 22 files changed, 590 insertions(+)
 create mode 100644 modules/authentication/server-ts/access/AccessModule.ts
 create mode 100644 modules/authentication/server-ts/access/index.ts
 create mode 100644 modules/authentication/server-ts/access/jwt/controllers.ts
 create mode 100644 modules/authentication/server-ts/access/jwt/createTokens.ts
 create mode 100644 modules/authentication/server-ts/access/jwt/index.ts
 create mode 100644 modules/authentication/server-ts/access/session/controllers.ts
 create mode 100644 modules/authentication/server-ts/access/session/index.ts
 create mode 100644 modules/authentication/server-ts/index.ts
 create mode 100644 modules/authentication/server-ts/locales/en/translations.json
 create mode 100644 modules/authentication/server-ts/locales/index.ts
 create mode 100644 modules/authentication/server-ts/locales/ru/translations.json
 create mode 100644 modules/authentication/server-ts/package.json
 create mode 100644 modules/authentication/server-ts/social/AuthModule.ts
 create mode 100644 modules/authentication/server-ts/social/facebook/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/facebook/index.ts
 create mode 100644 modules/authentication/server-ts/social/github/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/github/index.ts
 create mode 100644 modules/authentication/server-ts/social/google/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/google/index.ts
 create mode 100644 modules/authentication/server-ts/social/index.ts
 create mode 100644 modules/authentication/server-ts/social/linkedIn/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/linkedIn/index.ts

diff --git a/modules/authentication/server-ts/access/AccessModule.ts b/modules/authentication/server-ts/access/AccessModule.ts
new file mode 100644
index 0000000..1a01662
--- /dev/null
+++ b/modules/authentication/server-ts/access/AccessModule.ts
@@ -0,0 +1,31 @@
+import { UserShape } from './index';
+import { Request } from 'express';
+import { merge } from 'lodash';
+import ServerModule, { ServerModuleShape } from '@restapp/module-server-ts';
+
+interface AccessModuleShape extends ServerModuleShape {
+  grant?: Array<(identity: UserShape, req: Request, passwordHash: string) => { [key: string]: any } | void>;
+  // grant?: (user: any) => Promise<[string, string]>;
+}
+
+interface AccessModule extends AccessModuleShape {}
+
+type GrantAccessFunc = (identity: UserShape, req: Request, passwordHash: string) => Promise<any>;
+
+class AccessModule extends ServerModule {
+  constructor(...modules: AccessModuleShape[]) {
+    super(...modules);
+  }
+
+  get grantAccess(): GrantAccessFunc {
+    return async (identity: UserShape, req: Request, passwordHash: string) => {
+      let result = {};
+      for (const grant of this.grant) {
+        result = merge(result, await grant(identity, req, passwordHash));
+      }
+      return result;
+    };
+  }
+}
+
+export default AccessModule;
diff --git a/modules/authentication/server-ts/access/index.ts b/modules/authentication/server-ts/access/index.ts
new file mode 100644
index 0000000..e0b9b14
--- /dev/null
+++ b/modules/authentication/server-ts/access/index.ts
@@ -0,0 +1,20 @@
+import jwt from './jwt';
+import session from './session';
+import resources from '../locales';
+
+import AccessModule from './AccessModule';
+
+export interface UserShape {
+  id: number;
+  username: string;
+  role: string;
+  isActive: boolean;
+  email: string;
+  passwordHash: string;
+}
+
+// Try to grant access via sessions first, and if that fails, then try using JWT
+// This way if both JWT and sessions enabled UI won't have to refresh access tokens
+export default new AccessModule(session, jwt, {
+  localization: [{ ns: 'auth', resources }]
+});
diff --git a/modules/authentication/server-ts/access/jwt/controllers.ts b/modules/authentication/server-ts/access/jwt/controllers.ts
new file mode 100644
index 0000000..ed769a5
--- /dev/null
+++ b/modules/authentication/server-ts/access/jwt/controllers.ts
@@ -0,0 +1,41 @@
+import jwt from 'jsonwebtoken';
+
+import settings from '../../../../../settings';
+import createTokens from './createTokens';
+
+export const refreshTokens = async (req: any, res: any) => {
+  const {
+    body: { refreshToken: inputRefreshToken },
+    t
+  } = req;
+  const {
+    locals: {
+      appContext: {
+        user: { getHash, getIdentity }
+      }
+    }
+  } = res;
+  const decodedToken = jwt.decode(inputRefreshToken) as { [key: string]: any };
+  const isValidToken = decodedToken && decodedToken.id;
+
+  if (!isValidToken) {
+    res.send(t('auth:invalidRefresh'));
+  }
+
+  const identity = await getIdentity(decodedToken.id);
+  const hash = getHash ? await getHash(decodedToken.id) : '';
+  const refreshSecret = settings.auth.secret + hash;
+
+  try {
+    jwt.verify(inputRefreshToken, refreshSecret);
+  } catch (err) {
+    res.send(err);
+  }
+
+  const [accessToken, refreshToken] = await createTokens(identity, settings.auth.secret, refreshSecret, req.t);
+
+  res.json({
+    accessToken,
+    refreshToken
+  });
+};
diff --git a/modules/authentication/server-ts/access/jwt/createTokens.ts b/modules/authentication/server-ts/access/jwt/createTokens.ts
new file mode 100644
index 0000000..604d631
--- /dev/null
+++ b/modules/authentication/server-ts/access/jwt/createTokens.ts
@@ -0,0 +1,20 @@
+import jwt from 'jsonwebtoken';
+
+import { UserShape } from './../index';
+import settings from '../../../../../settings';
+
+const {
+  jwt: { tokenExpiresIn, refreshTokenExpiresIn }
+} = settings.auth;
+
+const createTokens = async (identity: UserShape, secret: string, refreshSecret: string, t: any) => {
+  if (!identity.id) {
+    throw new Error(t('auth:identityWithoutId'));
+  }
+  const createToken = jwt.sign({ identity }, secret, { expiresIn: tokenExpiresIn });
+  const createRefreshToken = jwt.sign({ id: identity.id }, refreshSecret, { expiresIn: refreshTokenExpiresIn });
+
+  return Promise.all([createToken, createRefreshToken]);
+};
+
+export default createTokens;
diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
new file mode 100644
index 0000000..23f4d74
--- /dev/null
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -0,0 +1,74 @@
+import { Express } from 'express';
+import { Strategy as LocalStratery } from 'passport-local';
+import bodyParser from 'body-parser';
+import passport from 'passport';
+import { Strategy as JWTStrategy, ExtractJwt } from 'passport-jwt';
+
+import { RestMethod } from '@restapp/module-server-ts';
+import settings from '../../../../../settings';
+import AccessModule from '../AccessModule';
+import { refreshTokens } from './controllers';
+import createTokens from './createTokens';
+
+const {
+  auth: { secret }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(bodyParser.urlencoded({ extended: false }));
+  app.use(bodyParser.json());
+  app.use(passport.initialize());
+};
+
+const accessMiddleware = passport.authenticate('jwt', { session: false });
+
+const grant = async (identity: any, req: any, passwordHash: string = '') => {
+  const refreshSecret = settings.auth.secret + passwordHash;
+  const [accessToken, refreshToken] = await createTokens(identity, settings.auth.secret, refreshSecret, req.t);
+
+  return {
+    accessToken,
+    refreshToken
+  };
+};
+
+const onAppCreate = ({ appContext }: AccessModule) => {
+  passport.use(
+    new LocalStratery(async (username: string, password: string, done: any) => {
+      const { identity, message } = await appContext.user.validateLogin(username, password);
+
+      if (message) {
+        return done(null, false, { message });
+      }
+      return done(null, identity);
+    })
+  );
+
+  passport.use(
+    new JWTStrategy(
+      {
+        jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
+        secretOrKey: secret
+      },
+      (jwtPayload: any, cb: any) => {
+        return cb(null, jwtPayload.identity);
+      }
+    )
+  );
+};
+
+export default (settings.auth.jwt.enabled
+  ? new AccessModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      grant: [grant],
+      apiRouteParams: [
+        {
+          method: RestMethod.POST,
+          route: 'refreshToken',
+          controller: refreshTokens
+        }
+      ],
+      accessMiddleware
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/access/session/controllers.ts b/modules/authentication/server-ts/access/session/controllers.ts
new file mode 100644
index 0000000..43205f6
--- /dev/null
+++ b/modules/authentication/server-ts/access/session/controllers.ts
@@ -0,0 +1,5 @@
+import { Request, Response } from 'express';
+
+export const logout = (req: Request, res: Response) => {
+  req.logout();
+};
diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
new file mode 100644
index 0000000..b73eac3
--- /dev/null
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -0,0 +1,69 @@
+import { Express, Request, Response } from 'express';
+import { Strategy } from 'passport-local';
+import bodyParser from 'body-parser';
+import session from 'express-session';
+import passport from 'passport';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import settings from '../../../../../settings';
+import AccessModule from '../AccessModule';
+import { logout } from './controllers';
+
+const FileStore = require('session-file-store')(session);
+
+const beforeware = (app: Express) => {
+  app.use(bodyParser.urlencoded({ extended: false }));
+  app.use(bodyParser.json());
+  app.use(
+    session({
+      secret: 'secret',
+      store: __DEV__ ? new FileStore() : null,
+      cookie: { maxAge: 60000 },
+      resave: false,
+      saveUninitialized: false
+    })
+  );
+  app.use(passport.initialize());
+  app.use(passport.session());
+};
+
+const accessMiddleware = (req: Request, res: Response, next: any) =>
+  req.isAuthenticated() ? next() : res.send('unauthorized');
+
+const onAppCreate = ({ appContext }: AccessModule) => {
+  passport.serializeUser((identity: { id: number }, cb) => {
+    cb(null, identity.id);
+  });
+
+  passport.deserializeUser(async (id, cb) => {
+    const identity = await appContext.user.getIdentity(id);
+    return cb(null, identity);
+  });
+
+  passport.use(
+    new Strategy(async (username: string, password: string, done: any) => {
+      const { identity, message } = await appContext.user.validateLogin(username, password);
+
+      if (message) {
+        return done(null, false, { message });
+      }
+      return done(null, identity);
+    })
+  );
+};
+
+export default (settings.auth.session.enabled
+  ? new AccessModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      accessMiddleware,
+      apiRouteParams: [
+        {
+          method: RestMethod.POST,
+          route: 'logout',
+          controller: logout
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/index.ts b/modules/authentication/server-ts/index.ts
new file mode 100644
index 0000000..29e12d5
--- /dev/null
+++ b/modules/authentication/server-ts/index.ts
@@ -0,0 +1,7 @@
+import ServerModule from '@restapp/module-server-ts';
+import AuthModule from './social/AuthModule';
+import access from './access';
+import social from './social';
+
+export default new ServerModule(access, social);
+export { access, AuthModule };
diff --git a/modules/authentication/server-ts/locales/en/translations.json b/modules/authentication/server-ts/locales/en/translations.json
new file mode 100644
index 0000000..f1dd1a7
--- /dev/null
+++ b/modules/authentication/server-ts/locales/en/translations.json
@@ -0,0 +1,7 @@
+{
+  "getIdentify": "Can not find 'getIdentity' method. Please, add this method to the context.",
+  "invalidCsrf": "CSRF token validation failed",
+  "identityWithoutId": "Identity must have 'id' method.",
+  "invalidRefresh": "Refresh token validation failed",
+  "social": "Cannot find social property on the context. Please, add this property to the context."
+}
\ No newline at end of file
diff --git a/modules/authentication/server-ts/locales/index.ts b/modules/authentication/server-ts/locales/index.ts
new file mode 100644
index 0000000..d9fb121
--- /dev/null
+++ b/modules/authentication/server-ts/locales/index.ts
@@ -0,0 +1,5 @@
+/*
+ * The index.js can be empty, it's just needed to point the loader to the root directory of the locales.
+ * https://github.com/alienfast/i18next-loader#option-2-use-with-import-syntax
+ */
+export default {};
diff --git a/modules/authentication/server-ts/locales/ru/translations.json b/modules/authentication/server-ts/locales/ru/translations.json
new file mode 100644
index 0000000..d64617c
--- /dev/null
+++ b/modules/authentication/server-ts/locales/ru/translations.json
@@ -0,0 +1,7 @@
+{
+  "getIdentify": "Не доступен 'getIdentity' метод. Пожалуйста, добавьте метод в context.",
+  "invalidCsrf": "CSRF ошибка проверки токена",
+  "identityWithoutId": "Identity дожен иметь 'id'",
+  "invalidRefresh": "Refresh token не прошел проверку",
+  "social": "Не доступно свойство social в context. Пожалуйста, добавьте свойство в context."
+}
\ No newline at end of file
diff --git a/modules/authentication/server-ts/package.json b/modules/authentication/server-ts/package.json
new file mode 100644
index 0000000..110f74a
--- /dev/null
+++ b/modules/authentication/server-ts/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@restapp/authentication-server-ts",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@restapp/module-server-ts": "^0.1.0"
+  }
+}
diff --git a/modules/authentication/server-ts/social/AuthModule.ts b/modules/authentication/server-ts/social/AuthModule.ts
new file mode 100644
index 0000000..4cf31cc
--- /dev/null
+++ b/modules/authentication/server-ts/social/AuthModule.ts
@@ -0,0 +1,13 @@
+import ServerModule, { ServerModuleShape } from '@restapp/module-server-ts';
+
+interface AuthModuleShape extends ServerModuleShape {}
+
+interface AuthModule extends AuthModuleShape {}
+
+class AuthModule extends ServerModule {
+  constructor(...modules: AuthModuleShape[]) {
+    super(...modules);
+  }
+}
+
+export default AuthModule;
diff --git a/modules/authentication/server-ts/social/facebook/controllers.ts b/modules/authentication/server-ts/social/facebook/controllers.ts
new file mode 100644
index 0000000..37ee72c
--- /dev/null
+++ b/modules/authentication/server-ts/social/facebook/controllers.ts
@@ -0,0 +1,15 @@
+import passport from 'passport';
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('facebook', { state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.facebook.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/facebook/index.ts b/modules/authentication/server-ts/social/facebook/index.ts
new file mode 100644
index 0000000..9b21f35
--- /dev/null
+++ b/modules/authentication/server-ts/social/facebook/index.ts
@@ -0,0 +1,51 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { Strategy as FacebookStrategy } from 'passport-facebook';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import AuthModule from '../AuthModule';
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    session,
+    social: {
+      facebook: { clientID, clientSecret, callbackURL, profileFields, enabled }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  passport.use(
+    new FacebookStrategy(
+      { clientID, clientSecret, callbackURL, profileFields },
+      appContext.social ? appContext.social.facebook.verifyCallback : undefined
+    )
+  );
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/facebook',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/facebook/callback',
+          middleware: [passport.authenticate('facebook', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/social/github/controllers.ts b/modules/authentication/server-ts/social/github/controllers.ts
new file mode 100644
index 0000000..dcf0bd1
--- /dev/null
+++ b/modules/authentication/server-ts/social/github/controllers.ts
@@ -0,0 +1,15 @@
+import passport from 'passport';
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('github', { state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.github.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/github/index.ts b/modules/authentication/server-ts/social/github/index.ts
new file mode 100644
index 0000000..c0e00f6
--- /dev/null
+++ b/modules/authentication/server-ts/social/github/index.ts
@@ -0,0 +1,51 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { Strategy as GitHubStrategy } from 'passport-github';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import settings from '../../../../../settings';
+import AuthModule from '../AuthModule';
+
+const {
+  auth: {
+    session,
+    social: {
+      github: { clientID, clientSecret, scope, callbackURL, enabled }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  passport.use(
+    new GitHubStrategy(
+      { clientID, clientSecret, scope, callbackURL },
+      appContext.social ? appContext.social.github.verifyCallback : undefined
+    )
+  );
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/github',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/github/callback',
+          middleware: [passport.authenticate('github', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/social/google/controllers.ts b/modules/authentication/server-ts/social/google/controllers.ts
new file mode 100644
index 0000000..8de72c8
--- /dev/null
+++ b/modules/authentication/server-ts/social/google/controllers.ts
@@ -0,0 +1,25 @@
+import passport from 'passport';
+
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    social: {
+      google: { scope }
+    }
+  }
+} = settings;
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('google', { scope, state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.google.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/google/index.ts b/modules/authentication/server-ts/social/google/index.ts
new file mode 100644
index 0000000..1f40c7c
--- /dev/null
+++ b/modules/authentication/server-ts/social/google/index.ts
@@ -0,0 +1,53 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { OAuth2Strategy as GoogleStrategy } from 'passport-google-oauth';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import AuthModule from '../AuthModule';
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    session,
+    social: {
+      google: { clientID, clientSecret, callbackURL, enabled }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  if (enabled && !__TEST__) {
+    passport.use(
+      new GoogleStrategy(
+        { clientID, clientSecret, callbackURL },
+        appContext.social ? appContext.social.google.verifyCallback : undefined
+      )
+    );
+  }
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/google',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/google/callback',
+          middleware: [passport.authenticate('google', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/social/index.ts b/modules/authentication/server-ts/social/index.ts
new file mode 100644
index 0000000..38d571a
--- /dev/null
+++ b/modules/authentication/server-ts/social/index.ts
@@ -0,0 +1,7 @@
+import ServerModule from '@restapp/module-server-ts';
+import github from './github';
+import google from './google';
+import facebook from './facebook';
+import linkedin from './linkedIn';
+
+export default new ServerModule(github, google, facebook, linkedin);
diff --git a/modules/authentication/server-ts/social/linkedIn/controllers.ts b/modules/authentication/server-ts/social/linkedIn/controllers.ts
new file mode 100644
index 0000000..355bae4
--- /dev/null
+++ b/modules/authentication/server-ts/social/linkedIn/controllers.ts
@@ -0,0 +1,15 @@
+import passport from 'passport';
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('linkedin', { state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.google.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/linkedIn/index.ts b/modules/authentication/server-ts/social/linkedIn/index.ts
new file mode 100644
index 0000000..a4ce503
--- /dev/null
+++ b/modules/authentication/server-ts/social/linkedIn/index.ts
@@ -0,0 +1,51 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { Strategy as LinkedInStrategy } from '@sokratis/passport-linkedin-oauth2';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import AuthModule from '../AuthModule';
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    session,
+    social: {
+      linkedin: { clientID, clientSecret, callbackURL, enabled, scope }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  passport.use(
+    new LinkedInStrategy(
+      { clientID, clientSecret, callbackURL, scopeSeparator: scope },
+      appContext.social ? appContext.social.linkedin.verifyCallback : undefined
+    )
+  );
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/linkedin',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/linkedin/callback',
+          middleware: [passport.authenticate('linkedin', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);

From 5ed25afb2cb26c0b6b0ac723e7b454bfa9f67b7f Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 15:43:05 +0300
Subject: [PATCH 021/104] Add types for passport

---
 packages/server/package.json | 1 +
 yarn.lock                    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/packages/server/package.json b/packages/server/package.json
index dcd8c09..14737c8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -116,6 +116,7 @@
     "@types/knex": "^0.14.20",
     "@types/mkdirp": "^0.5.2",
     "@types/nodemailer": "^4.6.2",
+    "@types/passport": "^1.0.0",
     "@types/react-dom": "^16.8.0",
     "@types/serialize-javascript": "^1.3.2",
     "@types/shortid": "0.0.29",
diff --git a/yarn.lock b/yarn.lock
index 695d965..da3bdc9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2203,6 +2203,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/passport@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.0.tgz#747fa127a747a145ff279f3df3e07c425e5ff297"
+  integrity sha512-R2FXqM+AgsMIym0PuKj08Ybx+GR6d2rU3b1/8OcHolJ+4ga2pRPX105wboV6hq1AJvMo2frQzYKdqXS5+4cyMw==
+  dependencies:
+    "@types/express" "*"
+
 "@types/pdfmake@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@types/pdfmake/-/pdfmake-0.1.3.tgz#0f16bd71fc2ff1b9bed3b4ad042fd7119f08ae7e"

From 72b4ba94e705a650667412b8a5d98a1e2de89f35 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 15:46:36 +0300
Subject: [PATCH 022/104] Add config for session and jwt

---
 config/auth.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/config/auth.js b/config/auth.js
index 68329a8..edfb19e 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -1,4 +1,13 @@
 export default {
+  secret: process.env.NODE_ENV === 'test' ? 'secret for tests' : process.env.AUTH_SECRET,
+  session: {
+    enabled: true
+  },
+  jwt: {
+    enabled: false,
+    tokenExpiresIn: '1m',
+    refreshTokenExpiresIn: '7d'
+  },
   password: {
     requireEmailConfirmation: false,
     sendPasswordChangesEmail: false,

From dfda04a7a3c4dc824926c7f642f71f991f65c326 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 15:47:11 +0300
Subject: [PATCH 023/104] Add login conrtoller

---
 .../user/server-ts/password/controllers.ts    | 24 ++++++++++++++++++-
 modules/user/server-ts/password/index.ts      |  7 +++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 59c5106..156d718 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -1,6 +1,8 @@
 import { UserShape } from './../sql';
 import { pick, isEmpty } from 'lodash';
 import jwt from 'jsonwebtoken';
+import passport from 'passport';
+import { access } from '@restapp/authentication-server-ts';
 import { log } from '@restapp/core-common';
 import { mailer } from '@restapp/mailer-server-ts';
 
@@ -11,10 +13,30 @@ import emailTemplate from '../emailTemplate';
 import { createPasswordHash } from '.';
 
 const {
-  auth: { password, secret },
+  auth: { session, jwt: jwtSetting, password, secret },
   app
 } = settings;
 
+export const login = (req: any, res: any) => {
+  passport.authenticate('local', { session: session.enabled }, (err, user, info) => {
+    if (err || !user) {
+      return res.status(400).json({
+        message: info ? info.message : 'Login failed',
+        user
+      });
+    }
+
+    req.login(user, { session: session.enabled }, async (loginErr: any) => {
+      if (loginErr) {
+        res.send(loginErr);
+      }
+      const tokens = jwtSetting.enabled ? await access.grantAccess(user, req, user.passwordHash) : null;
+
+      return res.json({ user, tokens });
+    });
+  })(req, res);
+};
+
 export const register = async ({ body, t }: any, res: any) => {
   const errors: ValidationErrors = {};
   const userExists = await userDAO.getUserByUsername(body.username);
diff --git a/modules/user/server-ts/password/index.ts b/modules/user/server-ts/password/index.ts
index cb9ac42..0a5db44 100644
--- a/modules/user/server-ts/password/index.ts
+++ b/modules/user/server-ts/password/index.ts
@@ -2,7 +2,7 @@ import bcrypt from 'bcryptjs';
 
 import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 
-import { register } from './controllers';
+import { register, login } from './controllers';
 import settings from '../../../../settings';
 
 export const createPasswordHash = (pswd: string) => bcrypt.hash(pswd, 12);
@@ -14,6 +14,11 @@ export default (settings.auth.password.enabled
           method: RestMethod.POST,
           route: 'register',
           controller: register
+        },
+        {
+          method: RestMethod.POST,
+          route: 'login',
+          controller: login
         }
       ]
     })

From 08e2d22bfa0041273e986f08c6939c487dcd8df7 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 16:32:50 +0300
Subject: [PATCH 024/104] Fix validation errors

---
 modules/core/common/createReduxStore.ts                     | 6 +++---
 modules/forms/client-react/FormError.ts                     | 6 ++----
 modules/user/client-react/actions/register.ts               | 2 +-
 .../user/client-react/components/RegisterForm.native.tsx    | 4 ++--
 modules/user/client-react/components/RegisterForm.tsx       | 6 +++---
 modules/user/client-react/containers/Register.tsx           | 4 ++--
 modules/user/client-react/index.tsx                         | 2 +-
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index edd869c..5bcda53 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -28,13 +28,13 @@ const requestMiddleware: Middleware = _state => next => action => {
         ...rest
       });
       return data;
-    } catch (error) {
+    } catch ({ response: { data } }) {
       next({
         type: FAIL,
-        payload: error,
+        payload: data,
         ...rest
       });
-      return error;
+      return data;
     }
   };
 
diff --git a/modules/forms/client-react/FormError.ts b/modules/forms/client-react/FormError.ts
index 91c7188..c4f1f57 100644
--- a/modules/forms/client-react/FormError.ts
+++ b/modules/forms/client-react/FormError.ts
@@ -1,13 +1,11 @@
-export const isFormError = (err: any) => err instanceof FormError;
-
 export class FormError {
   private readonly _errors: { [key: string]: any };
 
-  constructor(errorMsg: string, err?: any) {
+  constructor(message: string, err?: any) {
     if (err) {
       throw err;
     } else {
-      this._errors = { errorMsg };
+      this._errors = { message };
     }
   }
 
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index 9a3ee6d..365793f 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -5,6 +5,6 @@ import { ActionType } from '../reducers';
 export default function REGISTER(value: RegisterSubmitProps) {
   return {
     types: [null, ActionType.REGISTER, null],
-    callAPI: async () => axios.post(`${__API_URL__}/register`, { ...value })
+    callAPI: () => axios.post(`${__API_URL__}/register`, { ...value })
   };
 }
diff --git a/modules/user/client-react/components/RegisterForm.native.tsx b/modules/user/client-react/components/RegisterForm.native.tsx
index 9623215..14404d3 100644
--- a/modules/user/client-react/components/RegisterForm.native.tsx
+++ b/modules/user/client-react/components/RegisterForm.native.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { View, StyleSheet } from 'react-native';
 import { withFormik } from 'formik';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
-import { isFormError, FieldAdapter as Field } from '@restapp/forms-client-react';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
 
 import { RenderField, Button, primary, FormView } from '@restapp/look-client-react-native';
@@ -75,7 +75,7 @@ const RegisterFormWithFormik = withFormik<FormProps<RegisterSubmitProps>, Regist
   validate: values => validate(values, registerFormSchema),
   async handleSubmit(values, { setErrors, props: { onSubmit } }) {
     onSubmit(values).catch((e: any) => {
-      if (isFormError(e)) {
+      if (e) {
         setErrors(e.errors);
       } else {
         throw e;
diff --git a/modules/user/client-react/components/RegisterForm.tsx b/modules/user/client-react/components/RegisterForm.tsx
index e4067b5..422dd6a 100644
--- a/modules/user/client-react/components/RegisterForm.tsx
+++ b/modules/user/client-react/components/RegisterForm.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { withFormik } from 'formik';
-import { isFormError, FieldAdapter as Field } from '@restapp/forms-client-react';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
 
 import { match, email, minLength, required, validate } from '@restapp/validation-common-react';
@@ -42,7 +42,7 @@ const RegisterForm = ({ values, handleSubmit, submitting, errors, t }: FormProps
         value={values.passwordConfirmation}
       />
       <div className="text-center">
-        {errors && errors.errorMsg && <Alert color="error">{errors.errorMsg}</Alert>}
+        {errors && errors.message && <Alert color="error">{errors.message}</Alert>}
         <Button color="primary" type="submit" disabled={submitting}>
           {t('reg.form.btnSubmit')}
         </Button>
@@ -56,7 +56,7 @@ const RegisterFormWithFormik = withFormik<FormProps<RegisterSubmitProps>, Regist
   validate: values => validate(values, registerFormSchema),
   async handleSubmit(values, { setErrors, props: { onSubmit } }) {
     onSubmit(values).catch((e: any) => {
-      if (isFormError(e)) {
+      if (e) {
         setErrors(e.errors);
       } else {
         throw e;
diff --git a/modules/user/client-react/containers/Register.tsx b/modules/user/client-react/containers/Register.tsx
index 8154d75..5fbfb85 100644
--- a/modules/user/client-react/containers/Register.tsx
+++ b/modules/user/client-react/containers/Register.tsx
@@ -22,8 +22,8 @@ const Register: React.FunctionComponent<RegisterProps> = props => {
   const onSubmit = async (values: RegisterSubmitProps) => {
     const data = await register(values);
 
-    if (data.error) {
-      throw new FormError(t('reg.errorMsg'), data.error.errors);
+    if (data.errors) {
+      throw new FormError(t('reg.errorMsg'), data);
     }
 
     if (!settings.auth.password.requireEmailConfirmation) {
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index 8014aad..0f2f7ac 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -66,7 +66,7 @@ interface HandleSubmitProps<P> {
 }
 
 interface Errors {
-  errorMsg?: string;
+  message?: string;
 }
 export interface FormProps<V> {
   handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;

From a7e0c7d9c4820ec1db0b2b2dbb39aedfab800854 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 16:25:49 +0300
Subject: [PATCH 025/104] Remove social auth

---
 modules/authentication/server-ts/index.ts     |  6 +--
 .../server-ts/social/AuthModule.ts            | 13 -----
 .../server-ts/social/facebook/controllers.ts  | 15 ------
 .../server-ts/social/facebook/index.ts        | 51 ------------------
 .../server-ts/social/github/controllers.ts    | 15 ------
 .../server-ts/social/github/index.ts          | 51 ------------------
 .../server-ts/social/google/controllers.ts    | 25 ---------
 .../server-ts/social/google/index.ts          | 53 -------------------
 .../authentication/server-ts/social/index.ts  |  7 ---
 .../server-ts/social/linkedIn/controllers.ts  | 15 ------
 .../server-ts/social/linkedIn/index.ts        | 51 ------------------
 11 files changed, 2 insertions(+), 300 deletions(-)
 delete mode 100644 modules/authentication/server-ts/social/AuthModule.ts
 delete mode 100644 modules/authentication/server-ts/social/facebook/controllers.ts
 delete mode 100644 modules/authentication/server-ts/social/facebook/index.ts
 delete mode 100644 modules/authentication/server-ts/social/github/controllers.ts
 delete mode 100644 modules/authentication/server-ts/social/github/index.ts
 delete mode 100644 modules/authentication/server-ts/social/google/controllers.ts
 delete mode 100644 modules/authentication/server-ts/social/google/index.ts
 delete mode 100644 modules/authentication/server-ts/social/index.ts
 delete mode 100644 modules/authentication/server-ts/social/linkedIn/controllers.ts
 delete mode 100644 modules/authentication/server-ts/social/linkedIn/index.ts

diff --git a/modules/authentication/server-ts/index.ts b/modules/authentication/server-ts/index.ts
index 29e12d5..62f2a4d 100644
--- a/modules/authentication/server-ts/index.ts
+++ b/modules/authentication/server-ts/index.ts
@@ -1,7 +1,5 @@
 import ServerModule from '@restapp/module-server-ts';
-import AuthModule from './social/AuthModule';
 import access from './access';
-import social from './social';
 
-export default new ServerModule(access, social);
-export { access, AuthModule };
+export default new ServerModule(access);
+export { access };
diff --git a/modules/authentication/server-ts/social/AuthModule.ts b/modules/authentication/server-ts/social/AuthModule.ts
deleted file mode 100644
index 4cf31cc..0000000
--- a/modules/authentication/server-ts/social/AuthModule.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import ServerModule, { ServerModuleShape } from '@restapp/module-server-ts';
-
-interface AuthModuleShape extends ServerModuleShape {}
-
-interface AuthModule extends AuthModuleShape {}
-
-class AuthModule extends ServerModule {
-  constructor(...modules: AuthModuleShape[]) {
-    super(...modules);
-  }
-}
-
-export default AuthModule;
diff --git a/modules/authentication/server-ts/social/facebook/controllers.ts b/modules/authentication/server-ts/social/facebook/controllers.ts
deleted file mode 100644
index 37ee72c..0000000
--- a/modules/authentication/server-ts/social/facebook/controllers.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import passport from 'passport';
-
-export const auth = (req: any, res: any) => {
-  passport.authenticate('facebook', { state: req.query.expoUrl })(req, res);
-};
-
-export const onAuthenticationSuccess = (req: any, res: any) => {
-  const {
-    locals: { appContext }
-  } = res;
-  const { t } = req;
-  appContext.social
-    ? appContext.social.facebook.onAuthenticationSuccess(req, res)
-    : res.status(500).send(t('auth:social'));
-};
diff --git a/modules/authentication/server-ts/social/facebook/index.ts b/modules/authentication/server-ts/social/facebook/index.ts
deleted file mode 100644
index 9b21f35..0000000
--- a/modules/authentication/server-ts/social/facebook/index.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Express } from 'express';
-import passport from 'passport';
-import { Strategy as FacebookStrategy } from 'passport-facebook';
-
-import { RestMethod } from '@restapp/module-server-ts';
-
-import { auth, onAuthenticationSuccess } from './controllers';
-import AuthModule from '../AuthModule';
-import settings from '../../../../../settings';
-
-const {
-  auth: {
-    session,
-    social: {
-      facebook: { clientID, clientSecret, callbackURL, profileFields, enabled }
-    }
-  }
-} = settings;
-
-const beforeware = (app: Express) => {
-  app.use(passport.initialize());
-};
-
-const onAppCreate = ({ appContext }: AuthModule) => {
-  passport.use(
-    new FacebookStrategy(
-      { clientID, clientSecret, callbackURL, profileFields },
-      appContext.social ? appContext.social.facebook.verifyCallback : undefined
-    )
-  );
-};
-
-export default (enabled && !__TEST__
-  ? new AuthModule({
-      beforeware: [beforeware],
-      onAppCreate: [onAppCreate],
-      apiRouteParams: [
-        {
-          method: RestMethod.GET,
-          route: 'auth/facebook',
-          controller: auth
-        },
-        {
-          method: RestMethod.GET,
-          route: 'auth/facebook/callback',
-          middleware: [passport.authenticate('facebook', { session: session.enabled, failureRedirect: '/login' })],
-          controller: onAuthenticationSuccess
-        }
-      ]
-    })
-  : undefined);
diff --git a/modules/authentication/server-ts/social/github/controllers.ts b/modules/authentication/server-ts/social/github/controllers.ts
deleted file mode 100644
index dcf0bd1..0000000
--- a/modules/authentication/server-ts/social/github/controllers.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import passport from 'passport';
-
-export const auth = (req: any, res: any) => {
-  passport.authenticate('github', { state: req.query.expoUrl })(req, res);
-};
-
-export const onAuthenticationSuccess = (req: any, res: any) => {
-  const {
-    locals: { appContext }
-  } = res;
-  const { t } = req;
-  appContext.social
-    ? appContext.social.github.onAuthenticationSuccess(req, res)
-    : res.status(500).send(t('auth:social'));
-};
diff --git a/modules/authentication/server-ts/social/github/index.ts b/modules/authentication/server-ts/social/github/index.ts
deleted file mode 100644
index c0e00f6..0000000
--- a/modules/authentication/server-ts/social/github/index.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Express } from 'express';
-import passport from 'passport';
-import { Strategy as GitHubStrategy } from 'passport-github';
-
-import { RestMethod } from '@restapp/module-server-ts';
-
-import { auth, onAuthenticationSuccess } from './controllers';
-import settings from '../../../../../settings';
-import AuthModule from '../AuthModule';
-
-const {
-  auth: {
-    session,
-    social: {
-      github: { clientID, clientSecret, scope, callbackURL, enabled }
-    }
-  }
-} = settings;
-
-const beforeware = (app: Express) => {
-  app.use(passport.initialize());
-};
-
-const onAppCreate = ({ appContext }: AuthModule) => {
-  passport.use(
-    new GitHubStrategy(
-      { clientID, clientSecret, scope, callbackURL },
-      appContext.social ? appContext.social.github.verifyCallback : undefined
-    )
-  );
-};
-
-export default (enabled && !__TEST__
-  ? new AuthModule({
-      beforeware: [beforeware],
-      onAppCreate: [onAppCreate],
-      apiRouteParams: [
-        {
-          method: RestMethod.GET,
-          route: 'auth/github',
-          controller: auth
-        },
-        {
-          method: RestMethod.GET,
-          route: 'auth/github/callback',
-          middleware: [passport.authenticate('github', { session: session.enabled, failureRedirect: '/login' })],
-          controller: onAuthenticationSuccess
-        }
-      ]
-    })
-  : undefined);
diff --git a/modules/authentication/server-ts/social/google/controllers.ts b/modules/authentication/server-ts/social/google/controllers.ts
deleted file mode 100644
index 8de72c8..0000000
--- a/modules/authentication/server-ts/social/google/controllers.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import passport from 'passport';
-
-import settings from '../../../../../settings';
-
-const {
-  auth: {
-    social: {
-      google: { scope }
-    }
-  }
-} = settings;
-
-export const auth = (req: any, res: any) => {
-  passport.authenticate('google', { scope, state: req.query.expoUrl })(req, res);
-};
-
-export const onAuthenticationSuccess = (req: any, res: any) => {
-  const {
-    locals: { appContext }
-  } = res;
-  const { t } = req;
-  appContext.social
-    ? appContext.social.google.onAuthenticationSuccess(req, res)
-    : res.status(500).send(t('auth:social'));
-};
diff --git a/modules/authentication/server-ts/social/google/index.ts b/modules/authentication/server-ts/social/google/index.ts
deleted file mode 100644
index 1f40c7c..0000000
--- a/modules/authentication/server-ts/social/google/index.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Express } from 'express';
-import passport from 'passport';
-import { OAuth2Strategy as GoogleStrategy } from 'passport-google-oauth';
-
-import { RestMethod } from '@restapp/module-server-ts';
-
-import { auth, onAuthenticationSuccess } from './controllers';
-import AuthModule from '../AuthModule';
-import settings from '../../../../../settings';
-
-const {
-  auth: {
-    session,
-    social: {
-      google: { clientID, clientSecret, callbackURL, enabled }
-    }
-  }
-} = settings;
-
-const beforeware = (app: Express) => {
-  app.use(passport.initialize());
-};
-
-const onAppCreate = ({ appContext }: AuthModule) => {
-  if (enabled && !__TEST__) {
-    passport.use(
-      new GoogleStrategy(
-        { clientID, clientSecret, callbackURL },
-        appContext.social ? appContext.social.google.verifyCallback : undefined
-      )
-    );
-  }
-};
-
-export default (enabled && !__TEST__
-  ? new AuthModule({
-      beforeware: [beforeware],
-      onAppCreate: [onAppCreate],
-      apiRouteParams: [
-        {
-          method: RestMethod.GET,
-          route: 'auth/google',
-          controller: auth
-        },
-        {
-          method: RestMethod.GET,
-          route: 'auth/google/callback',
-          middleware: [passport.authenticate('google', { session: session.enabled, failureRedirect: '/login' })],
-          controller: onAuthenticationSuccess
-        }
-      ]
-    })
-  : undefined);
diff --git a/modules/authentication/server-ts/social/index.ts b/modules/authentication/server-ts/social/index.ts
deleted file mode 100644
index 38d571a..0000000
--- a/modules/authentication/server-ts/social/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import ServerModule from '@restapp/module-server-ts';
-import github from './github';
-import google from './google';
-import facebook from './facebook';
-import linkedin from './linkedIn';
-
-export default new ServerModule(github, google, facebook, linkedin);
diff --git a/modules/authentication/server-ts/social/linkedIn/controllers.ts b/modules/authentication/server-ts/social/linkedIn/controllers.ts
deleted file mode 100644
index 355bae4..0000000
--- a/modules/authentication/server-ts/social/linkedIn/controllers.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import passport from 'passport';
-
-export const auth = (req: any, res: any) => {
-  passport.authenticate('linkedin', { state: req.query.expoUrl })(req, res);
-};
-
-export const onAuthenticationSuccess = (req: any, res: any) => {
-  const {
-    locals: { appContext }
-  } = res;
-  const { t } = req;
-  appContext.social
-    ? appContext.social.google.onAuthenticationSuccess(req, res)
-    : res.status(500).send(t('auth:social'));
-};
diff --git a/modules/authentication/server-ts/social/linkedIn/index.ts b/modules/authentication/server-ts/social/linkedIn/index.ts
deleted file mode 100644
index a4ce503..0000000
--- a/modules/authentication/server-ts/social/linkedIn/index.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Express } from 'express';
-import passport from 'passport';
-import { Strategy as LinkedInStrategy } from '@sokratis/passport-linkedin-oauth2';
-
-import { RestMethod } from '@restapp/module-server-ts';
-
-import { auth, onAuthenticationSuccess } from './controllers';
-import AuthModule from '../AuthModule';
-import settings from '../../../../../settings';
-
-const {
-  auth: {
-    session,
-    social: {
-      linkedin: { clientID, clientSecret, callbackURL, enabled, scope }
-    }
-  }
-} = settings;
-
-const beforeware = (app: Express) => {
-  app.use(passport.initialize());
-};
-
-const onAppCreate = ({ appContext }: AuthModule) => {
-  passport.use(
-    new LinkedInStrategy(
-      { clientID, clientSecret, callbackURL, scopeSeparator: scope },
-      appContext.social ? appContext.social.linkedin.verifyCallback : undefined
-    )
-  );
-};
-
-export default (enabled && !__TEST__
-  ? new AuthModule({
-      beforeware: [beforeware],
-      onAppCreate: [onAppCreate],
-      apiRouteParams: [
-        {
-          method: RestMethod.GET,
-          route: 'auth/linkedin',
-          controller: auth
-        },
-        {
-          method: RestMethod.GET,
-          route: 'auth/linkedin/callback',
-          middleware: [passport.authenticate('linkedin', { session: session.enabled, failureRedirect: '/login' })],
-          controller: onAuthenticationSuccess
-        }
-      ]
-    })
-  : undefined);

From acc851e942bcc944b5d68602eec2e75e1b71d9c9 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 16:33:36 +0300
Subject: [PATCH 026/104] Update types for auth module

---
 packages/server/package.json         |  11 ++
 packages/server/typings/typings.d.ts |   1 +
 yarn.lock                            | 199 +++++++++++++++++++++++++--
 3 files changed, 199 insertions(+), 12 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 14737c8..9f62278 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -51,17 +51,20 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/register": "^7.0.0",
+    "@restapp/authentication-server-ts": "^0.1.0",
     "@restapp/core-common": "^0.1.0",
     "@restapp/database-server-ts": "^0.1.0",
     "@restapp/testing-server-ts": "^0.1.0",
     "@restapp/user-server-ts": "^0.1.0",
     "@restapp/welcome-server-ts": "^0.1.0",
+    "@sokratis/passport-linkedin-oauth2": "^2.0.2",
     "@types/pdfmake": "^0.1.3",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",
     "dotenv": "^5.0.1",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
+    "express-session": "^1.16.1",
     "filesize": "^3.5.11",
     "humps": "^2.0.1",
     "i18next": "^11.3.3",
@@ -79,6 +82,7 @@
     "passport-facebook": "^2.1.1",
     "passport-github": "^1.1.0",
     "passport-google-oauth": "^1.0.0",
+    "passport-jwt": "^4.0.0",
     "passport-linkedin-oauth2": "^1.5.0",
     "passport-local": "^1.0.0",
     "performance-now": "^2.1.0",
@@ -95,6 +99,7 @@
     "redux": "^4.0.0",
     "roboto-npm-webfont": "^1.0.1",
     "serialize-javascript": "^1.4.0",
+    "session-file-store": "^1.2.0",
     "shortid": "^2.2.8",
     "source-map-support": "^0.5.0",
     "sourcemapped-stacktrace": "^1.1.8",
@@ -109,6 +114,7 @@
     "@types/bcryptjs": "^2.4.2",
     "@types/chai": "^4.1.4",
     "@types/chai-http": "^3.0.5",
+    "@types/express-session": "^1.15.12",
     "@types/humps": "^1.1.2",
     "@types/i18next": "^8.4.4",
     "@types/i18next-express-middleware": "^0.0.33",
@@ -117,6 +123,11 @@
     "@types/mkdirp": "^0.5.2",
     "@types/nodemailer": "^4.6.2",
     "@types/passport": "^1.0.0",
+    "@types/passport-facebook": "^2.1.9",
+    "@types/passport-github": "^1.1.5",
+    "@types/passport-google-oauth": "^1.0.41",
+    "@types/passport-jwt": "^3.0.1",
+    "@types/passport-local": "^1.0.33",
     "@types/react-dom": "^16.8.0",
     "@types/serialize-javascript": "^1.3.2",
     "@types/shortid": "0.0.29",
diff --git a/packages/server/typings/typings.d.ts b/packages/server/typings/typings.d.ts
index 13c5dc3..9a48eb4 100644
--- a/packages/server/typings/typings.d.ts
+++ b/packages/server/typings/typings.d.ts
@@ -15,3 +15,4 @@ declare var global: Global;
 
 // packages without types
 declare module 'universal-cookie-express';
+declare module '@sokratis/passport-linkedin-oauth2';
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index da3bdc9..9025673 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1980,6 +1980,14 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
+"@sokratis/passport-linkedin-oauth2@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@sokratis/passport-linkedin-oauth2/-/passport-linkedin-oauth2-2.0.2.tgz#30d7dbc5ea44e67d8a90a3e311a908185064c4dc"
+  integrity sha512-b83BZHrNT9U/PBYiuAaCY3XUC0QYauFS4s88LWZKDTZ2G+6mYZ3cBObLTAHMK7Qt84nWwmYV1Ul2DSCLlqCxZQ==
+  dependencies:
+    passport-oauth2 "1.x.x"
+    underscore "^1.7.0"
+
 "@types/bcryptjs@^2.4.2":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.2.tgz#e3530eac9dd136bfdfb0e43df2c4c5ce1f77dfae"
@@ -2062,6 +2070,14 @@
     "@types/node" "*"
     "@types/range-parser" "*"
 
+"@types/express-session@^1.15.12":
+  version "1.15.12"
+  resolved "https://registry.yarnpkg.com/@types/express-session/-/express-session-1.15.12.tgz#1126704826e80f8381da4fbbb35a199f550d1433"
+  integrity sha512-DHZXzWy6Nu5Ng0syXUiVFRpZ6/1DOXoTCWa6RG3itGrub2ioBYvgtDbkT6VHHNo3iOdHRROyWANsMBJVaflblQ==
+  dependencies:
+    "@types/express" "*"
+    "@types/node" "*"
+
 "@types/express@*":
   version "4.16.1"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.1.tgz#d756bd1a85c34d87eaf44c888bad27ba8a4b7cf0"
@@ -2142,7 +2158,7 @@
     "@types/tough-cookie" "*"
     parse5 "^4.0.0"
 
-"@types/jsonwebtoken@^8.3.2":
+"@types/jsonwebtoken@*", "@types/jsonwebtoken@^8.3.2":
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz#e3d5245197152346fae7ee87d5541aa5a92d0362"
   integrity sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==
@@ -2203,7 +2219,74 @@
   dependencies:
     "@types/node" "*"
 
-"@types/passport@^1.0.0":
+"@types/oauth@*":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@types/oauth/-/oauth-0.9.1.tgz#e17221e7f7936b0459ae7d006255dff61adca305"
+  integrity sha512-a1iY62/a3yhZ7qH7cNUsxoI3U/0Fe9+RnuFrpTKr+0WVOzbKlSLojShCKe20aOD1Sppv+i8Zlq0pLDuTJnwS4A==
+  dependencies:
+    "@types/node" "*"
+
+"@types/passport-facebook@^2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@types/passport-facebook/-/passport-facebook-2.1.9.tgz#0181b40be4e002705f7a29d64da9029c2ab464dc"
+  integrity sha512-7Y5aHo35Io9fRvStBgXasf+6rRJ5SMiu1D3+cnUuxM1GS+QlgFnH+YTZjye0XgF4EWzxlXKTeLlK2DFU8+0Jpw==
+  dependencies:
+    "@types/express" "*"
+    "@types/passport" "*"
+
+"@types/passport-github@^1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@types/passport-github/-/passport-github-1.1.5.tgz#57ea20d1de0789b98a7157603d76d87c271de6b2"
+  integrity sha512-BeWDdLRWfPpJcmT1XofY5r1Av//TcxBEgllY4LnArcYdGqbIIVLyHwR+8bIG+ZC4PwJ6W1trnVEG3EQ+5J+Jmw==
+  dependencies:
+    "@types/express" "*"
+    "@types/passport" "*"
+    "@types/passport-oauth2" "*"
+
+"@types/passport-google-oauth@^1.0.41":
+  version "1.0.41"
+  resolved "https://registry.yarnpkg.com/@types/passport-google-oauth/-/passport-google-oauth-1.0.41.tgz#e24a8a070dcc5139f0a205c72730b14e83c1405a"
+  integrity sha512-sl79Oau92bilbq6Sv47StzEt98qhu3kMjOBK4GaJX6XtG2a3bwVEebYkwxPrJkz7wb9S1O9x2Dtb3jMqqj9j9Q==
+  dependencies:
+    "@types/express" "*"
+    "@types/passport" "*"
+
+"@types/passport-jwt@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/passport-jwt/-/passport-jwt-3.0.1.tgz#bc4c2610815565de977ea1a580c047d71c646084"
+  integrity sha512-JwF9U/Rmr6YicHSu/MITmHNDy2KeiedxKW2bhz6wZts3y4cq48NiN0UD98zO56TyM5Vm6BpyjFxcs6jh68ni/A==
+  dependencies:
+    "@types/express" "*"
+    "@types/jsonwebtoken" "*"
+    "@types/passport-strategy" "*"
+
+"@types/passport-local@^1.0.33":
+  version "1.0.33"
+  resolved "https://registry.yarnpkg.com/@types/passport-local/-/passport-local-1.0.33.tgz#d245b60c5b801cb3aeca1ffab557d5fe1534260d"
+  integrity sha512-+rn6ZIxje0jZ2+DAiWFI8vGG7ZFKB0hXx2cUdMmudSWsigSq6ES7Emso46r4HJk0qCgrZVfI8sJiM7HIYf4SbA==
+  dependencies:
+    "@types/express" "*"
+    "@types/passport" "*"
+    "@types/passport-strategy" "*"
+
+"@types/passport-oauth2@*":
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/@types/passport-oauth2/-/passport-oauth2-1.4.8.tgz#b11cb3323970a88db3d170fe3d4dcdd0af02d8bf"
+  integrity sha512-tlX16wyFE5YJR2pHpZ308dgB1MV9/Ra2wfQh71eWk+/umPoD1Rca2D4N5M27W7nZm1wqUNGTk1I864nHvEgiFA==
+  dependencies:
+    "@types/express" "*"
+    "@types/oauth" "*"
+    "@types/passport" "*"
+
+"@types/passport-strategy@*":
+  version "0.2.35"
+  resolved "https://registry.yarnpkg.com/@types/passport-strategy/-/passport-strategy-0.2.35.tgz#e52f5212279ea73f02d9b06af67efe9cefce2d0c"
+  integrity sha512-o5D19Jy2XPFoX2rKApykY15et3Apgax00RRLf0RUotPDUsYrQa7x4howLYr9El2mlUApHmCMv5CZ1IXqKFQ2+g==
+  dependencies:
+    "@types/express" "*"
+    "@types/passport" "*"
+
+"@types/passport@*", "@types/passport@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.0.tgz#747fa127a747a145ff279f3df3e07c425e5ff297"
   integrity sha512-R2FXqM+AgsMIym0PuKj08Ybx+GR6d2rU3b1/8OcHolJ+4ga2pRPX105wboV6hq1AJvMo2frQzYKdqXS5+4cyMw==
@@ -4102,6 +4185,11 @@ babylon@^6.18.0:
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
+bagpipe@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/bagpipe/-/bagpipe-0.3.5.tgz#e341d164fcb24cdf04ea7e05b765ec10c8aea6a1"
+  integrity sha1-40HRZPyyTN8E6n4Ft2XsEMiupqE=
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -6144,6 +6232,11 @@ depd@~1.1.1, depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 deprecation@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711"
@@ -7539,6 +7632,20 @@ expo@^32.0.0:
     uuid-js "^0.7.5"
     whatwg-fetch "^2.0.4"
 
+express-session@^1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.16.1.tgz#251ff9776c59382301de6c8c33411af357ed439c"
+  integrity sha512-pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ==
+  dependencies:
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-headers "~1.0.2"
+    parseurl "~1.3.2"
+    safe-buffer "5.1.2"
+    uid-safe "~2.1.5"
+
 express@4.16.4, express@^4.13.4, express@^4.15.2, express@^4.16.2:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
@@ -8130,7 +8237,7 @@ fs-extra@^2.0.0:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
 
-fs-extra@^4.0.1, fs-extra@^4.0.2:
+fs-extra@^4.0.0, fs-extra@^4.0.1, fs-extra@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
   integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
@@ -9198,7 +9305,7 @@ immediate@^3.2.2:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c"
   integrity sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=
 
-immutability-helper@2.8.1, immutability-helper@^2.6.2:
+immutability-helper@^2.6.2:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.8.1.tgz#3c5ec05fcd83676bfae7146f319595243ad904f4"
   integrity sha512-8AVB5EUpRBUdXqfe4cFsFECsOIZ9hX/Arl8B8S9/tmwpYv3UWvOsXUPOjkuZIMaVxfSWkxCzkng1rjmEoSWrxQ==
@@ -10047,11 +10154,6 @@ items@2.x.x:
   resolved "https://registry.yarnpkg.com/items/-/items-2.1.2.tgz#0849354595805d586dac98e7e6e85556ea838558"
   integrity sha512-kezcEqgB97BGeZZYtX/MA8AG410ptURstvnz5RAgyFZ8wQFPMxHY8GpTq+/ZHKT3frSlIthUq7EvLt9xn3TvXg==
 
-iterall@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
-  integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
-
 jest-changed-files@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
@@ -10667,6 +10769,22 @@ jsonwebtoken@^8.1.0:
     ms "^2.1.1"
     semver "^5.6.0"
 
+jsonwebtoken@^8.2.0:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
+  integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
+  dependencies:
+    jws "^3.2.2"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^5.6.0"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -10693,6 +10811,15 @@ jwa@^1.2.0:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
 jws@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.1.tgz#d79d4216a62c9afa0a3d5e8b5356d75abdeb2be5"
@@ -10701,6 +10828,14 @@ jws@^3.2.1:
     jwa "^1.2.0"
     safe-buffer "^5.0.1"
 
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
 jwt-decode@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-2.2.0.tgz#7d86bd56679f58ce6a84704a657dd392bba81a79"
@@ -13048,7 +13183,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
+on-headers@~1.0.1, on-headers@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
@@ -13585,6 +13720,14 @@ passport-google-oauth@^1.0.0:
     passport-google-oauth1 "1.x.x"
     passport-google-oauth20 "1.x.x"
 
+passport-jwt@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/passport-jwt/-/passport-jwt-4.0.0.tgz#7f0be7ba942e28b9f5d22c2ebbb8ce96ef7cf065"
+  integrity sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==
+  dependencies:
+    jsonwebtoken "^8.2.0"
+    passport-strategy "^1.0.0"
+
 passport-linkedin-oauth2@^1.5.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/passport-linkedin-oauth2/-/passport-linkedin-oauth2-1.6.1.tgz#e540db935d9bfd65b0179f4bb424bd5d87d3f76e"
@@ -13619,7 +13762,7 @@ passport-oauth2@1.x.x:
     uid2 "0.0.x"
     utils-merge "1.x.x"
 
-passport-strategy@1.x.x:
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
   integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ=
@@ -14383,6 +14526,11 @@ ramda@^0.26.1:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
   integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
 
+random-bytes@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
+  integrity sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=
+
 randomatic@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
@@ -16531,6 +16679,17 @@ serve-static@1.13.2, serve-static@^1.13.1:
     parseurl "~1.3.2"
     send "0.16.2"
 
+session-file-store@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/session-file-store/-/session-file-store-1.2.0.tgz#35a994a7fb0cbf7f784067bf9059939c520b7c44"
+  integrity sha512-DkYLYFkkK6u9xyraVHemulhlUuuufLukf7SQxOZSx8SPwkswcaIrls882PaQZ72zRKsyhUVNxOUl9w0lQubUFw==
+  dependencies:
+    bagpipe "^0.3.5"
+    fs-extra "^4.0.0"
+    object-assign "^4.1.1"
+    retry "^0.10.0"
+    write-file-atomic "1.3.1"
+
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -17913,6 +18072,13 @@ uid-number@0.0.6:
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
   integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=
 
+uid-safe@~2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
+  integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==
+  dependencies:
+    random-bytes "~1.0.0"
+
 uid2@0.0.x:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
@@ -18343,7 +18509,7 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-watchpack@^1.5.0, "watchpack@https://github.com/Globegitter/watchpack":
+watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://github.com/Globegitter/watchpack#d903e64a910ab068299f824b04a5e216a15672e9"
   dependencies:
@@ -18646,6 +18812,15 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+write-file-atomic@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.1.tgz#7d45ba32316328dd1ec7d90f60ebc0d845bb759a"
+  integrity sha1-fUW6MjFjKN0ex9kPYOvA2EW7dZo=
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    slide "^1.1.5"
+
 write-file-atomic@^1.2.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"

From 24b08455e625551ecd4f7a29403490b81ea81819 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 16:35:17 +0300
Subject: [PATCH 027/104] Update LocalStrategy usernameField

---
 modules/authentication/server-ts/access/jwt/index.ts     | 5 +----
 modules/authentication/server-ts/access/session/index.ts | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
index 23f4d74..1856e91 100644
--- a/modules/authentication/server-ts/access/jwt/index.ts
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -1,6 +1,5 @@
 import { Express } from 'express';
 import { Strategy as LocalStratery } from 'passport-local';
-import bodyParser from 'body-parser';
 import passport from 'passport';
 import { Strategy as JWTStrategy, ExtractJwt } from 'passport-jwt';
 
@@ -15,8 +14,6 @@ const {
 } = settings;
 
 const beforeware = (app: Express) => {
-  app.use(bodyParser.urlencoded({ extended: false }));
-  app.use(bodyParser.json());
   app.use(passport.initialize());
 };
 
@@ -34,7 +31,7 @@ const grant = async (identity: any, req: any, passwordHash: string = '') => {
 
 const onAppCreate = ({ appContext }: AccessModule) => {
   passport.use(
-    new LocalStratery(async (username: string, password: string, done: any) => {
+    new LocalStratery({ usernameField: 'usernameOrEmail' }, async (username: string, password: string, done: any) => {
       const { identity, message } = await appContext.user.validateLogin(username, password);
 
       if (message) {
diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
index b73eac3..bbeda25 100644
--- a/modules/authentication/server-ts/access/session/index.ts
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -1,6 +1,5 @@
 import { Express, Request, Response } from 'express';
 import { Strategy } from 'passport-local';
-import bodyParser from 'body-parser';
 import session from 'express-session';
 import passport from 'passport';
 
@@ -13,8 +12,6 @@ import { logout } from './controllers';
 const FileStore = require('session-file-store')(session);
 
 const beforeware = (app: Express) => {
-  app.use(bodyParser.urlencoded({ extended: false }));
-  app.use(bodyParser.json());
   app.use(
     session({
       secret: 'secret',
@@ -42,7 +39,7 @@ const onAppCreate = ({ appContext }: AccessModule) => {
   });
 
   passport.use(
-    new Strategy(async (username: string, password: string, done: any) => {
+    new Strategy({ usernameField: 'usernameOrEmail' }, async (username: string, password: string, done: any) => {
       const { identity, message } = await appContext.user.validateLogin(username, password);
 
       if (message) {

From 9438b3498f2c16030abfcf24ddfd0f4defaf6389 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 7 May 2019 16:40:07 +0300
Subject: [PATCH 028/104] Update errors response

---
 modules/user/server-ts/locales/en/translations.json | 1 +
 modules/user/server-ts/locales/ru/translations.json | 1 +
 modules/user/server-ts/password/controllers.ts      | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/user/server-ts/locales/en/translations.json b/modules/user/server-ts/locales/en/translations.json
index b67acdb..a230977 100644
--- a/modules/user/server-ts/locales/en/translations.json
+++ b/modules/user/server-ts/locales/en/translations.json
@@ -10,6 +10,7 @@
     "password": {
       "validPasswordEmail": "Please enter a valid username or e-mail.",
       "emailConfirmation": "Please confirm your e-mail first.",
+      "registrationFailed": "Registration failed due to validation errors",
       "validPassword": "Please enter a valid password.",
       "usernameIsExisted": "Username already exists",
       "emailIsExisted": "E-mail already exists.",
diff --git a/modules/user/server-ts/locales/ru/translations.json b/modules/user/server-ts/locales/ru/translations.json
index 457fff7..b50aa94 100644
--- a/modules/user/server-ts/locales/ru/translations.json
+++ b/modules/user/server-ts/locales/ru/translations.json
@@ -10,6 +10,7 @@
     "password": {
       "validPasswordEmail": "Пожалуйста, введите Ваш username или e-mail.",
       "emailConfirmation": "Пожалуйста, подтвердите Ваш e-mail",
+      "registrationFailed": "Регистрация не была успешной из-за ошибок валидации.",
       "validPassword": "Пожалуйста, введите действительный пароль.",
       "usernameIsExisted": "Данное имя пользователя уже используется",
       "emailIsExisted": "Данный e-mail уже используется.",
diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 59c5106..740d68e 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -29,9 +29,9 @@ export const register = async ({ body, t }: any, res: any) => {
 
   if (!isEmpty(errors)) {
     return res.status(422).send({
-      error: {
-        message: 'Failed reset password',
-        errors
+      errors: {
+        message: t('user:auth.password.registrationFailed'),
+        ...errors
       }
     });
   }

From 71645c19fb774968901a6ca057725e241f1c7329 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 7 May 2019 17:34:27 +0300
Subject: [PATCH 029/104] Add uthentication module

---
 config/auth.js                                | 37 +++++++-
 .../client-react/access/AccessModule.ts       | 49 +++++++++++
 .../client-react/access/index.tsx             | 48 ++++++++++
 .../client-react/access/jwt/index.ts          | 86 ++++++++++++++++++
 .../client-react/access/session/index.ts      | 13 +++
 .../client-react/helpers/index.ts             | 12 +++
 modules/authentication/client-react/index.ts  |  5 ++
 .../authentication/client-react/package.json  |  8 ++
 .../facebook/containers/FacebookButton.css    | 39 +++++++++
 .../containers/FacebookButton.native.tsx      | 80 +++++++++++++++++
 .../facebook/containers/FacebookButton.tsx    | 55 ++++++++++++
 .../social/facebook/index.native.ts           |  3 +
 .../client-react/social/facebook/index.ts     |  3 +
 .../social/github/containers/GitHubButton.css | 39 +++++++++
 .../github/containers/GitHubButton.native.tsx | 84 ++++++++++++++++++
 .../social/github/containers/GitHubButton.tsx | 55 ++++++++++++
 .../social/github/index.native.ts             |  3 +
 .../client-react/social/github/index.ts       |  3 +
 .../social/google/containers/GoogleButton.css | 39 +++++++++
 .../google/containers/GoogleButton.native.tsx | 87 +++++++++++++++++++
 .../social/google/containers/GoogleButton.tsx | 55 ++++++++++++
 .../social/google/index.native.ts             |  3 +
 .../client-react/social/google/index.ts       |  3 +
 .../client-react/social/index.ts              | 12 +++
 .../linkedin/containers/LinkedInButton.css    | 39 +++++++++
 .../containers/LinkedInButton.native.tsx      | 84 ++++++++++++++++++
 .../linkedin/containers/LinkedInButton.tsx    | 55 ++++++++++++
 .../social/linkedin/index.native.ts           |  3 +
 .../client-react/social/linkedin/index.ts     |  3 +
 .../look/client-react-native/styles/button.js |  5 --
 .../look/client-react-native/styles/button.ts |  6 ++
 .../styles/{colors.js => colors.ts}           |  0
 .../styles/{index.js => index.ts}             |  0
 .../{itemContainer.js => itemContainer.ts}    |  8 +-
 .../{socialButton.js => socialButton.ts}      | 18 ++--
 packages/client/package.json                  |  8 +-
 packages/client/src/modules.ts                | 13 ++-
 packages/mobile/src/modules.ts                |  3 +-
 yarn.lock                                     | 40 +++++++--
 39 files changed, 1076 insertions(+), 30 deletions(-)
 create mode 100644 modules/authentication/client-react/access/AccessModule.ts
 create mode 100644 modules/authentication/client-react/access/index.tsx
 create mode 100644 modules/authentication/client-react/access/jwt/index.ts
 create mode 100644 modules/authentication/client-react/access/session/index.ts
 create mode 100644 modules/authentication/client-react/helpers/index.ts
 create mode 100644 modules/authentication/client-react/index.ts
 create mode 100644 modules/authentication/client-react/package.json
 create mode 100644 modules/authentication/client-react/social/facebook/containers/FacebookButton.css
 create mode 100644 modules/authentication/client-react/social/facebook/containers/FacebookButton.native.tsx
 create mode 100644 modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx
 create mode 100644 modules/authentication/client-react/social/facebook/index.native.ts
 create mode 100644 modules/authentication/client-react/social/facebook/index.ts
 create mode 100644 modules/authentication/client-react/social/github/containers/GitHubButton.css
 create mode 100644 modules/authentication/client-react/social/github/containers/GitHubButton.native.tsx
 create mode 100644 modules/authentication/client-react/social/github/containers/GitHubButton.tsx
 create mode 100644 modules/authentication/client-react/social/github/index.native.ts
 create mode 100644 modules/authentication/client-react/social/github/index.ts
 create mode 100644 modules/authentication/client-react/social/google/containers/GoogleButton.css
 create mode 100644 modules/authentication/client-react/social/google/containers/GoogleButton.native.tsx
 create mode 100644 modules/authentication/client-react/social/google/containers/GoogleButton.tsx
 create mode 100644 modules/authentication/client-react/social/google/index.native.ts
 create mode 100644 modules/authentication/client-react/social/google/index.ts
 create mode 100644 modules/authentication/client-react/social/index.ts
 create mode 100644 modules/authentication/client-react/social/linkedin/containers/LinkedInButton.css
 create mode 100644 modules/authentication/client-react/social/linkedin/containers/LinkedInButton.native.tsx
 create mode 100644 modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx
 create mode 100644 modules/authentication/client-react/social/linkedin/index.native.ts
 create mode 100644 modules/authentication/client-react/social/linkedin/index.ts
 delete mode 100644 modules/look/client-react-native/styles/button.js
 create mode 100644 modules/look/client-react-native/styles/button.ts
 rename modules/look/client-react-native/styles/{colors.js => colors.ts} (100%)
 rename modules/look/client-react-native/styles/{index.js => index.ts} (100%)
 rename modules/look/client-react-native/styles/{itemContainer.js => itemContainer.ts} (52%)
 rename modules/look/client-react-native/styles/{socialButton.js => socialButton.ts} (68%)

diff --git a/config/auth.js b/config/auth.js
index edfb19e..61fe596 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -4,14 +4,45 @@ export default {
     enabled: true
   },
   jwt: {
-    enabled: false,
+    enabled: true,
     tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
   password: {
-    requireEmailConfirmation: false,
-    sendPasswordChangesEmail: false,
+    requireEmailConfirmation: true,
+    sendPasswordChangesEmail: true,
     minLength: 8,
     enabled: true
+  },
+  social: {
+    facebook: {
+      enabled: false,
+      clientID: process.env.FACEBOOK_CLIENTID,
+      clientSecret: process.env.FACEBOOK_CLIENTSECRET,
+      callbackURL: '/auth/facebook/callback',
+      scope: ['email'],
+      profileFields: ['id', 'emails', 'displayName']
+    },
+    github: {
+      enabled: false,
+      clientID: process.env.GITHUB_CLIENTID,
+      clientSecret: process.env.GITHUB_CLIENTSECRET,
+      callbackURL: '/auth/github/callback',
+      scope: ['user:email']
+    },
+    linkedin: {
+      enabled: false,
+      clientID: process.env.LINKEDIN_CLIENTID,
+      clientSecret: process.env.LINKEDIN_CLIENTSECRET,
+      callbackURL: '/auth/linkedin/callback',
+      scope: ['r_emailaddress', 'r_basicprofile']
+    },
+    google: {
+      enabled: false,
+      clientID: process.env.GOOGLE_CLIENTID,
+      clientSecret: process.env.GOOGLE_CLIENTSECRET,
+      callbackURL: '/auth/google/callback',
+      scope: ['https://www.googleapis.com/auth/userinfo.email', 'https://www.googleapis.com/auth/userinfo.profile']
+    }
   }
 };
diff --git a/modules/authentication/client-react/access/AccessModule.ts b/modules/authentication/client-react/access/AccessModule.ts
new file mode 100644
index 0000000..03d412c
--- /dev/null
+++ b/modules/authentication/client-react/access/AccessModule.ts
@@ -0,0 +1,49 @@
+import ClientModule, { ClientModuleShape } from '@restapp/module-client-react';
+
+/**
+ * Access module which provides authentication functions
+ */
+export interface AccessModuleShape extends ClientModuleShape {
+  // login handlers from all authentication modules
+  login?: Array<(callback?: () => void) => Promise<void>>;
+  // logout handlers from all authentication modules
+  logout?: Array<(callback?: () => void) => Promise<void>>;
+}
+
+interface AccessModule extends AccessModuleShape {}
+
+class AccessModule extends ClientModule {
+  /**
+   * Constructs access module representation, that folds all the feature modules
+   * into a single module represented by this instance.
+   *
+   * @param modules feature modules
+   */
+  constructor(...modules: AccessModuleShape[]) {
+    super(...modules);
+  }
+
+  /**
+   * call all methods of login in authentication modules.
+   *
+   * @returns merge login methods
+   */
+  public async doLogin(callback?: () => void) {
+    for (const login of this.login) {
+      await login(callback);
+    }
+  }
+
+  /**
+   * call all methods of logout in authentication modules.
+   *
+   * @returns merge logout methods
+   */
+  public async doLogout(callback?: () => void) {
+    for (const logout of this.logout) {
+      await logout(callback);
+    }
+  }
+}
+
+export default AccessModule;
diff --git a/modules/authentication/client-react/access/index.tsx b/modules/authentication/client-react/access/index.tsx
new file mode 100644
index 0000000..5159469
--- /dev/null
+++ b/modules/authentication/client-react/access/index.tsx
@@ -0,0 +1,48 @@
+import * as React from 'react';
+import jwt from './jwt';
+import session from './session';
+import AccessModule from './AccessModule';
+
+interface PageReloaderProps {
+  children?: React.ReactElement;
+}
+
+interface AuthPageReloaderProps extends PageReloaderProps {}
+
+const ref: React.RefObject<any> = React.createRef();
+
+const rerenderApp = () => {
+  ref.current.reloadPage();
+};
+
+const login = async (clearStore: () => void) => {
+  await clearStore();
+  rerenderApp();
+};
+
+const logout = async (clearStore: () => void) => {
+  await clearStore();
+  rerenderApp();
+};
+
+class PageReloader extends React.Component<PageReloaderProps> {
+  public state = {
+    key: 1
+  };
+
+  public reloadPage() {
+    this.setState({ key: this.state.key + 1 });
+  }
+
+  public render() {
+    return React.cloneElement(this.props.children, { key: this.state.key });
+  }
+}
+
+const AuthPageReloader = ({ children }: AuthPageReloaderProps) => <PageReloader ref={ref}>{children}</PageReloader>;
+
+export default new AccessModule(jwt, session, {
+  dataRootComponent: [AuthPageReloader],
+  login: [login],
+  logout: [logout]
+});
diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
new file mode 100644
index 0000000..69a5080
--- /dev/null
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -0,0 +1,86 @@
+import axios from 'axios';
+import { getItem, setItem, removeItem } from '@restapp/core-common/clientStorage';
+import settings from '../../../../../settings';
+import AccessModule from '../AccessModule';
+
+enum TokensEnum {
+  accessToken = 'accessToken',
+  refreshToken = 'refreshToken'
+}
+
+interface Tokens {
+  [key: string]: TokensEnum;
+}
+
+const saveTokens = async ({ accessToken, refreshToken }: Tokens) => {
+  await setItem(TokensEnum.accessToken, accessToken);
+  await setItem(TokensEnum.refreshToken, refreshToken);
+};
+
+const removeTokens = async () => {
+  await removeItem(TokensEnum.accessToken);
+  await removeItem(TokensEnum.refreshToken);
+};
+
+axios.interceptors.request.use(async config => {
+  const accessToken = await getItem(TokensEnum.accessToken);
+
+  if (config.url.includes('currentUser') && !(await getItem(TokensEnum.refreshToken))) {
+    throw new axios.Cancel('Operation canceled');
+  }
+
+  const arrayExceptions = ['login', 'refreshTokens'];
+  const checkInclude = arrayExceptions.some(exception => config.url.includes(exception));
+
+  config.headers = !checkInclude && accessToken ? { Authorization: `Bearer ${accessToken}` } : {};
+
+  return config;
+});
+
+axios.interceptors.response.use(
+  async (res: any) => {
+    if (res.config.url.includes('login')) {
+      if (!!res.data && res.data.login.tokens) {
+        const {
+          data: {
+            login: {
+              tokens: { accessToken, refreshToken }
+            }
+          }
+        } = res;
+        await saveTokens({ accessToken, refreshToken });
+      } else {
+        await removeTokens();
+      }
+      return res;
+    }
+
+    if (res && res.status > 400 && res.status < 500) {
+      try {
+        const { data } = await axios.post(`${__API_URL__}/refreshToken`, {
+          refreshToken: await getItem('refreshToken')
+        });
+        if (data && data.refreshTokens) {
+          const { accessToken, refreshToken } = data.refreshTokens;
+          await saveTokens({ accessToken, refreshToken });
+        } else {
+          await removeTokens();
+        }
+      } catch (e) {
+        await removeTokens();
+        throw e;
+      }
+      await res.request();
+    }
+    return res;
+  },
+  err => {
+    return Promise.reject(err);
+  }
+);
+
+export default (settings.auth.jwt.enabled
+  ? new AccessModule({
+      logout: [removeTokens]
+    })
+  : undefined);
diff --git a/modules/authentication/client-react/access/session/index.ts b/modules/authentication/client-react/access/session/index.ts
new file mode 100644
index 0000000..47a5955
--- /dev/null
+++ b/modules/authentication/client-react/access/session/index.ts
@@ -0,0 +1,13 @@
+import settings from '../../../../../settings';
+import AccessModule from '../AccessModule';
+import axios from 'axios';
+
+const logout = async () => {
+  await axios.post(`${__API_URL__}/logout`);
+};
+
+export default (settings.auth.session.enabled
+  ? new AccessModule({
+      logout: [logout]
+    })
+  : undefined);
diff --git a/modules/authentication/client-react/helpers/index.ts b/modules/authentication/client-react/helpers/index.ts
new file mode 100644
index 0000000..3788dba
--- /dev/null
+++ b/modules/authentication/client-react/helpers/index.ts
@@ -0,0 +1,12 @@
+import url from 'url';
+import { Constants } from 'expo';
+
+export default function buildRedirectUrlForMobile(authType: string) {
+  const { protocol, hostname, port } = url.parse(__WEBSITE_URL__);
+  const expoHostname = `${url.parse(Constants.linkingUri).hostname}.nip.io`;
+  const urlHostname = process.env.NODE_ENV === 'production' ? hostname : expoHostname;
+
+  return `${protocol}//${urlHostname}${port ? ':' + port : ''}/auth/${authType}?expoUrl=${encodeURIComponent(
+    Constants.linkingUri
+  )}`;
+}
diff --git a/modules/authentication/client-react/index.ts b/modules/authentication/client-react/index.ts
new file mode 100644
index 0000000..e74ec5e
--- /dev/null
+++ b/modules/authentication/client-react/index.ts
@@ -0,0 +1,5 @@
+import authentication from './access';
+
+export * from './social';
+
+export default authentication;
diff --git a/modules/authentication/client-react/package.json b/modules/authentication/client-react/package.json
new file mode 100644
index 0000000..5502094
--- /dev/null
+++ b/modules/authentication/client-react/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@restapp/authentication-client-react",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@restapp/core-common": "^0.1.0"
+  }
+}
\ No newline at end of file
diff --git a/modules/authentication/client-react/social/facebook/containers/FacebookButton.css b/modules/authentication/client-react/social/facebook/containers/FacebookButton.css
new file mode 100644
index 0000000..f7a0a10
--- /dev/null
+++ b/modules/authentication/client-react/social/facebook/containers/FacebookButton.css
@@ -0,0 +1,39 @@
+.facebookBtn {
+  min-width: 320px;
+  margin-top: 10px;
+  background-color: #3769ae;
+  border-color: #3769ae;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.facebookBtn:hover {
+   background-color: #17427e;
+    border-color: #17427e;
+}
+
+.iconContainer { 
+  display: flex;
+  flex: 1 1 10%;
+  justify-content: flex-start;
+   align-items: center; 
+}
+
+.separator { 
+  height: 28px;
+  width: 1px;
+  background-color: #fff !important;
+  margin-left: 10px;
+}
+
+.btnText { 
+  display: flex;
+  justify-content: flex-start; 
+  flex: 5
+}
+
+.facebookIcon { 
+  color: #fff;
+  font-size: 30px;
+}
diff --git a/modules/authentication/client-react/social/facebook/containers/FacebookButton.native.tsx b/modules/authentication/client-react/social/facebook/containers/FacebookButton.native.tsx
new file mode 100644
index 0000000..1dca6f6
--- /dev/null
+++ b/modules/authentication/client-react/social/facebook/containers/FacebookButton.native.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { View, StyleSheet, Linking, TouchableOpacity, Text, Platform } from 'react-native';
+import { WebBrowser } from 'expo';
+import { FontAwesome } from '@expo/vector-icons';
+import {
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer,
+  separator,
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+} from '@restapp/look-client-react-native/styles';
+
+import { SocialButton, SocialButtonComponent } from '../../..';
+import buildRedirectUrlForMobile from '../../../helpers';
+
+const facebookLogin = () => {
+  const url = buildRedirectUrlForMobile('facebook');
+  if (Platform.OS === 'ios') {
+    WebBrowser.openBrowserAsync(url);
+  } else {
+    Linking.openURL(url);
+  }
+};
+
+const FacebookButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity style={styles.buttonContainer} onPress={facebookLogin}>
+      <View style={styles.btnIconContainer}>
+        <FontAwesome name="facebook-square" size={30} style={{ color: '#fff', marginLeft: 10 }} />
+        <View style={styles.separator} />
+      </View>
+      <View style={styles.btnTextContainer}>
+        <Text style={styles.btnText}>{text}</Text>
+      </View>
+    </TouchableOpacity>
+  );
+};
+
+const FacebookLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity onPress={facebookLogin} style={styles.link}>
+      <Text style={styles.linkText}>{text}</Text>
+    </TouchableOpacity>
+  );
+};
+
+const FacebookIcon = () => (
+  <View style={styles.iconWrapper}>
+    <FontAwesome name="facebook-square" size={45} style={{ color: '#3B5998' }} onPress={facebookLogin} />
+  </View>
+);
+
+const FacebookComponent: React.FunctionComponent<SocialButton> = ({ type, text }) => {
+  switch (type) {
+    case 'button':
+      return <FacebookButton text={text} />;
+    case 'link':
+      return <FacebookLink text={text} />;
+    case 'icon':
+      return <FacebookIcon />;
+    default:
+      return <FacebookButton text={text} />;
+  }
+};
+
+const styles = StyleSheet.create({
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer,
+  separator,
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+});
+
+export default FacebookComponent;
diff --git a/modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx b/modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx
new file mode 100644
index 0000000..5d8ada5
--- /dev/null
+++ b/modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faFacebookSquare } from '@fortawesome/fontawesome-free-brands';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+import { Button } from '@restapp/look-client-react';
+
+import { SocialButton, SocialButtonComponent } from '../../..';
+import './FacebookButton.css';
+
+const facebookLogin = () => {
+  window.location.href = '/auth/facebook';
+};
+
+const FacebookButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button type="button" size="lg" onClick={facebookLogin} className="facebookBtn">
+      <div className="iconContainer">
+        <FontAwesomeIcon icon={faFacebookSquare as IconProp} className="facebookIcon" />
+        <div className="separator" />
+      </div>
+      <div className="btnText">
+        <span>{text}</span>
+      </div>
+    </Button>
+  );
+};
+
+const FacebookLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button color="link" onClick={facebookLogin} style={{ marginTop: 10 }}>
+      {text}
+    </Button>
+  );
+};
+
+const FacebookIcon = () => (
+  <div onClick={facebookLogin}>
+    <FontAwesomeIcon icon={faFacebookSquare as IconProp} style={{ marginTop: 10, color: '#17427e', fontSize: 40 }} />
+  </div>
+);
+
+const FacebookComponent: React.FunctionComponent<SocialButton> = ({ text, type }) => {
+  switch (type) {
+    case 'button':
+      return <FacebookButton text={text} />;
+    case 'link':
+      return <FacebookLink text={text} />;
+    case 'icon':
+      return <FacebookIcon />;
+    default:
+      return <FacebookButton text={text} />;
+  }
+};
+
+export default FacebookComponent;
diff --git a/modules/authentication/client-react/social/facebook/index.native.ts b/modules/authentication/client-react/social/facebook/index.native.ts
new file mode 100644
index 0000000..d22328c
--- /dev/null
+++ b/modules/authentication/client-react/social/facebook/index.native.ts
@@ -0,0 +1,3 @@
+import FacebookButton from './containers/FacebookButton';
+
+export default FacebookButton;
diff --git a/modules/authentication/client-react/social/facebook/index.ts b/modules/authentication/client-react/social/facebook/index.ts
new file mode 100644
index 0000000..d22328c
--- /dev/null
+++ b/modules/authentication/client-react/social/facebook/index.ts
@@ -0,0 +1,3 @@
+import FacebookButton from './containers/FacebookButton';
+
+export default FacebookButton;
diff --git a/modules/authentication/client-react/social/github/containers/GitHubButton.css b/modules/authentication/client-react/social/github/containers/GitHubButton.css
new file mode 100644
index 0000000..3c35726
--- /dev/null
+++ b/modules/authentication/client-react/social/github/containers/GitHubButton.css
@@ -0,0 +1,39 @@
+.githubBtn {
+  min-width: 320px;
+  margin-top: 10px;
+  background-color: #464646;
+  border-color: #464646;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.githubBtn:hover {
+   background-color: #5f5e5e;
+    border-color: #5f5e5e;
+}
+
+.iconContainer { 
+  display: flex;
+  flex: 1 1 10%;
+  justify-content: flex-start;
+   align-items: center; 
+}
+
+.separator { 
+  height: 28px;
+  width: 1px;
+  background-color: #fff !important;
+  margin-left: 10px;
+}
+
+.btnText { 
+  display: flex;
+  justify-content: flex-start; 
+  flex: 5
+}
+
+.githubIcon { 
+  color: #fff;
+  font-size: 30px;
+}
\ No newline at end of file
diff --git a/modules/authentication/client-react/social/github/containers/GitHubButton.native.tsx b/modules/authentication/client-react/social/github/containers/GitHubButton.native.tsx
new file mode 100644
index 0000000..80b78e0
--- /dev/null
+++ b/modules/authentication/client-react/social/github/containers/GitHubButton.native.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { View, StyleSheet, Linking, TouchableOpacity, Text, Platform } from 'react-native';
+import { WebBrowser } from 'expo';
+import { FontAwesome } from '@expo/vector-icons';
+import {
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer,
+  separator,
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+} from '@restapp/look-client-react-native/styles';
+
+import { SocialButton, SocialButtonComponent } from '../..';
+import buildRedirectUrlForMobile from '../../../helpers';
+
+const githubLogin = () => {
+  const url = buildRedirectUrlForMobile('github');
+  if (Platform.OS === 'ios') {
+    WebBrowser.openBrowserAsync(url);
+  } else {
+    Linking.openURL(url);
+  }
+};
+
+const GitHubButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity style={styles.buttonContainer} onPress={githubLogin}>
+      <View style={styles.btnIconContainer}>
+        <FontAwesome name="github-square" size={30} style={{ color: '#fff', marginLeft: 10 }} />
+        <View style={styles.separator} />
+      </View>
+      <View style={styles.btnTextContainer}>
+        <Text style={styles.btnText}>{text}</Text>
+      </View>
+    </TouchableOpacity>
+  );
+};
+
+const GitHubLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity onPress={githubLogin} style={styles.link}>
+      <Text style={styles.linkText}>{text}</Text>
+    </TouchableOpacity>
+  );
+};
+
+const GitHubIcon = () => (
+  <View style={styles.iconWrapper}>
+    <FontAwesome name="github-square" size={45} style={{ color: '#464646' }} onPress={githubLogin} />
+  </View>
+);
+
+const GitHubComponent: React.FunctionComponent<SocialButton> = ({ type, text }) => {
+  switch (type) {
+    case 'button':
+      return <GitHubButton text={text} />;
+    case 'link':
+      return <GitHubLink text={text} />;
+    case 'icon':
+      return <GitHubIcon />;
+    default:
+      return <GitHubButton text={text} />;
+  }
+};
+
+const styles = StyleSheet.create({
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer: {
+    ...buttonContainer,
+    marginTop: 15,
+    backgroundColor: '#464646'
+  },
+  separator,
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+});
+
+export default GitHubComponent;
diff --git a/modules/authentication/client-react/social/github/containers/GitHubButton.tsx b/modules/authentication/client-react/social/github/containers/GitHubButton.tsx
new file mode 100644
index 0000000..a459525
--- /dev/null
+++ b/modules/authentication/client-react/social/github/containers/GitHubButton.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faGithubSquare } from '@fortawesome/fontawesome-free-brands';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+import { Button } from '@restapp/look-client-react';
+
+import { SocialButton, SocialButtonComponent } from '../..';
+import './GitHubButton.css';
+
+const githubLogin = () => {
+  window.location.href = '/auth/github';
+};
+
+const GitHubButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button type="button" size="lg" onClick={githubLogin} className="githubBtn">
+      <div className="iconContainer">
+        <FontAwesomeIcon icon={faGithubSquare as IconProp} className="githubIcon" />
+        <div className="separator" />
+      </div>
+      <div className="btnText">
+        <span>{text}</span>
+      </div>
+    </Button>
+  );
+};
+
+const GitHubLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button color="link" onClick={githubLogin} style={{ marginTop: 10 }}>
+      {text}
+    </Button>
+  );
+};
+
+const GitHubIcon = () => (
+  <div onClick={githubLogin}>
+    <FontAwesomeIcon icon={faGithubSquare as IconProp} style={{ marginTop: 10, color: '#5f5e5e', fontSize: 40 }} />
+  </div>
+);
+
+const GithubComponent: React.FunctionComponent<SocialButton> = ({ text, type }) => {
+  switch (type) {
+    case 'button':
+      return <GitHubButton text={text} />;
+    case 'link':
+      return <GitHubLink text={text} />;
+    case 'icon':
+      return <GitHubIcon />;
+    default:
+      return <GitHubButton text={text} />;
+  }
+};
+
+export default GithubComponent;
diff --git a/modules/authentication/client-react/social/github/index.native.ts b/modules/authentication/client-react/social/github/index.native.ts
new file mode 100644
index 0000000..2787227
--- /dev/null
+++ b/modules/authentication/client-react/social/github/index.native.ts
@@ -0,0 +1,3 @@
+import GitHubButton from './containers/GitHubButton';
+
+export default GitHubButton;
diff --git a/modules/authentication/client-react/social/github/index.ts b/modules/authentication/client-react/social/github/index.ts
new file mode 100644
index 0000000..2787227
--- /dev/null
+++ b/modules/authentication/client-react/social/github/index.ts
@@ -0,0 +1,3 @@
+import GitHubButton from './containers/GitHubButton';
+
+export default GitHubButton;
diff --git a/modules/authentication/client-react/social/google/containers/GoogleButton.css b/modules/authentication/client-react/social/google/containers/GoogleButton.css
new file mode 100644
index 0000000..236eb58
--- /dev/null
+++ b/modules/authentication/client-react/social/google/containers/GoogleButton.css
@@ -0,0 +1,39 @@
+.googleBtn {
+  min-width: 320px;
+  margin-top: 10px;
+  background-color: #c43832;
+  border-color: #c43832;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.googleBtn:hover {
+  background-color: #aa1c17;
+  border-color: #aa1c17;
+}
+
+.iconContainer { 
+  display: flex;
+  flex: 1 1 10%;
+  justify-content: flex-start;
+   align-items: center; 
+}
+
+.separator { 
+  height: 28px;
+  width: 1px;
+  background-color: #fff;
+  margin-left: 10px;
+}
+
+.btnText { 
+  display: flex;
+  justify-content: flex-start; 
+  flex: 5
+}
+
+.googleIcon { 
+  color: #fff;
+  font-size: 30px;
+}
\ No newline at end of file
diff --git a/modules/authentication/client-react/social/google/containers/GoogleButton.native.tsx b/modules/authentication/client-react/social/google/containers/GoogleButton.native.tsx
new file mode 100644
index 0000000..d448b1c
--- /dev/null
+++ b/modules/authentication/client-react/social/google/containers/GoogleButton.native.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import { View, StyleSheet, Linking, TouchableOpacity, Text, Platform } from 'react-native';
+import { WebBrowser } from 'expo';
+import { FontAwesome } from '@expo/vector-icons';
+import {
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer,
+  separator,
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+} from '@restapp/look-client-react-native/styles';
+
+import { SocialButtonComponent, SocialButton } from '../..';
+import buildRedirectUrlForMobile from '../../../helpers';
+
+const googleLogin = () => {
+  const url = buildRedirectUrlForMobile('google');
+  if (Platform.OS === 'ios') {
+    WebBrowser.openBrowserAsync(url);
+  } else {
+    Linking.openURL(url);
+  }
+};
+
+const GoogleButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity style={styles.buttonContainer} onPress={googleLogin}>
+      <View style={styles.btnIconContainer}>
+        <FontAwesome name="google-plus-square" size={30} style={{ color: '#fff', marginLeft: 10 }} />
+        <View style={styles.separator} />
+      </View>
+      <View style={styles.btnTextContainer}>
+        <Text style={styles.btnText}>{text}</Text>
+      </View>
+    </TouchableOpacity>
+  );
+};
+
+const GoogleLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity onPress={googleLogin} style={styles.link}>
+      <Text style={styles.linkText}>{text}</Text>
+    </TouchableOpacity>
+  );
+};
+
+const GoogleIcon = () => (
+  <View style={styles.iconWrapper}>
+    <FontAwesome style={{ color: '#c43832' }} onPress={googleLogin} name="google-plus-square" size={45} />
+  </View>
+);
+
+const GoogleComponent: React.FunctionComponent<SocialButton> = ({ type, text }) => {
+  switch (type) {
+    case 'button':
+      return <GoogleButton text={text} />;
+    case 'link':
+      return <GoogleLink text={text} />;
+    case 'icon':
+      return <GoogleIcon />;
+    default:
+      return <GoogleButton text={text} />;
+  }
+};
+
+const styles = StyleSheet.create({
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer: {
+    ...buttonContainer,
+    marginTop: 15,
+    backgroundColor: '#c43832'
+  },
+  separator: {
+    ...separator,
+    backgroundColor: '#fff'
+  },
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+});
+
+export default GoogleComponent;
diff --git a/modules/authentication/client-react/social/google/containers/GoogleButton.tsx b/modules/authentication/client-react/social/google/containers/GoogleButton.tsx
new file mode 100644
index 0000000..168482c
--- /dev/null
+++ b/modules/authentication/client-react/social/google/containers/GoogleButton.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import faGooglePlusSquare from '@fortawesome/fontawesome-free-brands/faGooglePlusSquare';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+import { Button } from '@restapp/look-client-react';
+
+import { SocialButtonComponent, SocialButton } from '../..';
+import './GoogleButton.css';
+
+const googleLogin = () => {
+  window.location.href = '/auth/google';
+};
+
+const GoogleButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button type="button" size="lg" onClick={googleLogin} className="googleBtn">
+      <div className="iconContainer">
+        <FontAwesomeIcon icon={faGooglePlusSquare as IconProp} className="googleIcon" />
+        <div className="separator" />
+      </div>
+      <div className="btnText">
+        <span>{text}</span>
+      </div>
+    </Button>
+  );
+};
+
+const GoogleLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button color="link" onClick={googleLogin} style={{ marginTop: 10 }}>
+      {text}
+    </Button>
+  );
+};
+
+const GoogleIcon = () => (
+  <div onClick={googleLogin}>
+    <FontAwesomeIcon icon={faGooglePlusSquare as IconProp} style={{ marginTop: 10, color: '#c43832', fontSize: 40 }} />
+  </div>
+);
+
+const GoogleComponent: React.FunctionComponent<SocialButton> = ({ type, text }) => {
+  switch (type) {
+    case 'button':
+      return <GoogleButton text={text} />;
+    case 'link':
+      return <GoogleLink text={text} />;
+    case 'icon':
+      return <GoogleIcon />;
+    default:
+      return <GoogleButton text={text} />;
+  }
+};
+
+export default GoogleComponent;
diff --git a/modules/authentication/client-react/social/google/index.native.ts b/modules/authentication/client-react/social/google/index.native.ts
new file mode 100644
index 0000000..bea8dc6
--- /dev/null
+++ b/modules/authentication/client-react/social/google/index.native.ts
@@ -0,0 +1,3 @@
+import GoogleButton from './containers/GoogleButton';
+
+export default GoogleButton;
diff --git a/modules/authentication/client-react/social/google/index.ts b/modules/authentication/client-react/social/google/index.ts
new file mode 100644
index 0000000..bea8dc6
--- /dev/null
+++ b/modules/authentication/client-react/social/google/index.ts
@@ -0,0 +1,3 @@
+import GoogleButton from './containers/GoogleButton';
+
+export default GoogleButton;
diff --git a/modules/authentication/client-react/social/index.ts b/modules/authentication/client-react/social/index.ts
new file mode 100644
index 0000000..15e0f59
--- /dev/null
+++ b/modules/authentication/client-react/social/index.ts
@@ -0,0 +1,12 @@
+export interface SocialButtonComponent {
+  text?: string;
+}
+
+export interface SocialButton extends SocialButtonComponent {
+  type: string;
+}
+
+export { default as LinkedInButton } from './linkedin';
+export { default as GoogleButton } from './google';
+export { default as GitHubButton } from './github';
+export { default as FacebookButton } from './facebook';
diff --git a/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.css b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.css
new file mode 100644
index 0000000..f044014
--- /dev/null
+++ b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.css
@@ -0,0 +1,39 @@
+.linkedInBtn {
+  min-width: 320px;
+  margin-top: 10px;
+  background-color: #0077b0;
+  border-color: #0077b0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.linkedInBtn:hover {
+    background-color: #054b6b;
+    border-color: #054b6b;
+}
+
+.iconContainer { 
+  display: flex;
+  flex: 1 1 10%;
+  justify-content: flex-start;
+   align-items: center; 
+}
+
+.separator { 
+  height: 28px;
+  width: 1px;
+  background-color: #fff !important;
+  margin-left: 10px;
+}
+
+.btnText { 
+  display: flex;
+  justify-content: flex-start; 
+  flex: 5
+}
+
+.linkedInIcon { 
+  color: #fff;
+  font-size: 30px;
+}
diff --git a/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.native.tsx b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.native.tsx
new file mode 100644
index 0000000..dcf13f5
--- /dev/null
+++ b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.native.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { View, StyleSheet, Linking, TouchableOpacity, Text, Platform } from 'react-native';
+import { WebBrowser } from 'expo';
+import { FontAwesome } from '@expo/vector-icons';
+import {
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer,
+  separator,
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+} from '@restapp/look-client-react-native/styles';
+
+import { SocialButton, SocialButtonComponent } from '../..';
+import buildRedirectUrlForMobile from '../../../helpers';
+
+const linkedInLogin = () => {
+  const url = buildRedirectUrlForMobile('linkedin');
+  if (Platform.OS === 'ios') {
+    WebBrowser.openBrowserAsync(url);
+  } else {
+    Linking.openURL(url);
+  }
+};
+
+const LinkedInButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity style={styles.buttonContainer} onPress={linkedInLogin}>
+      <View style={styles.btnIconContainer}>
+        <FontAwesome name="linkedin-square" size={30} style={{ color: '#fff', marginLeft: 10 }} />
+        <View style={styles.separator} />
+      </View>
+      <View style={styles.btnTextContainer}>
+        <Text style={styles.btnText}>{text}</Text>
+      </View>
+    </TouchableOpacity>
+  );
+};
+
+const LinkedInLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <TouchableOpacity onPress={linkedInLogin} style={styles.link}>
+      <Text style={styles.linkText}>{text}</Text>
+    </TouchableOpacity>
+  );
+};
+
+const LinkedInIcon = () => (
+  <View style={styles.iconWrapper}>
+    <FontAwesome name="linkedin-square" size={45} style={{ color: '#3B5998' }} onPress={linkedInLogin} />
+  </View>
+);
+
+const LinkedInComponent: React.FunctionComponent<SocialButton> = ({ type, text }) => {
+  switch (type) {
+    case 'button':
+      return <LinkedInButton text={text} />;
+    case 'link':
+      return <LinkedInLink text={text} />;
+    case 'icon':
+      return <LinkedInIcon />;
+    default:
+      return <LinkedInButton text={text} />;
+  }
+};
+
+const styles = StyleSheet.create({
+  iconWrapper,
+  linkText,
+  link,
+  buttonContainer: {
+    ...buttonContainer,
+    marginTop: 15,
+    backgroundColor: '#0077b0'
+  },
+  separator,
+  btnIconContainer,
+  btnTextContainer,
+  btnText
+});
+
+export default LinkedInComponent;
diff --git a/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx
new file mode 100644
index 0000000..696c6eb
--- /dev/null
+++ b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { faLinkedin } from '@fortawesome/fontawesome-free-brands';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+import { Button } from '@restapp/look-client-react';
+
+import { SocialButtonComponent, SocialButton } from '../..';
+import './LinkedInButton.css';
+
+const linkedInLogin = () => {
+  window.location.href = '/auth/linkedin';
+};
+
+const LinkedInButton = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button type="button" size="lg" onClick={linkedInLogin} className="linkedInBtn">
+      <div className="iconContainer">
+        <FontAwesomeIcon icon={faLinkedin as IconProp} className="linkedInIcon" />
+        <div className="separator" />
+      </div>
+      <div className="btnText">
+        <span>{text}</span>
+      </div>
+    </Button>
+  );
+};
+
+const LinkedInLink = ({ text }: SocialButtonComponent) => {
+  return (
+    <Button color="link" onClick={linkedInLogin} style={{ marginTop: 10 }}>
+      {text}
+    </Button>
+  );
+};
+
+const LinkedInIcon = () => (
+  <div onClick={linkedInLogin}>
+    <FontAwesomeIcon icon={faLinkedin as IconProp} style={{ marginTop: 10, color: '#3B5998', fontSize: 40 }} />
+  </div>
+);
+
+const LinkedInComponent: React.FunctionComponent<SocialButton> = ({ text, type }) => {
+  switch (type) {
+    case 'button':
+      return <LinkedInButton text={text} />;
+    case 'link':
+      return <LinkedInLink text={text} />;
+    case 'icon':
+      return <LinkedInIcon />;
+    default:
+      return <LinkedInButton text={text} />;
+  }
+};
+
+export default LinkedInComponent;
diff --git a/modules/authentication/client-react/social/linkedin/index.native.ts b/modules/authentication/client-react/social/linkedin/index.native.ts
new file mode 100644
index 0000000..8d6a494
--- /dev/null
+++ b/modules/authentication/client-react/social/linkedin/index.native.ts
@@ -0,0 +1,3 @@
+import LinkedInButton from './containers/LinkedInButton';
+
+export default LinkedInButton;
diff --git a/modules/authentication/client-react/social/linkedin/index.ts b/modules/authentication/client-react/social/linkedin/index.ts
new file mode 100644
index 0000000..8d6a494
--- /dev/null
+++ b/modules/authentication/client-react/social/linkedin/index.ts
@@ -0,0 +1,3 @@
+import LinkedInButton from './containers/LinkedInButton';
+
+export default LinkedInButton;
diff --git a/modules/look/client-react-native/styles/button.js b/modules/look/client-react-native/styles/button.js
deleted file mode 100644
index e3f09e7..0000000
--- a/modules/look/client-react-native/styles/button.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// eslint-disable-next-line
-export const submit = {
-  paddingTop: 30,
-  paddingBottom: 15
-};
diff --git a/modules/look/client-react-native/styles/button.ts b/modules/look/client-react-native/styles/button.ts
new file mode 100644
index 0000000..565dae2
--- /dev/null
+++ b/modules/look/client-react-native/styles/button.ts
@@ -0,0 +1,6 @@
+import { ViewStyle } from 'react-native';
+
+export const submit: ViewStyle = {
+  paddingTop: 30,
+  paddingBottom: 15
+};
diff --git a/modules/look/client-react-native/styles/colors.js b/modules/look/client-react-native/styles/colors.ts
similarity index 100%
rename from modules/look/client-react-native/styles/colors.js
rename to modules/look/client-react-native/styles/colors.ts
diff --git a/modules/look/client-react-native/styles/index.js b/modules/look/client-react-native/styles/index.ts
similarity index 100%
rename from modules/look/client-react-native/styles/index.js
rename to modules/look/client-react-native/styles/index.ts
diff --git a/modules/look/client-react-native/styles/itemContainer.js b/modules/look/client-react-native/styles/itemContainer.ts
similarity index 52%
rename from modules/look/client-react-native/styles/itemContainer.js
rename to modules/look/client-react-native/styles/itemContainer.ts
index 7f8f4ee..8c03378 100644
--- a/modules/look/client-react-native/styles/itemContainer.js
+++ b/modules/look/client-react-native/styles/itemContainer.ts
@@ -1,15 +1,17 @@
-export const itemContainer = {
+import { ViewStyle, TextStyle } from 'react-native';
+
+export const itemContainer: ViewStyle = {
   flex: 1,
   flexDirection: 'row',
   alignItems: 'center'
 };
 
-export const itemTitle = {
+export const itemTitle: TextStyle = {
   flex: 5,
   flexDirection: 'column'
 };
 
-export const itemAction = {
+export const itemAction: ViewStyle = {
   flex: 1,
   flexDirection: 'column',
   justifyContent: 'center',
diff --git a/modules/look/client-react-native/styles/socialButton.js b/modules/look/client-react-native/styles/socialButton.ts
similarity index 68%
rename from modules/look/client-react-native/styles/socialButton.js
rename to modules/look/client-react-native/styles/socialButton.ts
index 83393bf..2afa9d4 100644
--- a/modules/look/client-react-native/styles/socialButton.js
+++ b/modules/look/client-react-native/styles/socialButton.ts
@@ -1,45 +1,47 @@
-const iconWrapper = {
+import { ViewStyle, TextStyle } from 'react-native';
+
+const iconWrapper: ViewStyle = {
   alignItems: 'center',
   marginTop: 10
 };
 
-const linkText = {
+const linkText: TextStyle = {
   color: '#0056b3',
   fontSize: 16,
   fontWeight: '600'
 };
 
-const link = {
+const link: ViewStyle = {
   justifyContent: 'center',
   alignItems: 'center',
   margin: 10
 };
 
-const buttonContainer = {
+const buttonContainer: ViewStyle = {
   height: 45,
   flexDirection: 'row',
   alignItems: 'center',
   backgroundColor: '#3769ae',
   borderRadius: 4
 };
-const separator = {
+const separator: ViewStyle = {
   height: 30,
   width: 1.5,
   marginLeft: 10,
   backgroundColor: '#fff'
 };
-const btnIconContainer = {
+const btnIconContainer: ViewStyle = {
   flex: 2,
   justifyContent: 'flex-start',
   alignItems: 'center',
   flexDirection: 'row'
 };
-const btnTextContainer = {
+const btnTextContainer: ViewStyle = {
   flex: 5,
   justifyContent: 'center',
   alignItems: 'flex-start'
 };
-const btnText = {
+const btnText: TextStyle = {
   color: '#fff',
   fontSize: 16,
   fontWeight: '400'
diff --git a/packages/client/package.json b/packages/client/package.json
index d69a9ac..8375cb5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -40,15 +40,19 @@
   "dependencies": {
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
-    "@fortawesome/react-fontawesome": "0.0.18",
+    "@fortawesome/fontawesome-svg-core": "^1.2.10",
+    "@fortawesome/react-fontawesome": "^0.1.3",
     "@restapp/core-client-react": "^0.1.0",
     "@restapp/forms-client-react": "^0.1.0",
     "@restapp/i18n-client-react": "^0.1.0",
     "@restapp/i18n-common-react": "^0.1.0",
     "@restapp/module-client-react": "^0.1.0",
+    "@restapp/user-client-react": "^0.1.0",
+    "@restapp/authentication-client-react": "^0.1.0",
     "@restapp/validation-common-react": "^0.1.0",
     "@restapp/welcome-client-react": "^0.1.0",
     "antd": "^3.10.0",
+    "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.1.1",
     "error-stack-parser": "^2.0.1",
@@ -147,4 +151,4 @@
       "not ie < 11"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/packages/client/src/modules.ts b/packages/client/src/modules.ts
index 3e3038d..828b088 100644
--- a/packages/client/src/modules.ts
+++ b/packages/client/src/modules.ts
@@ -1,5 +1,6 @@
 import welcome from '@restapp/welcome-client-react';
 import user from '@restapp/user-client-react';
+import authentication from '@restapp/authentication-client-react';
 import core from '@restapp/core-client-react';
 import look from '@restapp/look-client-react';
 import i18n from '@restapp/i18n-client-react';
@@ -10,6 +11,16 @@ import '@restapp/favicon-common';
 
 const pageNotFound = require('@restapp/page-not-found-client-react').default;
 
-const modules = new ClientModule(user, welcome, look, validation, defaultRouter, i18n, pageNotFound, core);
+const modules = new ClientModule(
+  authentication,
+  user,
+  welcome,
+  look,
+  validation,
+  defaultRouter,
+  i18n,
+  pageNotFound,
+  core
+);
 
 export default modules;
diff --git a/packages/mobile/src/modules.ts b/packages/mobile/src/modules.ts
index 09a076e..2523612 100644
--- a/packages/mobile/src/modules.ts
+++ b/packages/mobile/src/modules.ts
@@ -1,5 +1,6 @@
 import welcome from '@restapp/welcome-client-react';
 import user from '@restapp/user-client-react';
+import authentication from '@restapp/authentication-client-react';
 import core from '@restapp/core-client-react-native';
 import i18n from '@restapp/i18n-client-react';
 import validation from '@restapp/validation-common-react';
@@ -7,6 +8,6 @@ import defaultRouter from '@restapp/router-client-react-native';
 
 import ClientModule from '@restapp/module-client-react-native';
 
-const modules = new ClientModule(user, welcome, validation, defaultRouter, i18n, core);
+const modules = new ClientModule(defaultRouter, authentication, user, welcome, validation, i18n, core);
 
 export default modules;
diff --git a/yarn.lock b/yarn.lock
index 9025673..6a469e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1170,6 +1170,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.7.tgz#4336c4b06d0b5608ff1215464b66fcf9f4795284"
   integrity sha512-ego8jRVSHfq/iq4KRZJKQeUAdi3ZjGNrqw4oPN3fNdvTBnLCSntwVCnc37bsAJP9UB8MhrTfPnZYxkv2vpS4pg==
 
+"@fortawesome/fontawesome-common-types@^0.2.17":
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.17.tgz#d8c36e6f6f3b3415fa1f83eaffe4f41bd313715c"
+  integrity sha512-DEYsEb/iiGVoMPQGjhG2uOylLVuMzTxOxysClkabZ5n80Q3oFDWGnshCLKvOvKoeClsgmKhWVrnnqvsMI1cAbw==
+
 "@fortawesome/fontawesome-free-brands@^5.0.6":
   version "5.0.13"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.13.tgz#4d15ff4e1e862d5e4a4df3654f8e8acbd47e9c09"
@@ -1177,6 +1182,13 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.1.7"
 
+"@fortawesome/fontawesome-svg-core@^1.2.10":
+  version "1.2.17"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.17.tgz#8fce4402e824ebe99a04b1949d56d696eeae2e6d"
+  integrity sha512-TORMW/wIX2QyyGBd4XwHGPir4/0U18Wxf+iDBAUW3EIJ0/VC/ZMpJOiyiCe1f8g9h0PPzA7sqVtl8JtTUtm4uA==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "^0.2.17"
+
 "@fortawesome/fontawesome@^1.1.8":
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome/-/fontawesome-1.1.8.tgz#75fe66a60f95508160bb16bd781ad7d89b280f5b"
@@ -1184,12 +1196,13 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.1.7"
 
-"@fortawesome/react-fontawesome@0.0.18":
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.0.18.tgz#4e0eb1cf9797715a67bb7705ae084fa0a410f185"
-  integrity sha512-ZSO55oWtGSZFvoJW0gvhlYndKvHqmMj/27qTrJOT4DaxQ4Fcc90h/BVEED6IktzBqEunUF8aP+bwU5Og1I0fnQ==
+"@fortawesome/react-fontawesome@^0.1.3":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.4.tgz#18d61d9b583ca289a61aa7dccc05bd164d6bc9ad"
+  integrity sha512-GwmxQ+TK7PEdfSwvxtGnMCqrfEm0/HbRHArbUudsYiy9KzVCwndxa2KMcfyTQ8El0vROrq8gOOff09RF1oQe8g==
   dependencies:
     humps "^2.0.1"
+    prop-types "^15.5.10"
 
 "@jest/types@^24.5.0":
   version "24.5.0"
@@ -3386,6 +3399,14 @@ axios@0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
+axios@^0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
+  integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
+  dependencies:
+    follow-redirects "^1.3.0"
+    is-buffer "^1.1.5"
+
 axios@v0.19.0-beta.1:
   version "0.19.0-beta.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0-beta.1.tgz#3d6a9ee75885d1fd39e108df9a4fb2e48e1af1e8"
@@ -8106,7 +8127,7 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0, follow-redirects@^1.2.3, follow-redirects@^1.4.1:
+follow-redirects@^1.0.0, follow-redirects@^1.2.3, follow-redirects@^1.3.0, follow-redirects@^1.4.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
   integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
@@ -9305,7 +9326,7 @@ immediate@^3.2.2:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c"
   integrity sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=
 
-immutability-helper@^2.6.2:
+immutability-helper@2.8.1, immutability-helper@^2.6.2:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.8.1.tgz#3c5ec05fcd83676bfae7146f319595243ad904f4"
   integrity sha512-8AVB5EUpRBUdXqfe4cFsFECsOIZ9hX/Arl8B8S9/tmwpYv3UWvOsXUPOjkuZIMaVxfSWkxCzkng1rjmEoSWrxQ==
@@ -10154,6 +10175,11 @@ items@2.x.x:
   resolved "https://registry.yarnpkg.com/items/-/items-2.1.2.tgz#0849354595805d586dac98e7e6e85556ea838558"
   integrity sha512-kezcEqgB97BGeZZYtX/MA8AG410ptURstvnz5RAgyFZ8wQFPMxHY8GpTq+/ZHKT3frSlIthUq7EvLt9xn3TvXg==
 
+iterall@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
+  integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
+
 jest-changed-files@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
@@ -18509,7 +18535,7 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-watchpack@^1.5.0:
+watchpack@^1.5.0, "watchpack@https://github.com/Globegitter/watchpack":
   version "1.6.0"
   resolved "https://github.com/Globegitter/watchpack#d903e64a910ab068299f824b04a5e216a15672e9"
   dependencies:

From 4453d8c9225aa50677cd8cd373582395b6d89d5c Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 8 May 2019 12:48:08 +0300
Subject: [PATCH 030/104] Add httpClient in Client module and create request
 handler

---
 .../client-react/access/jwt/index.ts          | 77 ++++++++++---------
 modules/core/client-react/Main.tsx            |  2 +-
 modules/core/common/createReduxStore.ts       | 22 ++++--
 modules/module/client-react/ClientModule.ts   |  9 +++
 modules/user/client-react/actions/register.ts |  5 +-
 5 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index 69a5080..dc9edfc 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -22,6 +22,32 @@ const removeTokens = async () => {
   await removeItem(TokensEnum.refreshToken);
 };
 
+const client = async (request: () => Promise<any>) => {
+  try {
+    const result = await request();
+    return result;
+  } catch (e) {
+    if (e.response && e.response.status === 401) {
+      try {
+        const { data } = await axios.post(`${__API_URL__}/refreshToken`, {
+          refreshToken: await getItem('refreshToken')
+        });
+        if (data && data.refreshTokens) {
+          const { accessToken, refreshToken } = data.refreshTokens;
+          await saveTokens({ accessToken, refreshToken });
+        } else {
+          await removeTokens();
+        }
+      } catch (e) {
+        await removeTokens();
+        throw e;
+      }
+      await request();
+    }
+    return e.response;
+  }
+};
+
 axios.interceptors.request.use(async config => {
   const accessToken = await getItem(TokensEnum.accessToken);
 
@@ -37,50 +63,27 @@ axios.interceptors.request.use(async config => {
   return config;
 });
 
-axios.interceptors.response.use(
-  async (res: any) => {
-    if (res.config.url.includes('login')) {
-      if (!!res.data && res.data.login.tokens) {
-        const {
-          data: {
-            login: {
-              tokens: { accessToken, refreshToken }
-            }
+axios.interceptors.response.use(async (res: any) => {
+  if (res.config.url.includes('login')) {
+    if (!!res.data && res.data.login.tokens) {
+      const {
+        data: {
+          login: {
+            tokens: { accessToken, refreshToken }
           }
-        } = res;
-        await saveTokens({ accessToken, refreshToken });
-      } else {
-        await removeTokens();
-      }
-      return res;
-    }
-
-    if (res && res.status > 400 && res.status < 500) {
-      try {
-        const { data } = await axios.post(`${__API_URL__}/refreshToken`, {
-          refreshToken: await getItem('refreshToken')
-        });
-        if (data && data.refreshTokens) {
-          const { accessToken, refreshToken } = data.refreshTokens;
-          await saveTokens({ accessToken, refreshToken });
-        } else {
-          await removeTokens();
         }
-      } catch (e) {
-        await removeTokens();
-        throw e;
-      }
-      await res.request();
+      } = res;
+      await saveTokens({ accessToken, refreshToken });
+    } else {
+      await removeTokens();
     }
     return res;
-  },
-  err => {
-    return Promise.reject(err);
   }
-);
+});
 
 export default (settings.auth.jwt.enabled
   ? new AccessModule({
-      logout: [removeTokens]
+      logout: [removeTokens],
+      httpClient: client
     })
   : undefined);
diff --git a/modules/core/client-react/Main.tsx b/modules/core/client-react/Main.tsx
index 7f0233d..1a5aca9 100644
--- a/modules/core/client-react/Main.tsx
+++ b/modules/core/client-react/Main.tsx
@@ -25,7 +25,7 @@ export const onAppCreate = (modules: ClientModule, entryModule: NodeModule) => {
     ref.store = entryModule.hot.data.store;
     ref.store.replaceReducer(getStoreReducer(ref.modules.reducers));
   } else {
-    ref.store = createReduxStore(ref.modules.reducers, {}, routerMiddleware(history));
+    ref.store = createReduxStore(ref.modules.reducers, {}, routerMiddleware(history), ref.modules.httpClients);
   }
 };
 
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 5bcda53..bd4b566 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -8,7 +8,9 @@ export const getStoreReducer = (reducers: any) =>
     ...reducers
   });
 
-const requestMiddleware: Middleware = _state => next => action => {
+const requestMiddleware: (
+  httpClient?: (request: () => Promise<any>) => void
+) => Middleware = httpClient => _state => next => action => {
   const { types, callAPI, ...rest } = action;
 
   if (!types) {
@@ -21,14 +23,17 @@ const requestMiddleware: Middleware = _state => next => action => {
 
   const handleCallApi = async () => {
     try {
-      const { data } = await callAPI();
+      const { data } = await callAPI(httpClient);
       next({
         type: SUCCESS,
         payload: data,
         ...rest
       });
       return data;
-    } catch ({ response: { data } }) {
+    } catch (e) {
+      const {
+        response: { data }
+      } = e;
       next({
         type: FAIL,
         payload: data,
@@ -41,8 +46,15 @@ const requestMiddleware: Middleware = _state => next => action => {
   return handleCallApi();
 };
 
-const createReduxStore = (reducers: Reducer, initialState: DeepPartial<any>, routerMiddleware?: Middleware): Store => {
-  const middleware = routerMiddleware ? [routerMiddleware, requestMiddleware] : [requestMiddleware];
+const createReduxStore = (
+  reducers: Reducer,
+  initialState: DeepPartial<any>,
+  routerMiddleware?: Middleware,
+  httpClient?: (request: () => Promise<any>) => void
+): Store => {
+  const middleware = routerMiddleware
+    ? [routerMiddleware, requestMiddleware(httpClient)]
+    : [requestMiddleware(httpClient)];
   return createStore(
     getStoreReducer(reducers),
     initialState, // initial state,
diff --git a/modules/module/client-react/ClientModule.ts b/modules/module/client-react/ClientModule.ts
index a624c0a..236a297 100644
--- a/modules/module/client-react/ClientModule.ts
+++ b/modules/module/client-react/ClientModule.ts
@@ -15,6 +15,8 @@ export interface ClientModuleShape extends BaseModuleShape {
   stylesInsert?: string[];
   // URL list to 3rd party js scripts
   scriptsInsert?: string[];
+  // Http client is provided by modules
+  httpClient?: (request: () => Promise<any>) => void;
 }
 
 interface ClientModule extends ClientModuleShape {}
@@ -82,6 +84,13 @@ class ClientModule extends BaseModule {
   get scriptsInserts() {
     return this.scriptsInsert || [];
   }
+
+  /**
+   * @returns Http client is provided by modules
+   */
+  get httpClients() {
+    return this.httpClient;
+  }
 }
 
 export default ClientModule;
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index 365793f..b1edb34 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -5,6 +5,9 @@ import { ActionType } from '../reducers';
 export default function REGISTER(value: RegisterSubmitProps) {
   return {
     types: [null, ActionType.REGISTER, null],
-    callAPI: () => axios.post(`${__API_URL__}/register`, { ...value })
+    callAPI: (client: (request: () => Promise<any>) => void) =>
+      client
+        ? client(() => axios.post(`${__API_URL__}/register`, { ...value }))
+        : axios.post(`${__API_URL__}/register`, { ...value })
   };
 }

From e0121053a14b246471e2f80ee767870fe41b19a8 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 8 May 2019 14:45:09 +0300
Subject: [PATCH 031/104] Add login and logout components

---
 modules/core/common/createReduxStore.ts       |   6 +-
 .../{HeaderTitle.jsx => HeaderTitle.tsx}      |  19 ++-
 modules/user/client-react/actions/index.ts    |   3 +-
 modules/user/client-react/actions/login.ts    |  13 ++
 .../components/LoginForm.native.tsx           | 157 ++++++++++++++++++
 .../client-react/components/LoginForm.tsx     | 115 +++++++++++++
 .../components/LoginView.native.tsx           | 110 ++++++++++++
 .../client-react/components/LoginView.tsx     |  72 ++++++++
 .../user/client-react/containers/AuthBase.tsx |  35 +++-
 .../client-react/containers/Login.native.tsx  |  39 +++++
 .../user/client-react/containers/Login.tsx    |  52 ++++++
 .../client-react/containers/Logout.native.tsx |  32 ++++
 .../user/client-react/containers/Register.tsx |   1 -
 modules/user/client-react/index.native.tsx    |  31 +++-
 modules/user/client-react/index.tsx           |  40 ++++-
 15 files changed, 700 insertions(+), 25 deletions(-)
 rename modules/look/client-react-native/{HeaderTitle.jsx => HeaderTitle.tsx} (66%)
 create mode 100644 modules/user/client-react/actions/login.ts
 create mode 100644 modules/user/client-react/components/LoginForm.native.tsx
 create mode 100644 modules/user/client-react/components/LoginForm.tsx
 create mode 100644 modules/user/client-react/components/LoginView.native.tsx
 create mode 100644 modules/user/client-react/components/LoginView.tsx
 create mode 100644 modules/user/client-react/containers/Login.native.tsx
 create mode 100644 modules/user/client-react/containers/Login.tsx
 create mode 100644 modules/user/client-react/containers/Logout.native.tsx

diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index bd4b566..dbf812b 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -23,13 +23,13 @@ const requestMiddleware: (
 
   const handleCallApi = async () => {
     try {
-      const { data } = await callAPI(httpClient);
+      const result = await callAPI(httpClient);
       next({
         type: SUCCESS,
-        payload: data,
+        payload: result,
         ...rest
       });
-      return data;
+      return result;
     } catch (e) {
       const {
         response: { data }
diff --git a/modules/look/client-react-native/HeaderTitle.jsx b/modules/look/client-react-native/HeaderTitle.tsx
similarity index 66%
rename from modules/look/client-react-native/HeaderTitle.jsx
rename to modules/look/client-react-native/HeaderTitle.tsx
index b7c5201..86f4fe4 100644
--- a/modules/look/client-react-native/HeaderTitle.jsx
+++ b/modules/look/client-react-native/HeaderTitle.tsx
@@ -1,20 +1,21 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Text, StyleSheet, Platform } from 'react-native';
+import { TranslateFunction } from '@restapp/i18n-client-react';
 
-const HeaderTitle = ({ t, i18nKey, style, children, ...props }) => (
+interface HeaderTitleProps {
+  t?: TranslateFunction;
+  style?: any;
+  i18nKey?: string;
+  children?: React.ReactNode | any;
+  onPress?: () => any;
+}
+
+const HeaderTitle = ({ t, i18nKey, style, children, ...props }: HeaderTitleProps) => (
   <Text {...props} style={typeof style === 'string' ? styles[style] : style || styles.menuTitle}>
     {t ? t(i18nKey || 'navLink') : children}
   </Text>
 );
 
-HeaderTitle.propTypes = {
-  t: PropTypes.func,
-  children: PropTypes.node,
-  i18nKey: PropTypes.string,
-  style: PropTypes.any
-};
-
 const styles = StyleSheet.create({
   menuTitle: {
     padding: 16,
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 98c39af..2ada4cf 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -1,3 +1,4 @@
 import REGISTER from './register';
+import LOGIN from './login';
 
-export { REGISTER };
+export { REGISTER, LOGIN };
diff --git a/modules/user/client-react/actions/login.ts b/modules/user/client-react/actions/login.ts
new file mode 100644
index 0000000..5dcbfb2
--- /dev/null
+++ b/modules/user/client-react/actions/login.ts
@@ -0,0 +1,13 @@
+import axios from 'axios';
+import { LoginSubmitProps } from '..';
+import { ActionType } from '../reducers';
+
+export default function LOGIN(value: LoginSubmitProps) {
+  return {
+    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
+    callAPI: (client: (request: () => Promise<any>) => any) =>
+      client
+        ? client(() => axios.post(`${__API_URL__}/login`, { ...value }))
+        : axios.post(`${__API_URL__}/login`, { ...value })
+  };
+}
diff --git a/modules/user/client-react/components/LoginForm.native.tsx b/modules/user/client-react/components/LoginForm.native.tsx
new file mode 100644
index 0000000..4675a20
--- /dev/null
+++ b/modules/user/client-react/components/LoginForm.native.tsx
@@ -0,0 +1,157 @@
+import * as React from 'react';
+import { StyleSheet, View, Text, TouchableOpacity, ViewStyle } from 'react-native';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
+import { withFormik } from 'formik';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { RenderField, Button, primary, FormView } from '@restapp/look-client-react-native';
+import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
+import { required, minLength, validate } from '@restapp/validation-common-react';
+import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@restapp/authentication-client-react';
+
+import { FormProps, LoginSubmitProps, NavigationOptionsProps } from '../index.native';
+import settings from '../../../../settings';
+
+interface SocialButtons {
+  buttonsLength: number;
+  t: TranslateFunction;
+}
+
+interface LoginForm extends FormProps<LoginSubmitProps> {
+  valid: string;
+}
+
+const loginFormSchema = {
+  usernameOrEmail: [required, minLength(3)],
+  password: [required, minLength(settings.auth.password.minLength)]
+};
+const { github, facebook, linkedin, google } = settings.auth.social;
+
+const renderSocialButtons = ({ buttonsLength, t }: SocialButtons) => {
+  const type: string = buttonsLength > 2 ? 'icon' : 'button';
+  const containerStyle: ViewStyle =
+    buttonsLength > 2 ? { flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' } : {};
+
+  return buttonsLength > 0 ? (
+    <View style={containerStyle}>
+      {facebook.enabled && <FacebookButton text={t('login.fbBtn')} type={type} />}
+      {google.enabled && <GoogleButton text={t('login.googleBtn')} type={type} />}
+      {github.enabled && <GitHubButton text={t('login.githubBtn')} type={type} />}
+      {linkedin.enabled && <LinkedInButton text={t('login.linkedinBtn')} type={type} />}
+    </View>
+  ) : null;
+};
+
+const LoginForm = <P extends LoginForm & NavigationOptionsProps>({ handleSubmit, valid, values, navigation, t }: P) => {
+  const buttonsLength = [facebook.enabled, linkedin.enabled, google.enabled, github.enabled].filter(button => button)
+    .length;
+  return (
+    <FormView contentContainerStyle={{ flexGrow: 1 }} style={styles.formView}>
+      <View style={styles.formContainer}>
+        <View style={styles.form}>
+          <View>
+            <View>
+              <Field
+                autoCapitalize="none"
+                autoCorrect={false}
+                name="usernameOrEmail"
+                component={RenderField}
+                type="text"
+                keyboardType="email-address"
+                placeholder={t('mobile.login.usernameOrEmail.placeholder')}
+                placeholderTextColor={placeholderColor}
+                value={values.usernameOrEmail}
+              />
+              <Field
+                autoCapitalize="none"
+                autoCorrect={false}
+                name="password"
+                component={RenderField}
+                type="password"
+                secureTextEntry={true}
+                placeholder={t('mobile.login.pass.placeholder')}
+                placeholderTextColor={placeholderColor}
+                value={values.password}
+              />
+            </View>
+            <View style={styles.submit}>
+              <Button type={primary} onPress={handleSubmit} disabled={valid}>
+                {t('login.form.btnSubmit')}
+              </Button>
+            </View>
+            {renderSocialButtons({ buttonsLength, t })}
+            <View style={styles.buttonsGroup}>
+              <Text style={styles.signUpText} onPress={() => navigation.navigate('ForgotPassword')}>
+                {t('login.btn.forgotPass')}
+              </Text>
+            </View>
+            <KeyboardSpacer />
+          </View>
+        </View>
+        <View style={styles.buttonWrapper}>
+          <Text style={styles.text}>{t('login.notRegText')}</Text>
+          <TouchableOpacity onPress={() => navigation.navigate('Register')}>
+            <Text style={styles.signUpText}>{t('login.btn.sign')}</Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+    </FormView>
+  );
+};
+
+const styles = StyleSheet.create({
+  formContainer: {
+    flex: 1
+  },
+  formView: {
+    flex: 1,
+    alignSelf: 'stretch'
+  },
+  form: {
+    justifyContent: 'center',
+    paddingHorizontal: 20,
+    flex: 9
+  },
+  submit,
+  buttonsGroup: {
+    flex: 1,
+    paddingTop: 10
+  },
+  buttonWrapper: {
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'flex-end'
+  },
+  text: {
+    fontSize: 14,
+    color: '#bcb8b8'
+  },
+  signUpText: {
+    fontSize: 16,
+    paddingLeft: 3,
+    color: '#8e908c',
+    fontWeight: '600',
+    textDecorationLine: 'underline',
+    textAlign: 'center'
+  }
+});
+
+const LoginFormWithFormik = withFormik<LoginForm & NavigationOptionsProps, LoginSubmitProps>({
+  enableReinitialize: true,
+  mapPropsToValues: () => ({ usernameOrEmail: '', password: '' }),
+
+  handleSubmit(values, { setErrors, props: { onSubmit } }) {
+    onSubmit(values).catch((e: any) => {
+      if (e) {
+        setErrors(e.errors);
+      } else {
+        throw e;
+      }
+    });
+  },
+  validate: values => validate(values, loginFormSchema),
+  displayName: 'LoginForm' // helps with React DevTools
+});
+
+export default translate('user')(LoginFormWithFormik(LoginForm));
diff --git a/modules/user/client-react/components/LoginForm.tsx b/modules/user/client-react/components/LoginForm.tsx
new file mode 100644
index 0000000..5084a55
--- /dev/null
+++ b/modules/user/client-react/components/LoginForm.tsx
@@ -0,0 +1,115 @@
+import * as React from 'react';
+import { withFormik } from 'formik';
+import { NavLink, Link } from 'react-router-dom';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { required, minLength, validate } from '@restapp/validation-common-react';
+import { Form, RenderField, Alert, Button } from '@restapp/look-client-react';
+import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@restapp/authentication-client-react';
+
+import settings from '../../../../settings';
+import { FormProps, LoginSubmitProps } from '..';
+
+interface SocialButtons {
+  buttonsLength: number;
+  t: TranslateFunction;
+}
+
+const loginFormSchema = {
+  usernameOrEmail: [required, minLength(3)],
+  password: [required, minLength(8)]
+};
+const { github, facebook, linkedin, google } = settings.auth.social;
+
+const renderSocialButtons = ({ buttonsLength, t }: SocialButtons) => {
+  const type: string = buttonsLength > 2 ? 'icon' : 'button';
+  const containerStyle =
+    buttonsLength > 2 ? { display: 'flex', justifyContent: 'space-between', alignItems: 'center', minWidth: 200 } : {};
+
+  return (
+    <div style={containerStyle}>
+      {facebook.enabled && (
+        <div className="text-center">
+          <FacebookButton text={t('login.fbBtn')} type={type} />
+        </div>
+      )}
+      {google.enabled && (
+        <div className="text-center">
+          <GoogleButton text={t('login.googleBtn')} type={type} />
+        </div>
+      )}
+      {github.enabled && (
+        <div className="text-center">
+          <GitHubButton text={t('login.githubBtn')} type={type} />
+        </div>
+      )}
+      {linkedin.enabled && (
+        <div className="text-center">
+          <LinkedInButton text={t('login.linkedinBtn')} type={type} />
+        </div>
+      )}
+    </div>
+  );
+};
+
+const LoginForm = ({ handleSubmit, submitting, errors, values, t }: FormProps<LoginSubmitProps>) => {
+  const buttonsLength: number = [facebook.enabled, linkedin.enabled, google.enabled, github.enabled].filter(
+    button => button
+  ).length;
+  return (
+    <Form name="login" onSubmit={handleSubmit}>
+      <Field
+        name="usernameOrEmail"
+        component={RenderField}
+        type="text"
+        label={t('login.form.field.usernameOrEmail')}
+        value={values.usernameOrEmail}
+      />
+      <Field
+        name="password"
+        component={RenderField}
+        type="password"
+        label={t('login.form.field.pass')}
+        value={values.password}
+      />
+      <div className="text-center">{errors && errors.message && <Alert color="error">{errors.message}</Alert>}</div>
+      <div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center' }}>
+        <div className="text-center">
+          <Button size="lg" style={{ minWidth: '320px' }} color="primary" type="submit" disabled={submitting}>
+            {t('login.form.btnSubmit')}
+          </Button>
+        </div>
+        {renderSocialButtons({ buttonsLength, t })}
+      </div>
+      <div className="text-center" style={{ marginTop: 10 }}>
+        <Link to="/forgot-password">{t('login.btn.forgotPass')}</Link>
+      </div>
+      <hr />
+      <div className="text-center" style={{ marginBottom: 16 }}>
+        <span style={{ lineHeight: '58px' }}>{t('login.btn.notReg')}</span>
+        <NavLink className="btn btn-primary" to="/register" activeClassName="active" style={{ margin: 10 }}>
+          {t('login.btn.sign')}
+        </NavLink>
+      </div>
+    </Form>
+  );
+};
+
+const LoginFormWithFormik = withFormik<FormProps<LoginSubmitProps>, LoginSubmitProps>({
+  enableReinitialize: true,
+  mapPropsToValues: () => ({ usernameOrEmail: '', password: '' }),
+
+  handleSubmit(values, { setErrors, props: { onSubmit } }) {
+    onSubmit(values).catch((e: any) => {
+      if (e) {
+        setErrors(e.errors);
+      } else {
+        throw e;
+      }
+    });
+  },
+  validate: values => validate(values, loginFormSchema),
+  displayName: 'LoginForm' // helps with React DevTools
+});
+
+export default translate('user')(LoginFormWithFormik(LoginForm));
diff --git a/modules/user/client-react/components/LoginView.native.tsx b/modules/user/client-react/components/LoginView.native.tsx
new file mode 100644
index 0000000..980e821
--- /dev/null
+++ b/modules/user/client-react/components/LoginView.native.tsx
@@ -0,0 +1,110 @@
+import * as React from 'react';
+import { StyleSheet, View, Text, Linking, Platform } from 'react-native';
+import { WebBrowser } from 'expo';
+import { translate } from '@restapp/i18n-client-react';
+import { placeholderColor } from '@restapp/look-client-react-native/styles';
+import { setItem } from '@restapp/core-common/clientStorage';
+import authentication from '@restapp/authentication-client-react';
+
+import LoginForm from './LoginForm.native';
+import { LoginProps } from '../containers/Login.native';
+
+import { LoginSubmitProps } from '../index.native';
+
+interface LoginViewProps extends LoginProps {
+  onSubmit: (values: LoginSubmitProps) => void;
+}
+
+interface LinkingEvent {
+  url: string;
+}
+class LoginView extends React.PureComponent<LoginViewProps> {
+  public componentDidMount() {
+    Linking.addEventListener('url', this.handleOpenURL);
+  }
+
+  public componentWillUnmount() {
+    Linking.removeEventListener('url', this.handleOpenURL);
+  }
+
+  public handleOpenURL = async ({ url }: LinkingEvent) => {
+    const dataRegExp = /data=([^#]+)/;
+    if (!url.match(dataRegExp)) {
+      return;
+    }
+
+    // Extract stringified user string out of the URL
+    const [, data] = url.match(dataRegExp);
+    const decodedData = JSON.parse(decodeURI(data));
+
+    if (decodedData.tokens) {
+      await setItem('accessToken', decodedData.tokens.accessToken);
+      await setItem('refreshToken', decodedData.tokens.refreshToken);
+
+      await authentication.doLogin();
+    }
+
+    if (Platform.OS === 'ios') {
+      WebBrowser.dismissBrowser();
+    }
+  };
+
+  public renderAvailableLogins = () => (
+    <View style={styles.examplesArea}>
+      <Text style={styles.title}>{this.props.t('login.cardTitle')}:</Text>
+      <Text style={styles.exampleText}>admin@example.com: admin123</Text>
+      <Text style={styles.exampleText}>user@example.com: user1234</Text>
+    </View>
+  );
+
+  public render() {
+    const { navigation, onSubmit } = this.props;
+    return (
+      <View style={styles.container}>
+        <View style={styles.examplesContainer}>{this.renderAvailableLogins()}</View>
+        <View style={styles.loginContainer}>
+          <LoginForm onSubmit={onSubmit} navigation={navigation} />
+        </View>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'stretch',
+    padding: 10
+  },
+  examplesArea: {
+    borderWidth: 0.5,
+    borderRadius: 5,
+    borderColor: placeholderColor,
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    backgroundColor: '#e3e3e3',
+    padding: 10
+  },
+  examplesContainer: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  title: {
+    fontSize: 18,
+    fontWeight: '600',
+    textAlign: 'center',
+    color: placeholderColor
+  },
+  exampleText: {
+    fontSize: 14,
+    fontWeight: '400',
+    color: placeholderColor
+  },
+  loginContainer: {
+    flex: 3
+  }
+});
+
+export default translate('user')(LoginView);
diff --git a/modules/user/client-react/components/LoginView.tsx b/modules/user/client-react/components/LoginView.tsx
new file mode 100644
index 0000000..43798b0
--- /dev/null
+++ b/modules/user/client-react/components/LoginView.tsx
@@ -0,0 +1,72 @@
+import * as React from 'react';
+import Helmet from 'react-helmet';
+
+import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText, Button } from '@restapp/look-client-react';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+
+import LoginForm from './LoginForm';
+import { LoginSubmitProps } from '..';
+import { LoginProps } from '../containers/Login';
+
+import settings from '../../../../settings';
+
+interface LoginViewProps extends LoginProps {
+  onSubmit: (values: LoginSubmitProps) => void;
+  t: TranslateFunction;
+  isRegistered?: boolean;
+  hideModal: () => void;
+}
+
+const LoginView = ({ onSubmit, t, isRegistered, hideModal }: LoginViewProps) => {
+  const renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - ${t('login.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('login.meta')}`
+        }
+      ]}
+    />
+  );
+
+  const renderConfirmationModal = () => (
+    <Card>
+      <CardGroup style={{ textAlign: 'center' }}>
+        <CardTitle>{t('reg.successRegTitle')}</CardTitle>
+        <CardText>{t('reg.successRegBody')}</CardText>
+        <CardText>
+          <Button style={{ minWidth: '320px' }} color="primary" onClick={hideModal}>
+            {t('login.form.btnSubmit')}
+          </Button>
+        </CardText>
+      </CardGroup>
+    </Card>
+  );
+
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      <LayoutCenter>
+        {isRegistered ? (
+          renderConfirmationModal()
+        ) : (
+          <>
+            <h1 className="text-center">{t('login.form.title')}</h1>
+            <LoginForm onSubmit={onSubmit} />
+            <hr />
+            <Card>
+              <CardGroup>
+                <CardTitle>{t('login.cardTitle')}:</CardTitle>
+                <CardText>admin@example.com:admin123</CardText>
+                <CardText>user@example.com:user1234</CardText>
+              </CardGroup>
+            </Card>
+          </>
+        )}
+      </LayoutCenter>
+    </PageLayout>
+  );
+};
+
+export default translate('user')(LoginView);
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index cbaefcf..c39d21c 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -2,8 +2,9 @@ import * as React from 'react';
 import { RouteProps } from 'react-router';
 import { History } from 'history';
 import { connect } from 'react-redux';
+import authentication from '@restapp/authentication-client-react';
 import { User, UserRole } from '..';
-
+import { ActionType } from '../reducers';
 export interface WithUserProps extends RouteProps {
   currentUser?: User;
   currentUserLoading?: boolean;
@@ -48,10 +49,40 @@ const withLoadedUser = (Component: React.ComponentType<any>) => {
   return withUser(WithLoadedUser);
 };
 
+const IfLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({
+  currentUser,
+  role,
+  children,
+  elseComponent
+}) => (hasRole(role, currentUser) ? React.cloneElement(children, {}) : elseComponent || null);
+
+const IfLoggedIn: React.ComponentType<IfLoggedInComponent> = withLoadedUser(IfLoggedInComponent);
+
 const IfNotLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({ currentUser, children }) => {
   return !currentUser ? React.cloneElement(children, {}) : null;
 };
 
 const IfNotLoggedIn: React.ComponentType<IfLoggedInComponent> = withLoadedUser(IfNotLoggedInComponent);
 
-export { withUser, hasRole, withLoadedUser, IfNotLoggedIn };
+const withLogout: any = (Component: React.ComponentType<any>) => {
+  const WithLogout = ({ clearUser, ...props }: WithLogoutProps) => {
+    const newProps = {
+      ...props,
+      logout: () => authentication.doLogout(clearUser)
+    };
+    return <Component {...newProps} />;
+  };
+  return connect(
+    null,
+    dispatch => {
+      return {
+        clearUser: () =>
+          dispatch({
+            type: ActionType.CLEAR_CURRENT_USER
+          })
+      };
+    }
+  )(WithLogout);
+};
+
+export { withUser, hasRole, withLoadedUser, IfLoggedIn, IfNotLoggedIn, withLogout };
diff --git a/modules/user/client-react/containers/Login.native.tsx b/modules/user/client-react/containers/Login.native.tsx
new file mode 100644
index 0000000..40bc60c
--- /dev/null
+++ b/modules/user/client-react/containers/Login.native.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { FormError } from '@restapp/forms-client-react';
+import { translate } from '@restapp/i18n-client-react';
+import authentication from '@restapp/authentication-client-react';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import LoginView from '../components/LoginView.native';
+import { CommonProps, LoginSubmitProps } from '../index.native';
+import { LOGIN } from '../actions';
+
+export interface LoginProps extends CommonProps {
+  login: (values: LoginSubmitProps) => Promise<void> | any;
+}
+
+const Login = (props: LoginProps) => {
+  const { t, login } = props;
+
+  const onSubmit = async (values: LoginSubmitProps) => {
+    try {
+      await login(values);
+    } catch (e) {
+      throw new FormError(t('login.errorMsg'), e);
+    }
+
+    await authentication.doLogin();
+  };
+
+  return <LoginView {...props} onSubmit={onSubmit} />;
+};
+
+const withConnect = connect(
+  null,
+  { login: LOGIN }
+);
+
+export default compose(
+  translate('user'),
+  withConnect(Login)
+);
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
new file mode 100644
index 0000000..8391df1
--- /dev/null
+++ b/modules/user/client-react/containers/Login.tsx
@@ -0,0 +1,52 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { translate } from '@restapp/i18n-client-react';
+import authentication from '@restapp/authentication-client-react';
+import { FormError } from '@restapp/forms-client-react';
+
+import LoginView from '../components/LoginView';
+import { CommonProps, LoginSubmitProps } from '..';
+
+import { LOGIN } from '../actions';
+
+export interface LoginProps extends CommonProps {
+  login: (values: LoginSubmitProps) => any;
+}
+
+const Login: React.FunctionComponent<LoginProps> = props => {
+  const { t, history, login } = props;
+  const {
+    location: { search }
+  } = history;
+
+  const [isRegistered, setIsRegistered] = React.useState(false);
+  const [isReady, setIsReady] = React.useState(false);
+
+  React.useEffect(() => {
+    if (search.includes('email-verified')) {
+      setIsRegistered(true);
+    }
+    setIsReady(true);
+  }, []);
+
+  const hideModal = () => {
+    setIsRegistered(false);
+    history.push({ search: '' });
+  };
+
+  const onSubmit = async (values: LoginSubmitProps) => {
+    const data = await login(values);
+
+    if (data.errors) {
+      throw new FormError(t('reg.errorMsg'), data);
+    }
+    await authentication.doLogin();
+  };
+
+  return isReady && <LoginView {...props} isRegistered={isRegistered} hideModal={hideModal} onSubmit={onSubmit} />;
+};
+
+export default connect(
+  null,
+  { login: LOGIN }
+)(translate('user')(Login));
diff --git a/modules/user/client-react/containers/Logout.native.tsx b/modules/user/client-react/containers/Logout.native.tsx
new file mode 100644
index 0000000..bdc21d3
--- /dev/null
+++ b/modules/user/client-react/containers/Logout.native.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { View } from 'react-native';
+import { HeaderTitle } from '@restapp/look-client-react-native';
+import { translate } from '@restapp/i18n-client-react';
+
+import { withLogout } from './Auth';
+
+import { CommonProps } from '../index.native';
+
+interface LogoutViewProps extends CommonProps {
+  logout: () => void;
+}
+
+const LogoutView = ({ logout, t }: LogoutViewProps) => {
+  return (
+    <View
+      style={{
+        flex: 1
+      }}
+    >
+      <HeaderTitle
+        onPress={async () => {
+          await logout();
+        }}
+      >
+        {t('mobile.logout')}
+      </HeaderTitle>
+    </View>
+  );
+};
+
+export default translate('user')(withLogout(LogoutView));
diff --git a/modules/user/client-react/containers/Register.tsx b/modules/user/client-react/containers/Register.tsx
index 5fbfb85..4af4b22 100644
--- a/modules/user/client-react/containers/Register.tsx
+++ b/modules/user/client-react/containers/Register.tsx
@@ -11,7 +11,6 @@ import settings from '../../../../settings';
 
 interface RegisterProps extends CommonProps {
   register: (values: RegisterSubmitProps) => any;
-  data: any;
 }
 
 const Register: React.FunctionComponent<RegisterProps> = props => {
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index d9eb2e0..b02615b 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -7,12 +7,14 @@ import {
   NavigationParams
 } from 'react-navigation';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { HeaderTitle } from '@restapp/look-client-react-native';
+import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
 import ClientModule from '@restapp/module-client-react-native';
 import { FormikErrors } from 'formik';
 import resources from './locales';
 import DataRootComponent from './containers/DataRootComponent.native';
 import UserScreenNavigator from './containers/UserScreenNavigator.native';
+import Login from './containers/Login.native';
+import Logout from './containers/Logout.native';
 import Register from './containers/Register.native';
 
 import reducers from './reducers';
@@ -97,6 +99,19 @@ export interface Filter {
   isActive: boolean;
 }
 
+class LoginScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = ({ navigation }: NavigationOptionsProps) => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.signIn" style="subTitle" />,
+    headerLeft: (
+      <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+    ),
+    headerForceInset: {}
+  });
+
+  public render() {
+    return <Login navigation={this.props.navigation} />;
+  }
+}
 class RegisterScreen extends React.Component<NavigationOptionsProps> {
   public static navigationOptions = () => ({
     headerTitle: <HeaderTitleWithI18n i18nKey="navLink.register" style="subTitle" />,
@@ -109,6 +124,7 @@ class RegisterScreen extends React.Component<NavigationOptionsProps> {
 
 const AuthScreen = createStackNavigator(
   {
+    Login: { screen: LoginScreen },
     Register: { screen: RegisterScreen }
   },
   {
@@ -143,7 +159,18 @@ export default new ClientModule({
           showOnLogin: false
         },
         navigationOptions: {
-          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.signUp" />
+          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.signIn" />
+        }
+      },
+      Logout: {
+        screen: (): null => null,
+        userInfo: {
+          showOnLogin: true
+        },
+        navigationOptions: ({ navigation }: NavigationOptionsProps) => {
+          return {
+            drawerLabel: <Logout navigation={navigation} />
+          };
         }
       }
     }
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index 0f2f7ac..44b5d86 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as H from 'history';
 import { CookiesProvider } from 'react-cookie';
-import { NavLink } from 'react-router-dom';
+import { NavLink, withRouter } from 'react-router-dom';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { MenuItem } from '@restapp/look-client-react';
 import ClientModule from '@restapp/module-client-react';
@@ -10,10 +10,10 @@ import { FormikErrors } from 'formik';
 import resources from './locales';
 import DataRootComponent from './containers/DataRootComponent';
 import Register from './containers/Register';
-
+import Login from './containers/Login';
 import reducers from './reducers';
 
-import { AuthRoute, IfNotLoggedIn } from './containers/Auth';
+import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLogout, WithLogoutProps } from './containers/Auth';
 
 export enum UserRole {
   admin = 'admin',
@@ -88,18 +88,44 @@ export interface Filter {
   isActive: boolean;
 }
 
+const LogoutLink = withRouter(
+  withLogout(({ logout, history }: WithLogoutProps) => (
+    <a
+      href="javascript:void(0)"
+      onClick={e => {
+        e.preventDefault();
+        (async () => {
+          await logout();
+          history.push('/');
+        })();
+      }}
+      className="nav-link"
+    >
+      Logout
+    </a>
+  ))
+);
+
 export * from './containers/Auth';
 
 const NavLinkLoginWithI18n = translate('user')(({ t }: any) => (
-  <NavLink to="/register" className="nav-link" activeClassName="active">
-    {t('navLink.signUp')}
+  <NavLink to="/login" className="nav-link" activeClassName="active">
+    {t('navLink.signIn')}
   </NavLink>
 ));
 
 export default new ClientModule({
-  route: [<AuthRoute exact path="/register" component={Register} />],
+  route: [
+    <AuthRoute exact path="/register" redirectOnLoggedIn redirect="/profile" component={Register} />,
+    <AuthRoute exact path="/login" redirectOnLoggedIn redirect="/" component={Login} />
+  ],
   navItemRight: [
-    <IfNotLoggedIn key="/register">
+    <IfLoggedIn key="/logout">
+      <MenuItem>
+        <LogoutLink />
+      </MenuItem>
+    </IfLoggedIn>,
+    <IfNotLoggedIn key="/login">
       <MenuItem>
         <NavLinkLoginWithI18n />
       </MenuItem>

From 8abe1f680ea28c1b8885b0802c5fb63e98b148fa Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Wed, 8 May 2019 15:40:13 +0300
Subject: [PATCH 032/104] Add authentication to modules

---
 .gitignore                                    |  1 +
 modules/user/server-ts/index.ts               | 45 ++++++++++++++++++-
 .../user/server-ts/password/controllers.ts    |  4 +-
 packages/server/src/modules.ts                |  3 +-
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49ac726..579ab5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ jsconfig.json
 public
 *.iml
 .npmrc
+packages/server/sessions
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index dca713e..817cdaa 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -1,6 +1,11 @@
+import bcrypt from 'bcryptjs';
+import i18n from 'i18next';
+
 import ServerModule from '@restapp/module-server-ts';
-import password from './password';
 
+import password from './password';
+import UserDAO, { UserShape } from './sql';
+import settings from '../../../settings';
 import resources from './locales';
 
 export interface ValidationErrors {
@@ -9,4 +14,40 @@ export interface ValidationErrors {
   password?: string;
 }
 
-export default new ServerModule(password, { localization: [{ ns: 'user', resources }] });
+const getIdentity = (id: number) => {
+  return UserDAO.getUser(id);
+};
+
+const getHash = async (id: number) => ((await UserDAO.getUserWithPassword(id)) as UserShape).passwordHash || '';
+
+const validateLogin = async (usernameOrEmail: string, pswd: string) => {
+  const identity = (await UserDAO.getUserByUsernameOrEmail(usernameOrEmail)) as UserShape;
+
+  if (!identity) {
+    return { message: i18n.t('user:auth.password.validPasswordEmail') };
+  }
+
+  if (settings.auth.password.requireEmailConfirmation && !identity.isActive) {
+    return { message: i18n.t('user:auth.password.emailConfirmation') };
+  }
+
+  const valid = await bcrypt.compare(pswd, identity.passwordHash);
+  if (!valid) {
+    return { message: i18n.t('user:auth.password.validPassword') };
+  }
+
+  return { identity };
+};
+
+const appContext = {
+  user: {
+    getIdentity,
+    getHash,
+    validateLogin
+  }
+};
+
+export default new ServerModule(password, {
+  appContext,
+  localization: [{ ns: 'user', resources }]
+});
diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index a51b0f0..22390e5 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -17,7 +17,7 @@ const {
   app
 } = settings;
 
-export const login = (req: any, res: any) => {
+export const login = (req: any, res: any, next: any) => {
   passport.authenticate('local', { session: session.enabled }, (err, user, info) => {
     if (err || !user) {
       return res.status(400).json({
@@ -34,7 +34,7 @@ export const login = (req: any, res: any) => {
 
       return res.json({ user, tokens });
     });
-  })(req, res);
+  })(req, res, next);
 };
 
 export const register = async ({ body, t }: any, res: any) => {
diff --git a/packages/server/src/modules.ts b/packages/server/src/modules.ts
index fe5ba12..28c4d6d 100644
--- a/packages/server/src/modules.ts
+++ b/packages/server/src/modules.ts
@@ -5,10 +5,11 @@ import validation from '@restapp/validation-common-react';
 import cookies from '@restapp/cookies-server-ts';
 import mailer from '@restapp/mailer-server-ts';
 import user from '@restapp/user-server-ts';
+import authentication from '@restapp/authentication-server-ts';
 import '@restapp/debug-server-ts';
 
 import ServerModule from '@restapp/module-server-ts';
 
-const modules: ServerModule = new ServerModule(welcome, cookies, i18n, validation, mailer, core, user);
+const modules: ServerModule = new ServerModule(authentication, welcome, cookies, i18n, validation, mailer, core, user);
 
 export default modules;

From 257522370847a37f4bc7862aa95a0ceb8109e1c5 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Wed, 8 May 2019 17:17:49 +0300
Subject: [PATCH 033/104] Add controller for current user

---
 modules/user/server-ts/controllers.ts |  9 +++++++++
 modules/user/server-ts/index.ts       | 13 +++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 modules/user/server-ts/controllers.ts

diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
new file mode 100644
index 0000000..149be28
--- /dev/null
+++ b/modules/user/server-ts/controllers.ts
@@ -0,0 +1,9 @@
+import userDAO from './sql';
+
+export const currentUser = async ({ user: identity }: any, res: any) => {
+  if (identity.id) {
+    res.json(await userDAO.getUser(identity.id));
+  } else {
+    res.send(null);
+  }
+};
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index 817cdaa..2421d7f 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -1,8 +1,9 @@
 import bcrypt from 'bcryptjs';
 import i18n from 'i18next';
 
-import ServerModule from '@restapp/module-server-ts';
+import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 
+import { currentUser } from './controllers';
 import password from './password';
 import UserDAO, { UserShape } from './sql';
 import settings from '../../../settings';
@@ -49,5 +50,13 @@ const appContext = {
 
 export default new ServerModule(password, {
   appContext,
-  localization: [{ ns: 'user', resources }]
+  localization: [{ ns: 'user', resources }],
+  apiRouteParams: [
+    {
+      method: RestMethod.GET,
+      route: 'currentUser',
+      isAuthRoute: true,
+      controller: currentUser
+    }
+  ]
 });

From 45fd75f4250b37418b5d1f24c791b4bc4e2f70fd Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 8 May 2019 17:21:05 +0300
Subject: [PATCH 034/104] Fix handle response

---
 .../client-react/access/index.tsx             |  3 +-
 .../client-react/access/jwt/index.ts          |  6 ++--
 modules/core/common/createReduxStore.ts       |  4 +--
 .../user/client-react/actions/currentUser.ts  | 13 ++++++++
 modules/user/client-react/actions/index.ts    |  3 +-
 .../user/client-react/containers/AuthBase.tsx | 17 ++++++----
 .../user/client-react/containers/Login.tsx    |  2 +-
 modules/user/client-react/index.tsx           | 32 +++++++++----------
 modules/user/client-react/reducers/index.ts   |  2 +-
 9 files changed, 48 insertions(+), 34 deletions(-)
 create mode 100644 modules/user/client-react/actions/currentUser.ts

diff --git a/modules/authentication/client-react/access/index.tsx b/modules/authentication/client-react/access/index.tsx
index 5159469..e91c031 100644
--- a/modules/authentication/client-react/access/index.tsx
+++ b/modules/authentication/client-react/access/index.tsx
@@ -15,8 +15,7 @@ const rerenderApp = () => {
   ref.current.reloadPage();
 };
 
-const login = async (clearStore: () => void) => {
-  await clearStore();
+const login = async (_clearStore?: () => void) => {
   rerenderApp();
 };
 
diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index dc9edfc..11694eb 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -65,12 +65,10 @@ axios.interceptors.request.use(async config => {
 
 axios.interceptors.response.use(async (res: any) => {
   if (res.config.url.includes('login')) {
-    if (!!res.data && res.data.login.tokens) {
+    if (!!res.data && res.data.tokens) {
       const {
         data: {
-          login: {
-            tokens: { accessToken, refreshToken }
-          }
+          tokens: { accessToken, refreshToken }
         }
       } = res;
       await saveTokens({ accessToken, refreshToken });
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index dbf812b..34c1e19 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -26,10 +26,10 @@ const requestMiddleware: (
       const result = await callAPI(httpClient);
       next({
         type: SUCCESS,
-        payload: result,
+        payload: result.data,
         ...rest
       });
-      return result;
+      return result.data;
     } catch (e) {
       const {
         response: { data }
diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
new file mode 100644
index 0000000..899b17d
--- /dev/null
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -0,0 +1,13 @@
+import axios from 'axios';
+import { LoginSubmitProps } from '..';
+import { ActionType } from '../reducers';
+
+export default function CURRENT_USER(value: LoginSubmitProps) {
+  return {
+    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
+    callAPI: (client: (request: () => Promise<any>) => any) =>
+      client
+        ? client(() => axios.post(`${__API_URL__}/currentUser`, { ...value }))
+        : axios.post(`${__API_URL__}/currentUser`, { ...value })
+  };
+}
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 2ada4cf..178f258 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -1,4 +1,5 @@
 import REGISTER from './register';
 import LOGIN from './login';
+import CURRENT_USER from './currentUser';
 
-export { REGISTER, LOGIN };
+export { REGISTER, LOGIN, CURRENT_USER };
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index c39d21c..a4ba1b6 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -5,6 +5,8 @@ import { connect } from 'react-redux';
 import authentication from '@restapp/authentication-client-react';
 import { User, UserRole } from '..';
 import { ActionType } from '../reducers';
+import { CURRENT_USER } from '../actions';
+
 export interface WithUserProps extends RouteProps {
   currentUser?: User;
   currentUserLoading?: boolean;
@@ -28,13 +30,16 @@ export interface WithLogoutProps extends WithUserProps {
 }
 
 const withUser = (Component: React.ComponentType<any>) => {
-  const WithUser = ({ currentUser, ...rest }: WithUserProps) => {
+  const WithUser = ({ currentUser, getCurrentUser, ...rest }: WithUserProps) => {
     return <Component currentUser={currentUser} {...rest} />;
   };
-  return connect(({ user: { loading, currentUser } }: any) => ({
-    currentUserLoading: loading,
-    currentUser
-  }))(WithUser);
+  return connect(
+    ({ user: { loading, currentUser } }: any) => ({
+      currentUserLoading: loading,
+      currentUser
+    }),
+    { getCurrentUser: CURRENT_USER }
+  )(WithUser);
 };
 
 const hasRole = (role: UserRole | UserRole[], currentUser: User) => {
@@ -64,7 +69,7 @@ const IfNotLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({
 
 const IfNotLoggedIn: React.ComponentType<IfLoggedInComponent> = withLoadedUser(IfNotLoggedInComponent);
 
-const withLogout: any = (Component: React.ComponentType<any>) => {
+const withLogout = (Component: React.ComponentType<any>) => {
   const WithLogout = ({ clearUser, ...props }: WithLogoutProps) => {
     const newProps = {
       ...props,
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
index 8391df1..85aa2bf 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/containers/Login.tsx
@@ -37,7 +37,7 @@ const Login: React.FunctionComponent<LoginProps> = props => {
   const onSubmit = async (values: LoginSubmitProps) => {
     const data = await login(values);
 
-    if (data.errors) {
+    if (data && data.errors) {
       throw new FormError(t('reg.errorMsg'), data);
     }
     await authentication.doLogin();
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index 44b5d86..bb9976d 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -88,23 +88,21 @@ export interface Filter {
   isActive: boolean;
 }
 
-const LogoutLink = withRouter(
-  withLogout(({ logout, history }: WithLogoutProps) => (
-    <a
-      href="javascript:void(0)"
-      onClick={e => {
-        e.preventDefault();
-        (async () => {
-          await logout();
-          history.push('/');
-        })();
-      }}
-      className="nav-link"
-    >
-      Logout
-    </a>
-  ))
-);
+const LogoutLink = withRouter(withLogout(({ logout, history }: WithLogoutProps) => (
+  <a
+    href="javascript:void(0)"
+    onClick={e => {
+      e.preventDefault();
+      (async () => {
+        await logout();
+        history.push('/');
+      })();
+    }}
+    className="nav-link"
+  >
+    Logout
+  </a>
+)) as any);
 
 export * from './containers/Auth';
 
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index 87478dd..ae9007c 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -51,7 +51,7 @@ export default function(state = defaultState, action: UserModuleActionProps) {
     case ActionType.SET_CURRENT_USER:
       return {
         ...state,
-        currentUser: action.payload,
+        currentUser: action.payload.user || action.payload,
         loading: false
       };
 

From 231245b3f0ba5f2400b55b2783f281dcd9d04e34 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 9 May 2019 10:57:08 +0300
Subject: [PATCH 035/104] Add loading component and Fix login with logout

---
 .../client-react/access/jwt/index.ts          | 11 ++----
 .../client-react/access/session/index.ts      |  3 +-
 modules/core/common/createReduxStore.ts       | 13 +++----
 .../user/client-react/actions/clearUser.ts    |  7 ++++
 .../user/client-react/actions/currentUser.ts  |  7 ++--
 modules/user/client-react/actions/index.ts    |  3 +-
 modules/user/client-react/actions/register.ts |  2 +-
 .../components/Loading.native.tsx             | 19 +++++++++++
 .../user/client-react/components/Loading.tsx  | 16 +++++++++
 .../user/client-react/containers/AuthBase.tsx | 26 +++++---------
 .../containers/DataRootComponent.tsx          | 34 +++++++++++++++++--
 modules/user/client-react/reducers/index.ts   |  2 +-
 12 files changed, 96 insertions(+), 47 deletions(-)
 create mode 100644 modules/user/client-react/actions/clearUser.ts
 create mode 100644 modules/user/client-react/components/Loading.native.tsx
 create mode 100644 modules/user/client-react/components/Loading.tsx

diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index 11694eb..7f2c750 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -32,8 +32,8 @@ const client = async (request: () => Promise<any>) => {
         const { data } = await axios.post(`${__API_URL__}/refreshToken`, {
           refreshToken: await getItem('refreshToken')
         });
-        if (data && data.refreshTokens) {
-          const { accessToken, refreshToken } = data.refreshTokens;
+        if (data) {
+          const { accessToken, refreshToken } = data;
           await saveTokens({ accessToken, refreshToken });
         } else {
           await removeTokens();
@@ -51,15 +51,10 @@ const client = async (request: () => Promise<any>) => {
 axios.interceptors.request.use(async config => {
   const accessToken = await getItem(TokensEnum.accessToken);
 
-  if (config.url.includes('currentUser') && !(await getItem(TokensEnum.refreshToken))) {
-    throw new axios.Cancel('Operation canceled');
-  }
-
   const arrayExceptions = ['login', 'refreshTokens'];
   const checkInclude = arrayExceptions.some(exception => config.url.includes(exception));
 
   config.headers = !checkInclude && accessToken ? { Authorization: `Bearer ${accessToken}` } : {};
-
   return config;
 });
 
@@ -75,8 +70,8 @@ axios.interceptors.response.use(async (res: any) => {
     } else {
       await removeTokens();
     }
-    return res;
   }
+  return res;
 });
 
 export default (settings.auth.jwt.enabled
diff --git a/modules/authentication/client-react/access/session/index.ts b/modules/authentication/client-react/access/session/index.ts
index 47a5955..3688ab1 100644
--- a/modules/authentication/client-react/access/session/index.ts
+++ b/modules/authentication/client-react/access/session/index.ts
@@ -3,9 +3,8 @@ import AccessModule from '../AccessModule';
 import axios from 'axios';
 
 const logout = async () => {
-  await axios.post(`${__API_URL__}/logout`);
+  axios.post(`${__API_URL__}/logout`);
 };
-
 export default (settings.auth.session.enabled
   ? new AccessModule({
       logout: [logout]
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 34c1e19..825d0a2 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -8,9 +8,7 @@ export const getStoreReducer = (reducers: any) =>
     ...reducers
   });
 
-const requestMiddleware: (
-  httpClient?: (request: () => Promise<any>) => void
-) => Middleware = httpClient => _state => next => action => {
+const requestMiddleware: (httpClient?: any) => Middleware = httpClient => _state => next => action => {
   const { types, callAPI, ...rest } = action;
 
   if (!types) {
@@ -24,16 +22,15 @@ const requestMiddleware: (
   const handleCallApi = async () => {
     try {
       const result = await callAPI(httpClient);
+      const data = result && result.data;
       next({
         type: SUCCESS,
-        payload: result.data,
+        payload: data,
         ...rest
       });
-      return result.data;
+      return data;
     } catch (e) {
-      const {
-        response: { data }
-      } = e;
+      const data = e.response && e.response.data;
       next({
         type: FAIL,
         payload: data,
diff --git a/modules/user/client-react/actions/clearUser.ts b/modules/user/client-react/actions/clearUser.ts
new file mode 100644
index 0000000..357e0d8
--- /dev/null
+++ b/modules/user/client-react/actions/clearUser.ts
@@ -0,0 +1,7 @@
+import { ActionType } from '../reducers';
+
+export default function CLEAR_USER() {
+  return {
+    type: ActionType.CLEAR_CURRENT_USER
+  };
+}
diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
index 899b17d..87dea99 100644
--- a/modules/user/client-react/actions/currentUser.ts
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -1,13 +1,10 @@
 import axios from 'axios';
-import { LoginSubmitProps } from '..';
 import { ActionType } from '../reducers';
 
-export default function CURRENT_USER(value: LoginSubmitProps) {
+export default function CURRENT_USER() {
   return {
     types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
     callAPI: (client: (request: () => Promise<any>) => any) =>
-      client
-        ? client(() => axios.post(`${__API_URL__}/currentUser`, { ...value }))
-        : axios.post(`${__API_URL__}/currentUser`, { ...value })
+      client ? client(() => axios.get(`${__API_URL__}/currentUser`)) : axios.get(`${__API_URL__}/currentUser`)
   };
 }
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 178f258..6e9ce09 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -1,5 +1,6 @@
 import REGISTER from './register';
 import LOGIN from './login';
 import CURRENT_USER from './currentUser';
+import CLEAR_USER from './clearUser';
 
-export { REGISTER, LOGIN, CURRENT_USER };
+export { REGISTER, LOGIN, CURRENT_USER, CLEAR_USER };
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index b1edb34..ed7bd8b 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -5,7 +5,7 @@ import { ActionType } from '../reducers';
 export default function REGISTER(value: RegisterSubmitProps) {
   return {
     types: [null, ActionType.REGISTER, null],
-    callAPI: (client: (request: () => Promise<any>) => void) =>
+    callAPI: (client: (request: () => Promise<any>) => any) =>
       client
         ? client(() => axios.post(`${__API_URL__}/register`, { ...value }))
         : axios.post(`${__API_URL__}/register`, { ...value })
diff --git a/modules/user/client-react/components/Loading.native.tsx b/modules/user/client-react/components/Loading.native.tsx
new file mode 100644
index 0000000..0ba6c84
--- /dev/null
+++ b/modules/user/client-react/components/Loading.native.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+
+import { View, Text } from 'react-native';
+import { translate } from '@restapp/i18n-client-react';
+import { LayoutCenter } from '@restapp/look-client-react-native';
+
+import { CommonProps } from '../index.native';
+
+interface LoadingProps extends CommonProps {}
+
+const Loading = ({ t }: LoadingProps) => (
+  <LayoutCenter>
+    <View>
+      <Text>{t('loading')}</Text>
+    </View>
+  </LayoutCenter>
+);
+
+export default translate('user')(Loading);
diff --git a/modules/user/client-react/components/Loading.tsx b/modules/user/client-react/components/Loading.tsx
new file mode 100644
index 0000000..810acb1
--- /dev/null
+++ b/modules/user/client-react/components/Loading.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import { translate } from '@restapp/i18n-client-react';
+import { LayoutCenter } from '@restapp/look-client-react';
+
+import { CommonProps } from '..';
+
+interface LoadingProps extends CommonProps {}
+
+const Loading = ({ t }: LoadingProps) => (
+  <LayoutCenter>
+    <div className="text-center">{t('loading')}</div>
+  </LayoutCenter>
+);
+
+export default translate('user')(Loading);
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index a4ba1b6..7cf99d9 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -4,8 +4,7 @@ import { History } from 'history';
 import { connect } from 'react-redux';
 import authentication from '@restapp/authentication-client-react';
 import { User, UserRole } from '..';
-import { ActionType } from '../reducers';
-import { CURRENT_USER } from '../actions';
+import CLEAR_USER from '../actions/clearUser';
 
 export interface WithUserProps extends RouteProps {
   currentUser?: User;
@@ -30,16 +29,13 @@ export interface WithLogoutProps extends WithUserProps {
 }
 
 const withUser = (Component: React.ComponentType<any>) => {
-  const WithUser = ({ currentUser, getCurrentUser, ...rest }: WithUserProps) => {
+  const WithUser = ({ currentUser, ...rest }: WithUserProps) => {
     return <Component currentUser={currentUser} {...rest} />;
   };
-  return connect(
-    ({ user: { loading, currentUser } }: any) => ({
-      currentUserLoading: loading,
-      currentUser
-    }),
-    { getCurrentUser: CURRENT_USER }
-  )(WithUser);
+  return connect(({ user: { loading, currentUser } }: any) => ({
+    currentUserLoading: loading,
+    currentUser
+  }))(WithUser);
 };
 
 const hasRole = (role: UserRole | UserRole[], currentUser: User) => {
@@ -77,16 +73,10 @@ const withLogout = (Component: React.ComponentType<any>) => {
     };
     return <Component {...newProps} />;
   };
+
   return connect(
     null,
-    dispatch => {
-      return {
-        clearUser: () =>
-          dispatch({
-            type: ActionType.CLEAR_CURRENT_USER
-          })
-      };
-    }
+    { clearUser: CLEAR_USER }
   )(WithLogout);
 };
 
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index 4dc0f40..62eac81 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -1,11 +1,39 @@
 import * as React from 'react';
+import { connect } from 'react-redux';
+import { getItem } from '@restapp/core-common/clientStorage';
+
+import Loading from '../components/Loading';
+import { UserModuleState } from '../reducers';
+import { CURRENT_USER } from '../actions';
+import { User } from '..';
 
 interface DataRootComponent {
+  currentUser: User;
+  getCurrentUser: () => void;
   children?: Element | any;
 }
 
-const DataRootComponent: React.FunctionComponent<DataRootComponent> = props => {
-  return props.children;
+const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({ currentUser, children, getCurrentUser }) => {
+  const [ready, setReady] = React.useState(false);
+
+  React.useEffect(() => {
+    (async () => {
+      if (!ready && (await getItem('refreshToken')) && !currentUser) {
+        await getCurrentUser();
+      }
+      setReady(true);
+    })();
+  }, []);
+  return ready ? children : <Loading />;
 };
 
-export default DataRootComponent;
+const mapState = ({ currentUser }: UserModuleState) => ({
+  currentUser
+});
+
+const withConnect = connect(
+  mapState,
+  { getCurrentUser: CURRENT_USER }
+);
+
+export default withConnect(DataRootComponent);
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index ae9007c..41b844e 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -51,7 +51,7 @@ export default function(state = defaultState, action: UserModuleActionProps) {
     case ActionType.SET_CURRENT_USER:
       return {
         ...state,
-        currentUser: action.payload.user || action.payload,
+        currentUser: (action.payload && action.payload.user) || action.payload,
         loading: false
       };
 

From e6d1d91b779af90ce229ba5a9e4285c491f98008 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 9 May 2019 16:46:25 +0300
Subject: [PATCH 036/104] Create react-native redux middleware

---
 modules/core/client-react-native/App.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/core/client-react-native/App.tsx b/modules/core/client-react-native/App.tsx
index 9d11b10..397f323 100644
--- a/modules/core/client-react-native/App.tsx
+++ b/modules/core/client-react-native/App.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
-import { createStore, combineReducers } from 'redux';
 import { Provider } from 'react-redux';
 import url from 'url';
 
 import ClientModule from '@restapp/module-client-react-native';
 import log from '../../../packages/common/log';
+import createReduxStore from '../../../packages/common/createReduxStore';
 
 const { protocol, pathname, port } = url.parse(__API_URL__);
 
@@ -24,13 +24,15 @@ export default class Main extends React.Component<MainProps> {
         ? `${protocol}//${url.parse(this.props.exp.manifest.bundleUrl).hostname}:${port}${pathname}`
         : __API_URL__;
 
-    const store = createStore(
+    const store = createReduxStore(
       Object.keys(modules.reducers).length > 0
-        ? combineReducers({
+        ? {
             ...modules.reducers
-          })
+          }
         : state => state,
-      {} // initial state
+      {}, // initial state
+      null,
+      modules.httpClients
     );
 
     log.info(`Connecting to REST backend at: ${apiUrl}`);

From b66bfe2039527b121cdc07ceb706b6af00f21371 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 9 May 2019 16:46:58 +0300
Subject: [PATCH 037/104] Add react-native login

---
 .../components/LoginForm.native.tsx           |  2 +-
 .../containers/DataRootComponent.native.tsx   | 39 +++++++++++++++++--
 .../client-react/containers/Login.native.tsx  | 26 ++++++-------
 .../containers/Register.native.tsx            | 10 ++---
 .../containers/UserScreenNavigator.native.tsx | 12 +++---
 modules/user/client-react/reducers/index.ts   |  3 +-
 6 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/modules/user/client-react/components/LoginForm.native.tsx b/modules/user/client-react/components/LoginForm.native.tsx
index 4675a20..f27886f 100644
--- a/modules/user/client-react/components/LoginForm.native.tsx
+++ b/modules/user/client-react/components/LoginForm.native.tsx
@@ -143,7 +143,7 @@ const LoginFormWithFormik = withFormik<LoginForm & NavigationOptionsProps, Login
 
   handleSubmit(values, { setErrors, props: { onSubmit } }) {
     onSubmit(values).catch((e: any) => {
-      if (e) {
+      if (e && e.errors) {
         setErrors(e.errors);
       } else {
         throw e;
diff --git a/modules/user/client-react/containers/DataRootComponent.native.tsx b/modules/user/client-react/containers/DataRootComponent.native.tsx
index 9684a75..160963c 100644
--- a/modules/user/client-react/containers/DataRootComponent.native.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.native.tsx
@@ -1,9 +1,42 @@
 import * as React from 'react';
+import { connect } from 'react-redux';
+import { getItem } from '@restapp/core-common/clientStorage';
+
+import Loading from '../components/Loading.native';
+import { UserModuleState } from '../reducers';
+import { CURRENT_USER } from '../actions';
+import { User } from '..';
+
+interface DataRootComponent {
+  currentUser: User;
+  getCurrentUser: () => void;
+}
+
+class DataRootComponent extends React.Component<DataRootComponent> {
+  public state = {
+    ready: false
+  };
+
+  public async componentDidMount() {
+    const { currentUser, getCurrentUser } = this.props;
+    if (!this.state.ready && (await getItem('refreshToken')) && !currentUser) {
+      await getCurrentUser();
+    }
+    this.setState({ ready: true });
+  }
 
-class DataRootComponent extends React.Component {
   public render() {
-    return this.props.children;
+    return this.state.ready ? this.props.children : <Loading />;
   }
 }
 
-export default DataRootComponent;
+const mapState = ({ currentUser }: UserModuleState) => ({
+  currentUser
+});
+
+const withConnect = connect(
+  mapState,
+  { getCurrentUser: CURRENT_USER }
+);
+
+export default withConnect(DataRootComponent);
diff --git a/modules/user/client-react/containers/Login.native.tsx b/modules/user/client-react/containers/Login.native.tsx
index 40bc60c..b4d0d44 100644
--- a/modules/user/client-react/containers/Login.native.tsx
+++ b/modules/user/client-react/containers/Login.native.tsx
@@ -3,7 +3,6 @@ import { FormError } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
 import authentication from '@restapp/authentication-client-react';
 import { connect } from 'react-redux';
-import { compose } from 'redux';
 import LoginView from '../components/LoginView.native';
 import { CommonProps, LoginSubmitProps } from '../index.native';
 import { LOGIN } from '../actions';
@@ -12,28 +11,25 @@ export interface LoginProps extends CommonProps {
   login: (values: LoginSubmitProps) => Promise<void> | any;
 }
 
-const Login = (props: LoginProps) => {
-  const { t, login } = props;
+class Login extends React.Component<LoginProps> {
+  public onSubmit = async (values: LoginSubmitProps) => {
+    const { t, login } = this.props;
+    const data = await login(values);
 
-  const onSubmit = async (values: LoginSubmitProps) => {
-    try {
-      await login(values);
-    } catch (e) {
-      throw new FormError(t('login.errorMsg'), e);
+    if (data && data.errors) {
+      throw new FormError(t('reg.errorMsg'), data);
     }
 
     await authentication.doLogin();
   };
-
-  return <LoginView {...props} onSubmit={onSubmit} />;
-};
+  public render() {
+    return <LoginView {...this.props} onSubmit={this.onSubmit} />;
+  }
+}
 
 const withConnect = connect(
   null,
   { login: LOGIN }
 );
 
-export default compose(
-  translate('user'),
-  withConnect(Login)
-);
+export default translate('user')(withConnect(Login));
diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/containers/Register.native.tsx
index 136d277..3f99a63 100644
--- a/modules/user/client-react/containers/Register.native.tsx
+++ b/modules/user/client-react/containers/Register.native.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { compose } from 'redux';
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 import RegisterView from '../components/RegisterView.native';
@@ -27,8 +26,8 @@ class Register extends React.Component<RegisterProps, RegisterState> {
 
     const data = await register(values);
 
-    if (data.error) {
-      throw new FormError(t('reg.errorMsg'), data.error);
+    if (data.errors) {
+      throw new FormError(t('reg.errorMsg'), data);
     }
 
     if (!settings.auth.password.requireEmailConfirmation) {
@@ -59,7 +58,4 @@ const withConnect = connect(
   { register: REGISTER }
 );
 
-export default compose(
-  translate('user'),
-  withConnect(Register)
-);
+export default translate('user')(withConnect(Register));
diff --git a/modules/user/client-react/containers/UserScreenNavigator.native.tsx b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
index a15bb09..924ef4d 100644
--- a/modules/user/client-react/containers/UserScreenNavigator.native.tsx
+++ b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
@@ -5,7 +5,7 @@ import { compose } from 'redux';
 import { DrawerComponent } from '@restapp/look-client-react-native';
 
 import { UserRole } from '../index.native';
-import { withUser } from './Auth';
+import { withUser } from './Auth.native';
 
 interface User {
   id: number | string;
@@ -54,7 +54,7 @@ class UserScreenNavigator extends React.Component<UserScreenNavigator> {
   };
   public getInitialRoute = () => {
     const { currentUser } = this.props;
-    return currentUser ? 'Profile' : 'Login';
+    return currentUser ? 'Welcome' : 'Login';
   };
 
   public render() {
@@ -76,13 +76,15 @@ class UserScreenNavigator extends React.Component<UserScreenNavigator> {
 const drawerNavigator: any = (routeConfigs: any) => {
   const withRoutes = (Component: React.ComponentType<any>) => {
     const ownProps = { routeConfigs };
-    const WithRoutesComponent = ({ ...props }) => <Component {...props} {...ownProps} />;
+    const WithRoutesComponent = ({ ...props }) => {
+      return <Component {...props} {...ownProps} />;
+    };
     return WithRoutesComponent;
   };
 
   return compose(
-    withUser,
-    withRoutes
+    withRoutes,
+    withUser
   )(UserScreenNavigator);
 };
 
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index 41b844e..a372354 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -49,9 +49,10 @@ export default function(state = defaultState, action: UserModuleActionProps) {
       };
 
     case ActionType.SET_CURRENT_USER:
+      const currentUser = action.payload.errors ? null : (action.payload.user && action.payload) || action.payload;
       return {
         ...state,
-        currentUser: (action.payload && action.payload.user) || action.payload,
+        currentUser,
         loading: false
       };
 

From 97342843a9d3384e7af44c23f9dd9f84abc5117a Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Fri, 10 May 2019 11:00:35 +0300
Subject: [PATCH 038/104] Update errors response in login

---
 modules/user/server-ts/password/controllers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 22390e5..584360f 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -21,8 +21,9 @@ export const login = (req: any, res: any, next: any) => {
   passport.authenticate('local', { session: session.enabled }, (err, user, info) => {
     if (err || !user) {
       return res.status(400).json({
-        message: info ? info.message : 'Login failed',
-        user
+        errors: {
+          message: info ? info.message : 'Login failed'
+        }
       });
     }
 

From 6de1a0e0105b21dab38bad9916e106e624ee5ca2 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Fri, 10 May 2019 11:02:40 +0300
Subject: [PATCH 039/104] Add response for session logout

---
 modules/authentication/server-ts/access/session/controllers.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/authentication/server-ts/access/session/controllers.ts b/modules/authentication/server-ts/access/session/controllers.ts
index 43205f6..1402e1a 100644
--- a/modules/authentication/server-ts/access/session/controllers.ts
+++ b/modules/authentication/server-ts/access/session/controllers.ts
@@ -2,4 +2,5 @@ import { Request, Response } from 'express';
 
 export const logout = (req: Request, res: Response) => {
   req.logout();
+  res.status(200).send();
 };

From 92a089e9924af38dcb8daaccc2c77b28e0b1c290 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 10 May 2019 11:44:57 +0300
Subject: [PATCH 040/104] Fix throw

---
 .../authentication/client-react/access/jwt/index.ts |  2 +-
 modules/user/client-react/actions/register.ts       |  3 +--
 modules/user/client-react/containers/Login.tsx      |  1 +
 modules/user/client-react/reducers/index.ts         | 13 ++-----------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index 7f2c750..38b4687 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -44,7 +44,7 @@ const client = async (request: () => Promise<any>) => {
       }
       await request();
     }
-    return e.response;
+    throw e;
   }
 };
 
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index ed7bd8b..f36043c 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -1,10 +1,9 @@
 import axios from 'axios';
 import { RegisterSubmitProps } from '..';
-import { ActionType } from '../reducers';
 
 export default function REGISTER(value: RegisterSubmitProps) {
   return {
-    types: [null, ActionType.REGISTER, null],
+    types: [null, null, null] as any,
     callAPI: (client: (request: () => Promise<any>) => any) =>
       client
         ? client(() => axios.post(`${__API_URL__}/register`, { ...value }))
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
index 85aa2bf..fb45fa9 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/containers/Login.tsx
@@ -40,6 +40,7 @@ const Login: React.FunctionComponent<LoginProps> = props => {
     if (data && data.errors) {
       throw new FormError(t('reg.errorMsg'), data);
     }
+
     await authentication.doLogin();
   };
 
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index a372354..b3e5791 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -3,14 +3,12 @@ import { User } from '..';
 export enum ActionType {
   SET_CURRENT_USER = 'SET_CURRENT_USER',
   CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
-  SET_LOADING = 'SET_LOADING',
-  REGISTER = 'REGISTER'
+  SET_LOADING = 'SET_LOADING'
 }
 
 export interface UserModuleState {
   currentUser: User;
   loading: boolean;
-  register: any;
 }
 
 export interface UserModuleActionProps {
@@ -22,18 +20,11 @@ export interface UserModuleActionProps {
 
 const defaultState: UserModuleState = {
   currentUser: null,
-  loading: false,
-  register: null
+  loading: false
 };
 
 export default function(state = defaultState, action: UserModuleActionProps) {
   switch (action.type) {
-    case ActionType.REGISTER:
-      return {
-        ...state,
-        register: action.payload
-      };
-
     case ActionType.SET_LOADING:
       return {
         ...state,

From 7f6d88659289ae570998c740a831c8931f966c6d Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Fri, 10 May 2019 12:25:45 +0300
Subject: [PATCH 041/104] Add controllers for profile

---
 modules/user/server-ts/controllers.ts | 206 +++++++++++++++++++++++++-
 modules/user/server-ts/index.ts       |  32 +++-
 2 files changed, 236 insertions(+), 2 deletions(-)

diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index 149be28..ead8be7 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -1,4 +1,36 @@
-import userDAO from './sql';
+import { pick, isEmpty } from 'lodash';
+
+import { createTransaction } from '@restapp/database-server-ts';
+import { log } from '@restapp/core-common';
+import { mailer } from '@restapp/mailer-server-ts';
+
+import userDAO, { UserShape } from './sql';
+import settings from '../../../settings';
+import { ValidationErrors } from '.';
+import { createPasswordHash } from './password';
+import emailTemplate from './emailTemplate';
+
+const {
+  auth: { jwt, password, secret },
+  app
+} = settings;
+
+export const user = async ({ body: { id }, user: identity, t }: any, res: any) => {
+  if (+identity.id === +id || identity.role === 'admin') {
+    try {
+      res.json({ user: await userDAO.getUser(id) });
+    } catch (e) {
+      res.status(500).json({ errors: e });
+    }
+  } else {
+    res.status(401).send(t('user:accessDenied'));
+  }
+};
+export const users = async ({ body: { orderBy, filter }, user: identity, t }: any, res: any) => {
+  identity.role === 'admin'
+    ? res.json(await userDAO.getUsers(orderBy, filter))
+    : res.status(401).send(t('user:accessDenied'));
+};
 
 export const currentUser = async ({ user: identity }: any, res: any) => {
   if (identity.id) {
@@ -7,3 +39,175 @@ export const currentUser = async ({ user: identity }: any, res: any) => {
     res.send(null);
   }
 };
+
+export const addUser = async ({ body, user: identity, t }: any, res: any) => {
+  if (identity.role !== 'admin') {
+    return res.status(401).send(t('user:accessDenied'));
+  }
+  const errors: ValidationErrors = {};
+
+  const userExists = await userDAO.getUserByUsername(body.username);
+  if (userExists) {
+    errors.username = t('user:usernameIsExisted');
+  }
+
+  const emailExists = await userDAO.getUserByEmail(body.email);
+  if (emailExists) {
+    errors.email = t('user:emailIsExisted');
+  }
+
+  if (body.password.length < password.minLength) {
+    errors.password = t('user:passwordLength');
+  }
+
+  if (!isEmpty(errors)) {
+    return res.status(422).json({
+      errors: {
+        message: t('user:auth.password.registrationFailed'),
+        ...errors
+      }
+    });
+  }
+
+  const passwordHash: string = await createPasswordHash(body.password);
+
+  const trx = await createTransaction();
+  let createdUserId;
+  try {
+    const isActive = password.requireEmailConfirmation ? body.isActive || false : !password.requireEmailConfirmation;
+
+    [createdUserId] = await userDAO.register({ ...body, isActive }, passwordHash).transacting(trx);
+    await userDAO.editUserProfile({ id: createdUserId, ...body }).transacting(trx);
+    trx.commit();
+  } catch (e) {
+    res.status(500).json({
+      errors: {
+        message: e
+      }
+    });
+    trx.rollback();
+  }
+
+  try {
+    const createdUser = (await userDAO.getUser(createdUserId)) as UserShape;
+    res.json(user);
+
+    if (mailer && password.requireEmailConfirmation && !emailExists) {
+      // async email
+      jwt.sign({ identity: pick(createdUser, 'id') }, secret, { expiresIn: '1d' }, (err: any, emailToken: string) => {
+        const encodedToken = Buffer.from(emailToken).toString('base64');
+        const url = `${__WEBSITE_URL__}/confirmation/${encodedToken}`;
+        mailer.sendMail({
+          from: `${app.name} <${process.env.EMAIL_USER}>`,
+          to: createdUser.email,
+          subject: 'Your account has been created',
+          html: emailTemplate.accountCreated(url, createdUser)
+        });
+        log.info(`Sent registration confirmation email to: ${createdUser.email}`);
+      });
+    }
+  } catch (e) {
+    res.status(500).json({
+      errors: {
+        message: e
+      }
+    });
+  }
+};
+
+export const editUser = async ({ user: identity, body, t }: any, res: any) => {
+  const isAdmin = () => identity.role === 'admin';
+  const isSelf = () => +identity.id === +body.id;
+
+  if (!isSelf() && !isAdmin()) {
+    return res.status(401).send(t('user:accessDenied'));
+  }
+
+  const errors: ValidationErrors = {};
+
+  const userExists = (await userDAO.getUserByUsername(body.username)) as UserShape;
+  if (userExists && userExists.id !== body.id) {
+    errors.username = t('user:usernameIsExisted');
+  }
+
+  const emailExists = (await userDAO.getUserByEmail(body.email)) as UserShape;
+  if (emailExists && emailExists.id !== body.id) {
+    errors.email = t('user:emailIsExisted');
+  }
+
+  if (body.password && body.password.length < password.minLength) {
+    errors.password = t('user:passwordLength');
+  }
+
+  if (!isEmpty(errors)) {
+    return res.status(422).json({
+      errors: {
+        message: t('user:auth.password.registrationFailed'),
+        ...errors
+      }
+    });
+  }
+
+  const userInfo = !isSelf() && isAdmin() ? body : pick(body, ['id', 'username', 'email', 'password']);
+
+  const isProfileExists = await userDAO.isUserProfileExists(body.id);
+  const passwordHash = await createPasswordHash(body.password);
+
+  const trx = await createTransaction();
+  try {
+    await userDAO.editUser(userInfo, passwordHash).transacting(trx);
+    await userDAO.editUserProfile(body, isProfileExists).transacting(trx);
+
+    if (mailer && body.password && password.sendPasswordChangesEmail) {
+      const url = `${__WEBSITE_URL__}/profile`;
+
+      mailer.sendMail({
+        from: `${settings.app.name} <${process.env.EMAIL_USER}>`,
+        to: body.email,
+        subject: 'Your Password Has Been Updated',
+        html: emailTemplate.passwordUpdated(url)
+      });
+      log.info(`Sent password has been updated to: ${body.email}`);
+    }
+    trx.commit();
+  } catch (e) {
+    res.status(500).json({
+      errors: {
+        message: e
+      }
+    });
+    trx.rollback();
+  }
+
+  try {
+    res.json(await userDAO.getUser(body.id));
+  } catch (e) {
+    res.status(500).json({
+      errors: {
+        message: e
+      }
+    });
+  }
+};
+
+export const deleteUser = async ({ user: identity, body: { id }, t }: any, res: any) => {
+  const isAdmin = () => identity.role === 'admin';
+  const isSelf = () => +identity.id === +id;
+
+  const userData = await userDAO.getUser(id);
+  if (!userData) {
+    res.send(t('user:userIsNotExisted'));
+  }
+
+  if (isSelf()) {
+    res.send(t('user:userCannotDeleteYourself'));
+  }
+
+  const isDeleted = !isSelf() && isAdmin() ? await userDAO.deleteUser(id) : false;
+
+  if (isDeleted) {
+    res.json(userData);
+  } else {
+    res.send(t('user:userCouldNotDeleted'));
+  }
+};
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index 2421d7f..aa5cf49 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -3,7 +3,7 @@ import i18n from 'i18next';
 
 import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 
-import { currentUser } from './controllers';
+import { user, users, currentUser, addUser, editUser, deleteUser } from './controllers';
 import password from './password';
 import UserDAO, { UserShape } from './sql';
 import settings from '../../../settings';
@@ -52,11 +52,41 @@ export default new ServerModule(password, {
   appContext,
   localization: [{ ns: 'user', resources }],
   apiRouteParams: [
+    {
+      method: RestMethod.GET,
+      route: 'user',
+      isAuthRoute: true,
+      controller: user
+    },
+    {
+      method: RestMethod.GET,
+      route: 'users',
+      isAuthRoute: true,
+      controller: users
+    },
     {
       method: RestMethod.GET,
       route: 'currentUser',
       isAuthRoute: true,
       controller: currentUser
+    },
+    {
+      method: RestMethod.POST,
+      route: 'addUser',
+      isAuthRoute: true,
+      controller: addUser
+    },
+    {
+      method: RestMethod.POST,
+      route: 'editUser',
+      isAuthRoute: true,
+      controller: editUser
+    },
+    {
+      method: RestMethod.DELETE,
+      route: 'deleteUser',
+      isAuthRoute: true,
+      controller: deleteUser
     }
   ]
 });

From 8d867e105371e1b83760a7c05bcc040bd882c300 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 10 May 2019 17:52:25 +0300
Subject: [PATCH 042/104] Move redux middleware in authentication jwt module
 and add requests for profile data

---
 .../client-react/access/jwt/index.ts          | 43 ++++++++++++++++-
 modules/core/client-react-native/App.tsx      |  2 +-
 modules/core/client-react/Main.tsx            |  2 +-
 modules/core/common/createReduxStore.ts       | 47 +++----------------
 modules/module/client-react/ClientModule.ts   |  7 +--
 modules/user/client-react/actions/addUser.ts  | 10 ++++
 .../user/client-react/actions/currentUser.ts  |  3 +-
 .../user/client-react/actions/deleteUser.ts   |  9 ++++
 modules/user/client-react/actions/editUser.ts |  9 ++++
 modules/user/client-react/actions/index.ts    |  7 ++-
 modules/user/client-react/actions/login.ts    |  5 +-
 modules/user/client-react/actions/register.ts |  5 +-
 modules/user/client-react/actions/user.ts     |  9 ++++
 modules/user/client-react/actions/users.ts    | 11 +++++
 .../client-react/helpers/UserFormatter.ts     | 24 ++++++++++
 modules/user/client-react/helpers/index.ts    | 13 +++++
 modules/user/client-react/reducers/index.ts   | 41 ++++++++++++++--
 packages/client/typings/typings.d.ts          |  1 +
 18 files changed, 187 insertions(+), 61 deletions(-)
 create mode 100644 modules/user/client-react/actions/addUser.ts
 create mode 100644 modules/user/client-react/actions/deleteUser.ts
 create mode 100644 modules/user/client-react/actions/editUser.ts
 create mode 100644 modules/user/client-react/actions/user.ts
 create mode 100644 modules/user/client-react/actions/users.ts
 create mode 100644 modules/user/client-react/helpers/UserFormatter.ts
 create mode 100644 modules/user/client-react/helpers/index.ts

diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index 38b4687..7cea00f 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { getItem, setItem, removeItem } from '@restapp/core-common/clientStorage';
+import { Middleware } from 'redux';
 import settings from '../../../../../settings';
 import AccessModule from '../AccessModule';
 
@@ -22,6 +23,44 @@ const removeTokens = async () => {
   await removeItem(TokensEnum.refreshToken);
 };
 
+const requestMiddleware: Middleware = ({ dispatch }) => next => action => {
+  const { types, callAPI, payload, ...rest } = action;
+
+  if (!types) {
+    return next(action);
+  }
+
+  const [REQUEST, SUCCESS, FAIL] = types;
+
+  next({ type: REQUEST, payload, ...rest });
+
+  const handleCallApi = async () => {
+    try {
+      const result = await client(callAPI);
+      const data = result && result.data;
+      next({
+        type: SUCCESS,
+        payload: data,
+        ...rest
+      });
+      return data;
+    } catch (e) {
+      if (e.response.status === 401) {
+        dispatch(action);
+      }
+      const data = e.response && e.response.data;
+      next({
+        type: FAIL,
+        payload: data,
+        ...rest
+      });
+      return data;
+    }
+  };
+
+  return handleCallApi();
+};
+
 const client = async (request: () => Promise<any>) => {
   try {
     const result = await request();
@@ -42,7 +81,6 @@ const client = async (request: () => Promise<any>) => {
         await removeTokens();
         throw e;
       }
-      await request();
     }
     throw e;
   }
@@ -67,6 +105,7 @@ axios.interceptors.response.use(async (res: any) => {
         }
       } = res;
       await saveTokens({ accessToken, refreshToken });
+      return res.data.user;
     } else {
       await removeTokens();
     }
@@ -77,6 +116,6 @@ axios.interceptors.response.use(async (res: any) => {
 export default (settings.auth.jwt.enabled
   ? new AccessModule({
       logout: [removeTokens],
-      httpClient: client
+      requestMiddleware
     })
   : undefined);
diff --git a/modules/core/client-react-native/App.tsx b/modules/core/client-react-native/App.tsx
index 397f323..31b35aa 100644
--- a/modules/core/client-react-native/App.tsx
+++ b/modules/core/client-react-native/App.tsx
@@ -32,7 +32,7 @@ export default class Main extends React.Component<MainProps> {
         : state => state,
       {}, // initial state
       null,
-      modules.httpClients
+      modules.requestMiddlewares
     );
 
     log.info(`Connecting to REST backend at: ${apiUrl}`);
diff --git a/modules/core/client-react/Main.tsx b/modules/core/client-react/Main.tsx
index 1a5aca9..9221881 100644
--- a/modules/core/client-react/Main.tsx
+++ b/modules/core/client-react/Main.tsx
@@ -25,7 +25,7 @@ export const onAppCreate = (modules: ClientModule, entryModule: NodeModule) => {
     ref.store = entryModule.hot.data.store;
     ref.store.replaceReducer(getStoreReducer(ref.modules.reducers));
   } else {
-    ref.store = createReduxStore(ref.modules.reducers, {}, routerMiddleware(history), ref.modules.httpClients);
+    ref.store = createReduxStore(ref.modules.reducers, {}, routerMiddleware(history), ref.modules.requestMiddlewares);
   }
 };
 
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 825d0a2..c985026 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -8,54 +8,21 @@ export const getStoreReducer = (reducers: any) =>
     ...reducers
   });
 
-const requestMiddleware: (httpClient?: any) => Middleware = httpClient => _state => next => action => {
-  const { types, callAPI, ...rest } = action;
-
-  if (!types) {
-    return next(action);
-  }
-
-  const [REQUEST, SUCCESS, FAIL] = types;
-
-  next({ type: REQUEST, ...rest });
-
-  const handleCallApi = async () => {
-    try {
-      const result = await callAPI(httpClient);
-      const data = result && result.data;
-      next({
-        type: SUCCESS,
-        payload: data,
-        ...rest
-      });
-      return data;
-    } catch (e) {
-      const data = e.response && e.response.data;
-      next({
-        type: FAIL,
-        payload: data,
-        ...rest
-      });
-      return data;
-    }
-  };
-
-  return handleCallApi();
-};
-
 const createReduxStore = (
   reducers: Reducer,
   initialState: DeepPartial<any>,
   routerMiddleware?: Middleware,
-  httpClient?: (request: () => Promise<any>) => void
+  requestMiddleware?: Middleware
 ): Store => {
-  const middleware = routerMiddleware
-    ? [routerMiddleware, requestMiddleware(httpClient)]
-    : [requestMiddleware(httpClient)];
+  const middleware: () => Middleware[] = () => {
+    const routerMiddlewares = routerMiddleware ? [routerMiddleware] : [];
+    const requestMiddlewares = requestMiddleware ? [requestMiddleware] : [];
+    return [...routerMiddlewares, ...requestMiddlewares];
+  };
   return createStore(
     getStoreReducer(reducers),
     initialState, // initial state,
-    composeWithDevTools(applyMiddleware(...middleware))
+    composeWithDevTools(applyMiddleware(...middleware()))
   );
 };
 
diff --git a/modules/module/client-react/ClientModule.ts b/modules/module/client-react/ClientModule.ts
index 236a297..f42940b 100644
--- a/modules/module/client-react/ClientModule.ts
+++ b/modules/module/client-react/ClientModule.ts
@@ -1,5 +1,6 @@
 import React from 'react';
 import BaseModule, { BaseModuleShape } from './BaseModule';
+import { Middleware } from 'redux';
 
 /**
  * React client feature modules interface.
@@ -16,7 +17,7 @@ export interface ClientModuleShape extends BaseModuleShape {
   // URL list to 3rd party js scripts
   scriptsInsert?: string[];
   // Http client is provided by modules
-  httpClient?: (request: () => Promise<any>) => void;
+  requestMiddleware?: Middleware;
 }
 
 interface ClientModule extends ClientModuleShape {}
@@ -88,8 +89,8 @@ class ClientModule extends BaseModule {
   /**
    * @returns Http client is provided by modules
    */
-  get httpClients() {
-    return this.httpClient;
+  get requestMiddlewares() {
+    return this.requestMiddleware;
   }
 }
 
diff --git a/modules/user/client-react/actions/addUser.ts b/modules/user/client-react/actions/addUser.ts
new file mode 100644
index 0000000..a1e3082
--- /dev/null
+++ b/modules/user/client-react/actions/addUser.ts
@@ -0,0 +1,10 @@
+import axios from 'axios';
+import { ActionType } from '../reducers';
+import { User } from '..';
+
+export default function ADD_USER(user: User) {
+  return {
+    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
+    callAPI: () => axios.post(`${__API_URL__}/addUser`, { ...user })
+  };
+}
diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
index 87dea99..dab1a55 100644
--- a/modules/user/client-react/actions/currentUser.ts
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -4,7 +4,6 @@ import { ActionType } from '../reducers';
 export default function CURRENT_USER() {
   return {
     types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
-    callAPI: (client: (request: () => Promise<any>) => any) =>
-      client ? client(() => axios.get(`${__API_URL__}/currentUser`)) : axios.get(`${__API_URL__}/currentUser`)
+    callAPI: () => axios.get(`${__API_URL__}/currentUser`)
   };
 }
diff --git a/modules/user/client-react/actions/deleteUser.ts b/modules/user/client-react/actions/deleteUser.ts
new file mode 100644
index 0000000..0c6a2a1
--- /dev/null
+++ b/modules/user/client-react/actions/deleteUser.ts
@@ -0,0 +1,9 @@
+import axios from 'axios';
+import { ActionType } from '../reducers';
+
+export default function DELETE_USER(id: number) {
+  return {
+    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
+    callAPI: () => axios.delete(`${__API_URL__}/deleteUser`, { data: id })
+  };
+}
diff --git a/modules/user/client-react/actions/editUser.ts b/modules/user/client-react/actions/editUser.ts
new file mode 100644
index 0000000..17300ff
--- /dev/null
+++ b/modules/user/client-react/actions/editUser.ts
@@ -0,0 +1,9 @@
+import axios from 'axios';
+import { User } from '..';
+
+export default function EDIT_USER(user: User) {
+  return {
+    types: [null, null, null] as any,
+    callAPI: () => axios.post(`${__API_URL__}/editUser`, { ...user })
+  };
+}
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 6e9ce09..7dace9f 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -2,5 +2,10 @@ import REGISTER from './register';
 import LOGIN from './login';
 import CURRENT_USER from './currentUser';
 import CLEAR_USER from './clearUser';
+import USERS from './users';
+import USER from './user';
+import DELETE_USER from './deleteUser';
+import EDIT_USER from './editUser';
+import ADD_USER from './addUser';
 
-export { REGISTER, LOGIN, CURRENT_USER, CLEAR_USER };
+export { REGISTER, LOGIN, CURRENT_USER, CLEAR_USER, USERS, USER, DELETE_USER, EDIT_USER, ADD_USER };
diff --git a/modules/user/client-react/actions/login.ts b/modules/user/client-react/actions/login.ts
index 5dcbfb2..d0c5544 100644
--- a/modules/user/client-react/actions/login.ts
+++ b/modules/user/client-react/actions/login.ts
@@ -5,9 +5,6 @@ import { ActionType } from '../reducers';
 export default function LOGIN(value: LoginSubmitProps) {
   return {
     types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
-    callAPI: (client: (request: () => Promise<any>) => any) =>
-      client
-        ? client(() => axios.post(`${__API_URL__}/login`, { ...value }))
-        : axios.post(`${__API_URL__}/login`, { ...value })
+    callAPI: () => axios.post(`${__API_URL__}/login`, { ...value })
   };
 }
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index f36043c..461a872 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -4,9 +4,6 @@ import { RegisterSubmitProps } from '..';
 export default function REGISTER(value: RegisterSubmitProps) {
   return {
     types: [null, null, null] as any,
-    callAPI: (client: (request: () => Promise<any>) => any) =>
-      client
-        ? client(() => axios.post(`${__API_URL__}/register`, { ...value }))
-        : axios.post(`${__API_URL__}/register`, { ...value })
+    callAPI: () => axios.post(`${__API_URL__}/register`, { ...value })
   };
 }
diff --git a/modules/user/client-react/actions/user.ts b/modules/user/client-react/actions/user.ts
new file mode 100644
index 0000000..7282299
--- /dev/null
+++ b/modules/user/client-react/actions/user.ts
@@ -0,0 +1,9 @@
+import axios from 'axios';
+import { ActionType } from '../reducers';
+
+export default function USER(id: number) {
+  return {
+    types: [null, ActionType.SET_USER, null],
+    callAPI: () => axios.get(`${__API_URL__}/user`, { params: id })
+  };
+}
diff --git a/modules/user/client-react/actions/users.ts b/modules/user/client-react/actions/users.ts
new file mode 100644
index 0000000..b9c0dfe
--- /dev/null
+++ b/modules/user/client-react/actions/users.ts
@@ -0,0 +1,11 @@
+import axios from 'axios';
+import { ActionType } from '../reducers';
+import { OrderBy, Filter } from '..';
+
+export default function USERS(orderBY: OrderBy, filter: Filter, type = 'SET_LOADING') {
+  return {
+    types: [ActionType[type], ActionType.SET_USERS, null],
+    payload: { orderBY, filter },
+    callAPI: () => axios.get(`${__API_URL__}/users`, { params: { filter, orderBY } })
+  };
+}
diff --git a/modules/user/client-react/helpers/UserFormatter.ts b/modules/user/client-react/helpers/UserFormatter.ts
new file mode 100644
index 0000000..f0adf09
--- /dev/null
+++ b/modules/user/client-react/helpers/UserFormatter.ts
@@ -0,0 +1,24 @@
+export default class UserFormatter {
+  public static trimExtraSpaces(inputValues: { [key: string]: any }) {
+    const userValues = { ...inputValues };
+    const propsForTrim = ['username', 'email', 'firstName', 'lastName'];
+
+    for (const prop in userValues) {
+      if (userValues.hasOwnProperty(prop)) {
+        if (propsForTrim.includes(prop) && userValues[prop]) {
+          userValues[prop] = userValues[prop].trim();
+        }
+
+        if (prop === 'profile') {
+          for (const profileProp in userValues.profile) {
+            if (propsForTrim.includes(profileProp) && userValues.profile[profileProp]) {
+              userValues.profile[profileProp] = userValues.profile[profileProp].trim();
+            }
+          }
+        }
+      }
+    }
+
+    return userValues;
+  }
+}
diff --git a/modules/user/client-react/helpers/index.ts b/modules/user/client-react/helpers/index.ts
new file mode 100644
index 0000000..3578675
--- /dev/null
+++ b/modules/user/client-react/helpers/index.ts
@@ -0,0 +1,13 @@
+import url from 'url';
+import { Constants } from 'expo';
+import { Platform } from 'react-native';
+
+export default function buildRedirectUrlForMobile(authType: string) {
+  const { protocol, hostname, port } = url.parse(__WEBSITE_URL__);
+  const expoHostname = Platform.OS === 'android' ? 'localhost' : `${url.parse(Constants.linkingUri).hostname}.nip.io`;
+  const urlHostname = process.env.NODE_ENV === 'production' ? hostname : expoHostname;
+
+  return `${protocol}//${urlHostname}${port ? ':' + port : ''}/auth/${authType}?expoUrl=${encodeURIComponent(
+    Constants.linkingUri
+  )}`;
+}
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index b3e5791..7a015d0 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -1,14 +1,22 @@
-import { User } from '..';
+import { User, OrderBy, Filter } from '..';
 
 export enum ActionType {
   SET_CURRENT_USER = 'SET_CURRENT_USER',
   CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
-  SET_LOADING = 'SET_LOADING'
+  SET_LOADING = 'SET_LOADING',
+  SET_USER = 'SET_USER',
+  SET_USERS = 'SET_USERS',
+  SET_ORDER_BY = 'SET_ORDER_BY',
+  SET_FILTER = 'SET_FILTER'
 }
 
 export interface UserModuleState {
   currentUser: User;
   loading: boolean;
+  user: User;
+  users: User[];
+  orderBy: OrderBy;
+  filter: Filter;
 }
 
 export interface UserModuleActionProps {
@@ -20,7 +28,11 @@ export interface UserModuleActionProps {
 
 const defaultState: UserModuleState = {
   currentUser: null,
-  loading: false
+  loading: false,
+  user: null,
+  users: [],
+  orderBy: { column: '', order: '' },
+  filter: { searchText: '', role: null, isActive: true }
 };
 
 export default function(state = defaultState, action: UserModuleActionProps) {
@@ -47,6 +59,29 @@ export default function(state = defaultState, action: UserModuleActionProps) {
         loading: false
       };
 
+    case ActionType.SET_USER:
+      return {
+        ...state,
+        user: action.payload
+      };
+    case ActionType.SET_USERS:
+      return {
+        ...state,
+        users: action.payload
+      };
+
+    case ActionType.SET_FILTER:
+      return {
+        ...state,
+        filter: action.payload && action.payload.filter
+      };
+
+    case ActionType.SET_ORDER_BY:
+      return {
+        ...state,
+        orderBy: action.payload && action.payload.orderBy
+      };
+
     default:
       return state;
   }
diff --git a/packages/client/typings/typings.d.ts b/packages/client/typings/typings.d.ts
index 9f68cd8..bb8bb24 100644
--- a/packages/client/typings/typings.d.ts
+++ b/packages/client/typings/typings.d.ts
@@ -13,3 +13,4 @@ interface Window {
 declare module 'react-native-credit-card-input';
 declare module 'sourcemapped-stacktrace';
 declare module 'minilog';
+declare module 'reactstrap';

From eded36da9f5ca003b1644cf21538d2d2d22a2062 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Mon, 13 May 2019 11:02:19 +0300
Subject: [PATCH 043/104] Update controllers

---
 config/auth.js                        | 2 +-
 modules/user/server-ts/controllers.ts | 5 +++--
 modules/user/server-ts/index.ts       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index 61fe596..5371613 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -4,7 +4,7 @@ export default {
     enabled: true
   },
   jwt: {
-    enabled: true,
+    enabled: false,
     tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index ead8be7..c139a1e 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -1,4 +1,5 @@
 import { pick, isEmpty } from 'lodash';
+import jwt from 'jsonwebtoken';
 
 import { createTransaction } from '@restapp/database-server-ts';
 import { log } from '@restapp/core-common';
@@ -11,11 +12,11 @@ import { createPasswordHash } from './password';
 import emailTemplate from './emailTemplate';
 
 const {
-  auth: { jwt, password, secret },
+  auth: { password, secret },
   app
 } = settings;
 
-export const user = async ({ body: { id }, user: identity, t }: any, res: any) => {
+export const user = async ({ params: { id }, user: identity, t }: any, res: any) => {
   if (+identity.id === +id || identity.role === 'admin') {
     try {
       res.json({ user: await userDAO.getUser(id) });
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index aa5cf49..8f675ed 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -54,12 +54,12 @@ export default new ServerModule(password, {
   apiRouteParams: [
     {
       method: RestMethod.GET,
-      route: 'user',
+      route: 'user/:id',
       isAuthRoute: true,
       controller: user
     },
     {
-      method: RestMethod.GET,
+      method: RestMethod.POST,
       route: 'users',
       isAuthRoute: true,
       controller: users

From 7f69b5c5a5f11b013cc6f1cba9d2a0b26e41a87a Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 13 May 2019 15:55:01 +0300
Subject: [PATCH 044/104] Rename redux middleware

---
 config/auth.js                                |  2 +-
 .../client-react/access/jwt/index.ts          | 24 +++++++++----------
 modules/core/client-react/Main.tsx            |  2 +-
 modules/core/common/createReduxStore.ts       |  7 +++---
 modules/module/client-react/ClientModule.ts   |  6 ++---
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index 5371613..61fe596 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -4,7 +4,7 @@ export default {
     enabled: true
   },
   jwt: {
-    enabled: false,
+    enabled: true,
     tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index 7cea00f..d09af1e 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -24,7 +24,7 @@ const removeTokens = async () => {
 };
 
 const requestMiddleware: Middleware = ({ dispatch }) => next => action => {
-  const { types, callAPI, payload, ...rest } = action;
+  const { types, callAPI, ...rest } = action;
 
   if (!types) {
     return next(action);
@@ -32,7 +32,7 @@ const requestMiddleware: Middleware = ({ dispatch }) => next => action => {
 
   const [REQUEST, SUCCESS, FAIL] = types;
 
-  next({ type: REQUEST, payload, ...rest });
+  next({ type: REQUEST, ...rest });
 
   const handleCallApi = async () => {
     try {
@@ -40,19 +40,19 @@ const requestMiddleware: Middleware = ({ dispatch }) => next => action => {
       const data = result && result.data;
       next({
         type: SUCCESS,
-        payload: data,
-        ...rest
+        ...rest,
+        payload: data
       });
       return data;
     } catch (e) {
-      if (e.response.status === 401) {
-        dispatch(action);
+      if (e.response && e.response.status === 401) {
+        return dispatch(action);
       }
       const data = e.response && e.response.data;
       next({
         type: FAIL,
-        payload: data,
-        ...rest
+        ...rest,
+        payload: data
       });
       return data;
     }
@@ -63,8 +63,7 @@ const requestMiddleware: Middleware = ({ dispatch }) => next => action => {
 
 const client = async (request: () => Promise<any>) => {
   try {
-    const result = await request();
-    return result;
+    return await request();
   } catch (e) {
     if (e.response && e.response.status === 401) {
       try {
@@ -105,7 +104,8 @@ axios.interceptors.response.use(async (res: any) => {
         }
       } = res;
       await saveTokens({ accessToken, refreshToken });
-      return res.data.user;
+      res.data = res.data.user;
+      return res;
     } else {
       await removeTokens();
     }
@@ -116,6 +116,6 @@ axios.interceptors.response.use(async (res: any) => {
 export default (settings.auth.jwt.enabled
   ? new AccessModule({
       logout: [removeTokens],
-      requestMiddleware
+      reduxMiddleware: [requestMiddleware]
     })
   : undefined);
diff --git a/modules/core/client-react/Main.tsx b/modules/core/client-react/Main.tsx
index 9221881..479b27d 100644
--- a/modules/core/client-react/Main.tsx
+++ b/modules/core/client-react/Main.tsx
@@ -25,7 +25,7 @@ export const onAppCreate = (modules: ClientModule, entryModule: NodeModule) => {
     ref.store = entryModule.hot.data.store;
     ref.store.replaceReducer(getStoreReducer(ref.modules.reducers));
   } else {
-    ref.store = createReduxStore(ref.modules.reducers, {}, routerMiddleware(history), ref.modules.requestMiddlewares);
+    ref.store = createReduxStore(ref.modules.reducers, {}, routerMiddleware(history), ref.modules.reduxMiddlewares);
   }
 };
 
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index c985026..643425e 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -12,12 +12,13 @@ const createReduxStore = (
   reducers: Reducer,
   initialState: DeepPartial<any>,
   routerMiddleware?: Middleware,
-  requestMiddleware?: Middleware
+  reduxMiddlewares?: Middleware[]
 ): Store => {
   const middleware: () => Middleware[] = () => {
     const routerMiddlewares = routerMiddleware ? [routerMiddleware] : [];
-    const requestMiddlewares = requestMiddleware ? [requestMiddleware] : [];
-    return [...routerMiddlewares, ...requestMiddlewares];
+    const reduxMiddleware = reduxMiddlewares && reduxMiddlewares.length ? reduxMiddlewares : [];
+
+    return [...routerMiddlewares, ...reduxMiddleware];
   };
   return createStore(
     getStoreReducer(reducers),
diff --git a/modules/module/client-react/ClientModule.ts b/modules/module/client-react/ClientModule.ts
index f42940b..f19cb31 100644
--- a/modules/module/client-react/ClientModule.ts
+++ b/modules/module/client-react/ClientModule.ts
@@ -17,7 +17,7 @@ export interface ClientModuleShape extends BaseModuleShape {
   // URL list to 3rd party js scripts
   scriptsInsert?: string[];
   // Http client is provided by modules
-  requestMiddleware?: Middleware;
+  reduxMiddleware?: Middleware[];
 }
 
 interface ClientModule extends ClientModuleShape {}
@@ -89,8 +89,8 @@ class ClientModule extends BaseModule {
   /**
    * @returns Http client is provided by modules
    */
-  get requestMiddlewares() {
-    return this.requestMiddleware;
+  get reduxMiddlewares() {
+    return this.reduxMiddleware;
   }
 }
 

From 4bb5ebbab2d0cf8e14f6cba59c85c97a6d312add Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 13 May 2019 15:55:22 +0300
Subject: [PATCH 045/104] Fix get users and users filters

---
 .../components/{FormItem.jsx => FormItem.tsx} |  13 +-
 .../ui-bootstrap/components/Input.jsx         |  13 --
 .../ui-bootstrap/components/Input.tsx         |  12 ++
 .../components/{Select.jsx => Select.tsx}     |  11 +-
 .../user/client-react/actions/deleteUser.ts   |   4 +-
 modules/user/client-react/actions/user.ts     |   2 +-
 modules/user/client-react/actions/users.ts    |   6 +-
 .../client-react/components/LoginForm.tsx     |   2 +-
 .../client-react/components/ProfileView.tsx   |  80 +++++++++
 .../client-react/components/UserAddView.tsx   |  45 +++++
 .../client-react/components/UserEditView.tsx  |  61 +++++++
 .../user/client-react/components/UserForm.tsx | 165 ++++++++++++++++++
 .../components/UsersFilterView.tsx            |  57 ++++++
 .../client-react/components/UsersListView.tsx | 131 ++++++++++++++
 .../user/client-react/containers/Profile.tsx  |  21 +++
 .../user/client-react/containers/UserAdd.tsx  |  62 +++++++
 .../user/client-react/containers/UserEdit.tsx |  69 ++++++++
 .../containers/UserOperations.tsx             |  69 ++++++++
 .../user/client-react/containers/Users.tsx    |  49 ++++++
 modules/user/client-react/index.tsx           |  40 ++++-
 modules/user/client-react/reducers/index.ts   |  13 +-
 21 files changed, 886 insertions(+), 39 deletions(-)
 rename modules/look/client-react/ui-bootstrap/components/{FormItem.jsx => FormItem.tsx} (62%)
 delete mode 100644 modules/look/client-react/ui-bootstrap/components/Input.jsx
 create mode 100644 modules/look/client-react/ui-bootstrap/components/Input.tsx
 rename modules/look/client-react/ui-bootstrap/components/{Select.jsx => Select.tsx} (51%)
 create mode 100644 modules/user/client-react/components/ProfileView.tsx
 create mode 100644 modules/user/client-react/components/UserAddView.tsx
 create mode 100644 modules/user/client-react/components/UserEditView.tsx
 create mode 100644 modules/user/client-react/components/UserForm.tsx
 create mode 100644 modules/user/client-react/components/UsersFilterView.tsx
 create mode 100644 modules/user/client-react/components/UsersListView.tsx
 create mode 100644 modules/user/client-react/containers/Profile.tsx
 create mode 100644 modules/user/client-react/containers/UserAdd.tsx
 create mode 100644 modules/user/client-react/containers/UserEdit.tsx
 create mode 100644 modules/user/client-react/containers/UserOperations.tsx
 create mode 100644 modules/user/client-react/containers/Users.tsx

diff --git a/modules/look/client-react/ui-bootstrap/components/FormItem.jsx b/modules/look/client-react/ui-bootstrap/components/FormItem.tsx
similarity index 62%
rename from modules/look/client-react/ui-bootstrap/components/FormItem.jsx
rename to modules/look/client-react/ui-bootstrap/components/FormItem.tsx
index 16acdaa..71b38ec 100644
--- a/modules/look/client-react/ui-bootstrap/components/FormItem.jsx
+++ b/modules/look/client-react/ui-bootstrap/components/FormItem.tsx
@@ -1,8 +1,12 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { FormGroup, Label } from 'reactstrap';
 
-const FormItem = ({ children, label, ...props }) => {
+interface FormItemProps {
+  children: React.ReactNode;
+  label?: string;
+}
+
+const FormItem = ({ children, label, ...props }: FormItemProps) => {
   return (
     <FormGroup {...props}>
       {label && (
@@ -16,9 +20,4 @@ const FormItem = ({ children, label, ...props }) => {
   );
 };
 
-FormItem.propTypes = {
-  children: PropTypes.node,
-  label: PropTypes.string
-};
-
 export default FormItem;
diff --git a/modules/look/client-react/ui-bootstrap/components/Input.jsx b/modules/look/client-react/ui-bootstrap/components/Input.jsx
deleted file mode 100644
index e51b62b..0000000
--- a/modules/look/client-react/ui-bootstrap/components/Input.jsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Input as RSInput } from 'reactstrap';
-
-const Input = ({ children, ...props }) => {
-  return <RSInput {...props}>{children}</RSInput>;
-};
-
-Input.propTypes = {
-  children: PropTypes.node
-};
-
-export default Input;
diff --git a/modules/look/client-react/ui-bootstrap/components/Input.tsx b/modules/look/client-react/ui-bootstrap/components/Input.tsx
new file mode 100644
index 0000000..b76daab
--- /dev/null
+++ b/modules/look/client-react/ui-bootstrap/components/Input.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Input as RSInput } from 'reactstrap';
+
+interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+  children?: React.ReactNode;
+}
+
+const Input = ({ children, ...props }: InputProps) => {
+  return <RSInput {...props}>{children}</RSInput>;
+};
+
+export default Input;
diff --git a/modules/look/client-react/ui-bootstrap/components/Select.jsx b/modules/look/client-react/ui-bootstrap/components/Select.tsx
similarity index 51%
rename from modules/look/client-react/ui-bootstrap/components/Select.jsx
rename to modules/look/client-react/ui-bootstrap/components/Select.tsx
index 39d62bc..c1df135 100644
--- a/modules/look/client-react/ui-bootstrap/components/Select.jsx
+++ b/modules/look/client-react/ui-bootstrap/components/Select.tsx
@@ -1,8 +1,11 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Input } from 'reactstrap';
 
-const Select = ({ children, ...props }) => {
+interface SelectProps extends React.InputHTMLAttributes<HTMLInputElement> {
+  children?: React.ReactNode;
+}
+
+const Select = ({ children, ...props }: SelectProps) => {
   return (
     <Input {...props} type="select">
       {children}
@@ -10,8 +13,4 @@ const Select = ({ children, ...props }) => {
   );
 };
 
-Select.propTypes = {
-  children: PropTypes.node
-};
-
 export default Select;
diff --git a/modules/user/client-react/actions/deleteUser.ts b/modules/user/client-react/actions/deleteUser.ts
index 0c6a2a1..3a9a2d9 100644
--- a/modules/user/client-react/actions/deleteUser.ts
+++ b/modules/user/client-react/actions/deleteUser.ts
@@ -3,7 +3,7 @@ import { ActionType } from '../reducers';
 
 export default function DELETE_USER(id: number) {
   return {
-    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
-    callAPI: () => axios.delete(`${__API_URL__}/deleteUser`, { data: id })
+    types: [null, ActionType.DELETE_USER, null] as ActionType[],
+    callAPI: () => axios.delete(`${__API_URL__}/deleteUser`, { data: { id } })
   };
 }
diff --git a/modules/user/client-react/actions/user.ts b/modules/user/client-react/actions/user.ts
index 7282299..f6754b1 100644
--- a/modules/user/client-react/actions/user.ts
+++ b/modules/user/client-react/actions/user.ts
@@ -4,6 +4,6 @@ import { ActionType } from '../reducers';
 export default function USER(id: number) {
   return {
     types: [null, ActionType.SET_USER, null],
-    callAPI: () => axios.get(`${__API_URL__}/user`, { params: id })
+    callAPI: () => axios.get(`${__API_URL__}/user/${id}`)
   };
 }
diff --git a/modules/user/client-react/actions/users.ts b/modules/user/client-react/actions/users.ts
index b9c0dfe..2fa3b2a 100644
--- a/modules/user/client-react/actions/users.ts
+++ b/modules/user/client-react/actions/users.ts
@@ -2,10 +2,10 @@ import axios from 'axios';
 import { ActionType } from '../reducers';
 import { OrderBy, Filter } from '..';
 
-export default function USERS(orderBY: OrderBy, filter: Filter, type = 'SET_LOADING') {
+export default function USERS(orderBy: OrderBy, filter: Filter, type = 'null') {
   return {
     types: [ActionType[type], ActionType.SET_USERS, null],
-    payload: { orderBY, filter },
-    callAPI: () => axios.get(`${__API_URL__}/users`, { params: { filter, orderBY } })
+    payload: { orderBy, filter },
+    callAPI: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
   };
 }
diff --git a/modules/user/client-react/components/LoginForm.tsx b/modules/user/client-react/components/LoginForm.tsx
index 5084a55..d7845bc 100644
--- a/modules/user/client-react/components/LoginForm.tsx
+++ b/modules/user/client-react/components/LoginForm.tsx
@@ -101,7 +101,7 @@ const LoginFormWithFormik = withFormik<FormProps<LoginSubmitProps>, LoginSubmitP
 
   handleSubmit(values, { setErrors, props: { onSubmit } }) {
     onSubmit(values).catch((e: any) => {
-      if (e) {
+      if (e && e.errors) {
         setErrors(e.errors);
       } else {
         throw e;
diff --git a/modules/user/client-react/components/ProfileView.tsx b/modules/user/client-react/components/ProfileView.tsx
new file mode 100644
index 0000000..04dab1f
--- /dev/null
+++ b/modules/user/client-react/components/ProfileView.tsx
@@ -0,0 +1,80 @@
+import * as React from 'react';
+import Helmet from 'react-helmet';
+import { Link } from 'react-router-dom';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { LayoutCenter, Card, CardGroup, CardTitle, CardText, PageLayout } from '@restapp/look-client-react';
+
+import { User } from '..';
+
+import settings from '../../../../settings';
+
+interface ProfileViewProps {
+  currentUserLoading: boolean;
+  currentUser: User;
+  t: TranslateFunction;
+}
+const renderMetaData = (t: TranslateFunction) => {
+  return (
+    <Helmet
+      title={`${settings.app.name} - ${t('profile.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('profile.meta')}`
+        }
+      ]}
+    />
+  );
+};
+
+const ProfileView: React.FunctionComponent<ProfileViewProps> = ({ currentUserLoading, currentUser, t }) => {
+  if (currentUserLoading && !currentUser) {
+    return (
+      <PageLayout>
+        {renderMetaData(t)}
+        <div className="text-center">{t('profile.loadMsg')}</div>
+      </PageLayout>
+    );
+  } else if (currentUser) {
+    return (
+      <PageLayout>
+        {renderMetaData(t)}
+        <LayoutCenter>
+          <h1 className="text-center">{t('profile.card.title')}</h1>
+          <Card>
+            <CardGroup>
+              <CardTitle>{t('profile.card.group.name')}:</CardTitle>
+              <CardText>{currentUser.username}</CardText>
+            </CardGroup>
+            <CardGroup>
+              <CardTitle>{t('profile.card.group.email')}:</CardTitle>
+              <CardText>{currentUser.email}</CardText>
+            </CardGroup>
+            <CardGroup>
+              <CardTitle>{t('profile.card.group.role')}:</CardTitle>
+              <CardText>{currentUser.role}</CardText>
+            </CardGroup>
+            {currentUser.profile && currentUser.profile.fullName && (
+              <CardGroup>
+                <CardTitle>{t('profile.card.group.full')}:</CardTitle>
+                <CardText>{currentUser.profile.fullName}</CardText>
+              </CardGroup>
+            )}
+          </Card>
+          <Link className="mt-2 btn user-link" to={`/users/${currentUser.id}`}>
+            {t('profile.editProfileText')}
+          </Link>
+        </LayoutCenter>
+      </PageLayout>
+    );
+  } else {
+    return (
+      <PageLayout>
+        {renderMetaData(t)}
+        <h2>{t('profile.errorMsg')}</h2>
+      </PageLayout>
+    );
+  }
+};
+
+export default translate('user')(ProfileView);
diff --git a/modules/user/client-react/components/UserAddView.tsx b/modules/user/client-react/components/UserAddView.tsx
new file mode 100644
index 0000000..11435f9
--- /dev/null
+++ b/modules/user/client-react/components/UserAddView.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import { Link } from 'react-router-dom';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { PageLayout } from '@restapp/look-client-react';
+
+import UserForm from './UserForm';
+import settings from '../../../../settings';
+import { User, ResetPasswordSubmitProps } from '..';
+
+interface FormValues extends User, ResetPasswordSubmitProps {}
+
+interface UserAddViewProps {
+  t: TranslateFunction;
+  onSubmit: (values: FormValues) => Promise<void>;
+}
+
+const UserAddView = ({ t, onSubmit }: UserAddViewProps) => {
+  const renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - ${t('userEdit.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('userEdit.meta')}`
+        }
+      ]}
+    />
+  );
+
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      <Link id="back-button" to="/users">
+        Back
+      </Link>
+      <h2>
+        {t('userEdit.form.titleCreate')} {t('userEdit.form.title')}
+      </h2>
+      <UserForm onSubmit={onSubmit} initialValues={{}} shouldDisplayRole={true} shouldDisplayActive={true} />
+    </PageLayout>
+  );
+};
+
+export default translate('user')(UserAddView);
diff --git a/modules/user/client-react/components/UserEditView.tsx b/modules/user/client-react/components/UserEditView.tsx
new file mode 100644
index 0000000..7995aeb
--- /dev/null
+++ b/modules/user/client-react/components/UserEditView.tsx
@@ -0,0 +1,61 @@
+import * as React from 'react';
+import Helmet from 'react-helmet';
+import { Link } from 'react-router-dom';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { PageLayout } from '@restapp/look-client-react';
+
+import UserForm from './UserForm';
+import settings from '../../../../settings';
+import { User, ResetPasswordSubmitProps } from '..';
+
+interface FormValues extends User, ResetPasswordSubmitProps {}
+
+interface UserEditViewProps {
+  loading: boolean;
+  user: User;
+  currentUser: User;
+  t: TranslateFunction;
+  onSubmit: (values: FormValues) => Promise<void>;
+}
+
+const UserEditView: React.FunctionComponent<UserEditViewProps> = ({ loading, user, t, currentUser, onSubmit }) => {
+  const isNotSelf = !user || (user && user.id !== currentUser.id);
+
+  const renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - ${t('userEdit.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('userEdit.meta')}`
+        }
+      ]}
+    />
+  );
+
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      {loading && !user ? (
+        <div className="text-center">{t('userEdit.loadMsg')}</div>
+      ) : (
+        <>
+          <Link id="back-button" to={currentUser && currentUser.role === 'admin' ? '/users' : '/profile'}>
+            Back
+          </Link>
+          <h2>
+            {t('userEdit.form.titleEdit')} {t('userEdit.form.title')}
+          </h2>
+          <UserForm
+            onSubmit={onSubmit}
+            shouldDisplayRole={isNotSelf}
+            shouldDisplayActive={isNotSelf}
+            initialValues={user}
+          />
+        </>
+      )}
+    </PageLayout>
+  );
+};
+
+export default translate('user')(UserEditView);
diff --git a/modules/user/client-react/components/UserForm.tsx b/modules/user/client-react/components/UserForm.tsx
new file mode 100644
index 0000000..d713144
--- /dev/null
+++ b/modules/user/client-react/components/UserForm.tsx
@@ -0,0 +1,165 @@
+import * as React from 'react';
+import { withFormik, FormikProps } from 'formik';
+import { isEmpty } from 'lodash';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate } from '@restapp/i18n-client-react';
+import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
+import { Form, RenderField, RenderSelect, RenderCheckBox, Option, Button, Alert } from '@restapp/look-client-react';
+
+import settings from '../../../../settings';
+
+import { CommonProps, FormProps, User, UserRole, ResetPasswordSubmitProps } from '..';
+
+interface FormikFormProps extends FormProps<FormValues> {
+  initialValues: FormValues;
+}
+
+interface UserFormProps extends CommonProps, FormikProps<FormValues> {
+  handleSubmit: () => void;
+  handleChange: () => void;
+  setFieldValue: (name: string, value: any) => void;
+  onSubmit: (values: FormValues) => Promise<void>;
+  setTouched: () => void;
+  isValid: boolean;
+  shouldDisplayRole: boolean;
+  shouldDisplayActive: boolean;
+  values: any;
+  errors: any;
+  initialValues: FormValues;
+}
+
+interface FormValues extends User, ResetPasswordSubmitProps {}
+
+const userFormSchema = {
+  username: [required, minLength(3)],
+  email: [required, emailRule]
+};
+
+const createUserFormSchema = {
+  ...userFormSchema,
+  password: [required, minLength(settings.auth.password.minLength)],
+  passwordConfirmation: [required, match('password'), minLength(settings.auth.password.minLength)]
+};
+
+const updateUserFormSchema = {
+  ...userFormSchema,
+  password: minLength(settings.auth.password.minLength),
+  passwordConfirmation: [match('password'), minLength(settings.auth.password.minLength)]
+};
+
+const UserForm: React.FunctionComponent<UserFormProps> = ({
+  values,
+  handleSubmit,
+  errors,
+  setFieldValue,
+  t,
+  shouldDisplayRole,
+  shouldDisplayActive
+}) => {
+  const { username, email, role, isActive, profile, password, passwordConfirmation } = values;
+
+  return (
+    <Form name="user" onSubmit={handleSubmit}>
+      <Field
+        name="username"
+        component={RenderField}
+        type="text"
+        label={t('userEdit.form.field.name')}
+        value={username}
+      />
+      <Field name="email" component={RenderField} type="email" label={t('userEdit.form.field.email')} value={email} />
+      {shouldDisplayRole && (
+        <Field
+          name="role"
+          component={RenderSelect}
+          type="select"
+          label={t('userEdit.form.field.role.label')}
+          value={role}
+        >
+          <Option value="user">{t('userEdit.form.field.role.user')}</Option>
+          <Option value="admin">{t('userEdit.form.field.role.admin')}</Option>
+        </Field>
+      )}
+      {shouldDisplayActive && (
+        <Field
+          name="isActive"
+          component={RenderCheckBox}
+          type="checkbox"
+          label={t('userEdit.form.field.active')}
+          checked={isActive}
+        />
+      )}
+      <Field
+        name="firstName"
+        component={RenderField}
+        type="text"
+        label={t('userEdit.form.field.firstName')}
+        value={profile.firstName}
+        onChange={(value: string) => setFieldValue('profile', { ...profile, firstName: value })}
+      />
+      <Field
+        name="lastName"
+        component={RenderField}
+        type="text"
+        label={t('userEdit.form.field.lastName')}
+        value={profile.lastName}
+        onChange={(value: string) => setFieldValue('profile', { ...profile, lastName: value })}
+      />
+      <Field
+        name="password"
+        component={RenderField}
+        type="password"
+        label={t('userEdit.form.field.pass')}
+        value={password}
+      />
+      <Field
+        name="passwordConfirmation"
+        component={RenderField}
+        type="password"
+        label={t('userEdit.form.field.passConf')}
+        value={passwordConfirmation}
+      />
+      {errors && errors.errorMsg && <Alert color="error">{errors.errorMsg}</Alert>}
+      <Button color="primary" type="submit">
+        {t('userEdit.form.btnSubmit')}
+      </Button>
+    </Form>
+  );
+};
+
+const UserFormWithFormik = withFormik<FormikFormProps, FormValues>({
+  mapPropsToValues: values => {
+    const { username, email, role, isActive, profile } = values.initialValues;
+    return {
+      username,
+      email,
+      role: role || UserRole.user,
+      isActive,
+      password: '',
+      passwordConfirmation: '',
+      profile: {
+        firstName: profile && profile.firstName,
+        lastName: profile && profile.lastName
+      },
+      auth: {
+        ...values.initialValues.auth
+      }
+    };
+  },
+  async handleSubmit(values, { setErrors, props: { onSubmit } }) {
+    await onSubmit(values).catch((e: any) => {
+      if (e && e.errors) {
+        setErrors(e.errors);
+      } else {
+        throw e;
+      }
+    });
+  },
+  displayName: 'SignUpForm ', // helps with React DevTools
+  validate: (values, props) => {
+    const schema: any = isEmpty(props.initialValues) ? createUserFormSchema : updateUserFormSchema;
+    return validate(values, schema);
+  }
+});
+
+export default translate('user')(UserFormWithFormik(UserForm));
diff --git a/modules/user/client-react/components/UsersFilterView.tsx b/modules/user/client-react/components/UsersFilterView.tsx
new file mode 100644
index 0000000..b90b335
--- /dev/null
+++ b/modules/user/client-react/components/UsersFilterView.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react';
+import { DebounceInput } from 'react-debounce-input';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { Form, FormItem, Select, Option, Label, Input } from '@restapp/look-client-react';
+import { Filter } from '..';
+
+export interface UsersFilterViewProps {
+  filter: Filter;
+  onSearchTextChange: (value: string) => void;
+  onRoleChange: (value: string) => void;
+  onIsActiveChange: (isActive: boolean) => void;
+  t?: TranslateFunction;
+}
+
+const UsersFilterView: React.FunctionComponent<UsersFilterViewProps> = ({
+  filter: { searchText, role, isActive },
+  onSearchTextChange,
+  onRoleChange,
+  onIsActiveChange,
+  t
+}) => (
+  <Form layout="inline">
+    <FormItem label={t('users.list.item.filter')}>
+      <DebounceInput
+        minLength={2}
+        debounceTimeout={300}
+        placeholder={t('users.list.item.search')}
+        element={Input}
+        value={searchText}
+        onChange={e => onSearchTextChange(e.target.value)}
+      />
+    </FormItem>
+    &nbsp;
+    <FormItem label={t('users.list.item.role.label')}>
+      <Select name="role" defaultValue={role} onChange={e => onRoleChange(e.target.value)}>
+        <Option key={1} value="">
+          {t('users.list.item.role.all')}
+        </Option>
+        <Option key={2} value="user">
+          {t('users.list.item.role.user')}
+        </Option>
+        <Option key={3} value="admin">
+          {t('users.list.item.role.admin')}
+        </Option>
+      </Select>
+    </FormItem>
+    &nbsp;
+    <FormItem>
+      <Label>
+        <Input type="checkbox" defaultChecked={isActive} onChange={() => onIsActiveChange(!isActive)} />
+        {t('users.list.item.active')}
+      </Label>
+    </FormItem>
+  </Form>
+);
+
+export default translate('user')(UsersFilterView);
diff --git a/modules/user/client-react/components/UsersListView.tsx b/modules/user/client-react/components/UsersListView.tsx
new file mode 100644
index 0000000..3a28044
--- /dev/null
+++ b/modules/user/client-react/components/UsersListView.tsx
@@ -0,0 +1,131 @@
+import * as React from 'react';
+import { Link } from 'react-router-dom';
+import { translate } from '@restapp/i18n-client-react';
+import { Table, Button } from '@restapp/look-client-react';
+import { User } from '..';
+import { OrderBy, CommonProps } from '..';
+
+export interface UsersViewProps extends CommonProps {
+  loading: boolean;
+  users?: User[];
+  orderBy?: OrderBy;
+  onOrderBy: (orderBy: OrderBy) => void;
+  deleteUser: (id: number | string) => Promise<any>;
+}
+
+const UsersView = ({ deleteUser, orderBy, onOrderBy, loading, users, t, ...rest }: UsersViewProps) => {
+  const [errors, setErrors] = React.useState([]);
+
+  const handleDeleteUser = async (id: number | string) => {
+    const result = await deleteUser(id);
+    if (result && result.errors) {
+      setErrors(result.errors);
+    } else {
+      setErrors([]);
+    }
+  };
+
+  const renderOrderByArrow = (name: string) => {
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'desc') {
+        return <span className="badge badge-primary">&#8595;</span>;
+      } else {
+        return <span className="badge badge-primary">&#8593;</span>;
+      }
+    } else {
+      return <span className="badge badge-secondary">&#8645;</span>;
+    }
+  };
+
+  const handleOrderBy = (e: React.MouseEvent, name: string) => {
+    e.preventDefault();
+
+    let order = 'asc';
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'asc') {
+        order = 'desc';
+      } else if (orderBy.order === 'desc') {
+        return onOrderBy({
+          column: '',
+          order: ''
+        });
+      }
+    }
+
+    return onOrderBy({ column: name, order });
+  };
+
+  const columns = [
+    {
+      title: (
+        <a onClick={e => handleOrderBy(e, 'username')} href="#">
+          {t('users.column.name')} {renderOrderByArrow('username')}
+        </a>
+      ),
+      dataIndex: 'username',
+      key: 'username',
+      render: (text: string, record: User) => (
+        <Link className="user-link" to={`/users/${record.id}`}>
+          {text}
+        </Link>
+      )
+    },
+    {
+      title: (
+        <a onClick={e => handleOrderBy(e, 'email')} href="#">
+          {t('users.column.email')} {renderOrderByArrow('email')}
+        </a>
+      ),
+      dataIndex: 'email',
+      key: 'email'
+    },
+    {
+      title: (
+        <a onClick={e => handleOrderBy(e, 'role')} href="#">
+          {t('users.column.role')} {renderOrderByArrow('role')}
+        </a>
+      ),
+      dataIndex: 'role',
+      key: 'role'
+    },
+    {
+      title: (
+        <a onClick={e => handleOrderBy(e, 'isActive')} href="#">
+          {t('users.column.active')} {renderOrderByArrow('isActive')}
+        </a>
+      ),
+      dataIndex: 'isActive',
+      key: 'isActive',
+      render: (text: string) => text.toString()
+    },
+    {
+      title: t('users.column.actions'),
+      key: 'actions',
+      render: (_text: string, record: User) => (
+        <Button color="primary" size="sm" onClick={() => handleDeleteUser(record.id)}>
+          {t('users.btn.delete')}
+        </Button>
+      )
+    }
+  ];
+
+  return (
+    <>
+      {loading && !users ? (
+        <div className="text-center">{t('users.loadMsg')}</div>
+      ) : (
+        <>
+          {errors &&
+            errors.map(error => (
+              <div className="alert alert-danger" role="alert" key={error.field}>
+                {error.message}
+              </div>
+            ))}
+          <Table dataSource={users} columns={columns} />
+        </>
+      )}
+    </>
+  );
+};
+
+export default translate('user')(UsersView);
diff --git a/modules/user/client-react/containers/Profile.tsx b/modules/user/client-react/containers/Profile.tsx
new file mode 100644
index 0000000..09e4ed8
--- /dev/null
+++ b/modules/user/client-react/containers/Profile.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import ProfileView from '../components/ProfileView';
+import { User } from '..';
+
+interface ProfileProps {
+  currentUser: User;
+  currentUserLoading: boolean;
+  error: any;
+}
+
+const Profile: React.FunctionComponent<ProfileProps> = props => {
+  return <ProfileView {...props} />;
+};
+
+export default connect(({ user: { loading, currentUser } }: any) => {
+  return {
+    currentUser,
+    currentUserLoading: loading
+  };
+})(Profile);
diff --git a/modules/user/client-react/containers/UserAdd.tsx b/modules/user/client-react/containers/UserAdd.tsx
new file mode 100644
index 0000000..7718f8e
--- /dev/null
+++ b/modules/user/client-react/containers/UserAdd.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import { pick } from 'lodash';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+
+import UserAddView from '../components/UserAddView';
+import settings from '../../../../settings';
+import UserFormatter from '../helpers/UserFormatter';
+import { CommonProps as RNCommonProps } from '../index.native';
+import { User, CommonProps } from '..';
+import { ADD_USER } from '../actions';
+
+interface UserAddProps extends CommonProps, RNCommonProps {
+  addUser: (values: User) => void;
+}
+
+const UserAdd: React.FunctionComponent<UserAddProps> = props => {
+  const { addUser, t, history, navigation } = props;
+
+  const onSubmit = async (values: User) => {
+    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password']) as User;
+
+    userValues.profile = pick(values.profile, ['firstName', 'lastName']);
+
+    userValues = UserFormatter.trimExtraSpaces(userValues) as User;
+
+    if (settings.auth.certificate.enabled) {
+      userValues.auth = { certificate: pick(values.auth.certificate, 'serial') };
+    }
+
+    try {
+      await addUser(userValues);
+    } catch (e) {
+      throw new FormError(t('userAdd.errorMsg'), e);
+    }
+
+    if (history) {
+      return history.push('/users/');
+    }
+    if (navigation) {
+      return navigation.goBack();
+    }
+  };
+
+  return <UserAddView onSubmit={onSubmit} {...props} />;
+};
+
+export default compose(
+  translate('user'),
+  connect(
+    _state => ({}),
+    dispatch => ({
+      addUser: (values: User) =>
+        dispatch({
+          type: null,
+          request: () => ADD_USER(values)
+        })
+    })
+  )(UserAdd)
+);
diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/containers/UserEdit.tsx
new file mode 100644
index 0000000..aaffcc0
--- /dev/null
+++ b/modules/user/client-react/containers/UserEdit.tsx
@@ -0,0 +1,69 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import { pick } from 'lodash';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+import UserEditView from '../components/UserEditView';
+
+import UserFormatter from '../helpers/UserFormatter';
+import { User, CommonProps } from '..';
+import { CommonProps as RNCommonProps } from '../index.native';
+import { UserModuleState } from '../reducers';
+import { USER, EDIT_USER } from '../actions';
+
+interface UserEditProps extends CommonProps, RNCommonProps {
+  user: User;
+  editUser: (value: User) => void;
+  location: any;
+  match: any;
+  getUser?: (id: number) => void;
+}
+
+class UserEdit extends React.Component<UserEditProps> {
+  public componentDidMount() {
+    let id = 0;
+    if (this.props.match) {
+      id = this.props.match.params.id;
+    } else if (this.props.navigation) {
+      id = this.props.navigation.state.params.id;
+    }
+    this.props.getUser(Number(id));
+  }
+  public onSubmit = async (values: User) => {
+    const { user, editUser, t, navigation, history } = this.props;
+    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password']) as User;
+
+    userValues.profile = pick(values.profile, ['firstName', 'lastName']);
+
+    userValues = UserFormatter.trimExtraSpaces(userValues) as User;
+
+    try {
+      await editUser({ id: user.id, ...userValues });
+    } catch (e) {
+      throw new FormError(t('userEdit.errorMsg'), e);
+    }
+
+    if (history) {
+      return history.goBack();
+    }
+
+    if (navigation) {
+      return navigation.goBack();
+    }
+  };
+
+  public render() {
+    return <UserEditView onSubmit={this.onSubmit} {...this.props} />;
+  }
+}
+
+export default compose(
+  translate('user'),
+  connect(
+    ({ user }: UserModuleState) => ({
+      user
+    }),
+    { getUser: USER, editUser: EDIT_USER }
+  )(UserEdit)
+);
diff --git a/modules/user/client-react/containers/UserOperations.tsx b/modules/user/client-react/containers/UserOperations.tsx
new file mode 100644
index 0000000..c61951e
--- /dev/null
+++ b/modules/user/client-react/containers/UserOperations.tsx
@@ -0,0 +1,69 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { USERS, DELETE_USER } from '../actions';
+import { UserRole, OrderBy } from '..';
+
+const withUsers = (Component: React.ComponentType<any>) => {
+  class WithUsers extends React.Component<any> {
+    public state = {
+      ready: false
+    };
+
+    public async componentDidMount() {
+      const { getUsers, orderBy, filter } = this.props;
+      if (!this.state.ready) {
+        await getUsers(orderBy, filter);
+      }
+      this.setState({ ready: true });
+    }
+
+    public render() {
+      const { getUsers, ...props } = this.props;
+      return <Component {...props} />;
+    }
+  }
+  return connect(
+    ({ user: { loading, users } }: any) => ({
+      loading,
+      users
+    }),
+    { getUsers: USERS }
+  )(WithUsers);
+};
+
+const withUsersDeleting = (Component: React.ComponentType<any>) =>
+  connect(
+    null,
+    { deleteUser: DELETE_USER }
+  )(Component);
+
+const withSortAndFilter = (Component: React.ComponentType<any>) => {
+  const WithFilterUpdating: React.ComponentType<any> = ({ orderBy, filter, sortAndFilter, ...props }) => {
+    const onOrderBy = (_orderBy: OrderBy) => sortAndFilter(_orderBy, filter, 'SET_ORDER_BY');
+    const onSearchTextChange = (searchText: string) => sortAndFilter(orderBy, { ...filter, searchText }, 'SET_FILTER');
+    const onRoleChange = (role: UserRole) => sortAndFilter(orderBy, { ...filter, role }, 'SET_FILTER');
+    const onIsActiveChange = (isActive: boolean) => sortAndFilter(orderBy, { ...filter, isActive }, 'SET_FILTER');
+
+    return (
+      <Component
+        onIsActiveChange={onIsActiveChange}
+        onRoleChange={onRoleChange}
+        onSearchTextChange={onSearchTextChange}
+        onOrderBy={onOrderBy}
+        filter={filter}
+        orderBy={orderBy}
+        {...props}
+      />
+    );
+  };
+
+  return connect(
+    ({ user: { orderBy, filter } }: any) => ({
+      orderBy,
+      filter
+    }),
+    { sortAndFilter: USERS }
+  )(WithFilterUpdating);
+};
+
+export { withUsers, withUsersDeleting, withSortAndFilter };
diff --git a/modules/user/client-react/containers/Users.tsx b/modules/user/client-react/containers/Users.tsx
new file mode 100644
index 0000000..59469f9
--- /dev/null
+++ b/modules/user/client-react/containers/Users.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import Helmet from 'react-helmet';
+import { compose } from 'redux';
+import { Link } from 'react-router-dom';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { Button, PageLayout } from '@restapp/look-client-react';
+import settings from '../../../../settings';
+import UsersFilterView, { UsersFilterViewProps } from '../components/UsersFilterView';
+import UsersListView, { UsersViewProps } from '../components/UsersListView';
+import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
+
+interface UsersProps extends UsersViewProps, UsersFilterViewProps {}
+
+class Users extends React.Component<UsersProps> {
+  public renderMetaData = (t: TranslateFunction) => (
+    <Helmet
+      title={`${settings.app.name} - ${t('users.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('users.meta')}`
+        }
+      ]}
+    />
+  );
+  public render() {
+    const { t } = this.props;
+
+    return (
+      <PageLayout>
+        {this.renderMetaData(t)}
+        <h2>{t('users.list.title')}</h2>
+        <Link to="/users/new">
+          <Button color="primary">{t('users.btn.add')}</Button>
+        </Link>
+        <hr />
+        <UsersFilterView {...this.props} />
+        <hr />
+        <UsersListView {...this.props} />
+      </PageLayout>
+    );
+  }
+}
+
+export default compose(
+  withUsersDeleting,
+  withSortAndFilter,
+  withUsers
+)(translate('user')(Users));
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index bb9976d..5142a51 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -9,11 +9,15 @@ import { FormikErrors } from 'formik';
 
 import resources from './locales';
 import DataRootComponent from './containers/DataRootComponent';
-import Register from './containers/Register';
 import Login from './containers/Login';
+import Register from './containers/Register';
+import Users from './containers/Users';
+import UserEdit from './containers/UserEdit';
+import UserAdd from './containers/UserAdd';
+import Profile from './containers/Profile';
 import reducers from './reducers';
 
-import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLogout, WithLogoutProps } from './containers/Auth';
+import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLoadedUser, withLogout, WithLogoutProps } from './containers/Auth';
 
 export enum UserRole {
   admin = 'admin',
@@ -88,6 +92,10 @@ export interface Filter {
   isActive: boolean;
 }
 
+const ProfileName = withLoadedUser(({ currentUser }) => (
+  <>{currentUser ? currentUser.fullName || currentUser.username : null}</>
+));
+
 const LogoutLink = withRouter(withLogout(({ logout, history }: WithLogoutProps) => (
   <a
     href="javascript:void(0)"
@@ -106,6 +114,12 @@ const LogoutLink = withRouter(withLogout(({ logout, history }: WithLogoutProps)
 
 export * from './containers/Auth';
 
+const NavLinkUsersWithI18n = translate('user')(({ t }: any) => (
+  <NavLink to="/users" className="nav-link" activeClassName="active">
+    {t('navLink.users')}
+  </NavLink>
+));
+
 const NavLinkLoginWithI18n = translate('user')(({ t }: any) => (
   <NavLink to="/login" className="nav-link" activeClassName="active">
     {t('navLink.signIn')}
@@ -114,10 +128,28 @@ const NavLinkLoginWithI18n = translate('user')(({ t }: any) => (
 
 export default new ClientModule({
   route: [
-    <AuthRoute exact path="/register" redirectOnLoggedIn redirect="/profile" component={Register} />,
-    <AuthRoute exact path="/login" redirectOnLoggedIn redirect="/" component={Login} />
+    <AuthRoute exact path="/profile" role={[UserRole.user, UserRole.admin]} redirect="/login" component={Profile} />,
+    <AuthRoute exact path="/users" redirect="/profile" role={UserRole.admin} component={Users} />,
+    <AuthRoute exact path="/users/new" role={[UserRole.admin]} component={UserAdd} />,
+    <AuthRoute path="/users/:id" redirect="/profile" role={[UserRole.user, UserRole.admin]} component={UserEdit} />,
+    <AuthRoute exact path="/login" redirectOnLoggedIn redirect="/" component={Login} />,
+    <AuthRoute exact path="/register" redirectOnLoggedIn redirect="/profile" component={Register} />
+  ],
+  navItem: [
+    <IfLoggedIn key="/users" role={UserRole.admin}>
+      <MenuItem>
+        <NavLinkUsersWithI18n />
+      </MenuItem>
+    </IfLoggedIn>
   ],
   navItemRight: [
+    <IfLoggedIn key="/profile">
+      <MenuItem>
+        <NavLink to="/profile" className="nav-link" activeClassName="active">
+          <ProfileName />
+        </NavLink>
+      </MenuItem>
+    </IfLoggedIn>,
     <IfLoggedIn key="/logout">
       <MenuItem>
         <LogoutLink />
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index 7a015d0..61737b2 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -1,13 +1,15 @@
 import { User, OrderBy, Filter } from '..';
 
 export enum ActionType {
+  null = 'null',
   SET_CURRENT_USER = 'SET_CURRENT_USER',
   CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
   SET_LOADING = 'SET_LOADING',
   SET_USER = 'SET_USER',
   SET_USERS = 'SET_USERS',
   SET_ORDER_BY = 'SET_ORDER_BY',
-  SET_FILTER = 'SET_FILTER'
+  SET_FILTER = 'SET_FILTER',
+  DELETE_USER = 'DELETE_USER'
 }
 
 export interface UserModuleState {
@@ -32,7 +34,7 @@ const defaultState: UserModuleState = {
   user: null,
   users: [],
   orderBy: { column: '', order: '' },
-  filter: { searchText: '', role: null, isActive: true }
+  filter: { searchText: '', role: '', isActive: true }
 };
 
 export default function(state = defaultState, action: UserModuleActionProps) {
@@ -82,6 +84,13 @@ export default function(state = defaultState, action: UserModuleActionProps) {
         orderBy: action.payload && action.payload.orderBy
       };
 
+    case ActionType.DELETE_USER:
+      const users = state.users.filter(user => user.id !== action.payload.id);
+      return {
+        ...state,
+        users
+      };
+
     default:
       return state;
   }

From d9b694ebc58b6e90cfaafc970745402eae92c1e4 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Mon, 13 May 2019 16:12:13 +0300
Subject: [PATCH 046/104] Remove extra property in user conrtoller

---
 modules/user/server-ts/controllers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index c139a1e..ca243e2 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -19,7 +19,7 @@ const {
 export const user = async ({ params: { id }, user: identity, t }: any, res: any) => {
   if (+identity.id === +id || identity.role === 'admin') {
     try {
-      res.json({ user: await userDAO.getUser(id) });
+      res.json(await userDAO.getUser(id));
     } catch (e) {
       res.status(500).json({ errors: e });
     }

From be5a69e14950c6b8dba9eca5c04cd0686307ec9f Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 13 May 2019 18:11:17 +0300
Subject: [PATCH 047/104] Fix add and edit user

---
 modules/forms/client-react/FieldAdapter.jsx   |  1 +
 modules/user/client-react/actions/addUser.ts  |  2 +-
 modules/user/client-react/actions/editUser.ts |  3 +-
 .../client-react/components/ProfileView.tsx   |  4 +--
 .../user/client-react/components/UserForm.tsx | 23 +++++--------
 modules/user/client-react/containers/Auth.tsx |  2 +-
 .../user/client-react/containers/UserAdd.tsx  | 33 +++++--------------
 .../user/client-react/containers/UserEdit.tsx | 30 ++++++++---------
 modules/user/client-react/index.tsx           | 17 +++++++---
 9 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/modules/forms/client-react/FieldAdapter.jsx b/modules/forms/client-react/FieldAdapter.jsx
index fe55444..c513a23 100644
--- a/modules/forms/client-react/FieldAdapter.jsx
+++ b/modules/forms/client-react/FieldAdapter.jsx
@@ -46,6 +46,7 @@ class FieldAdapter extends Component {
   };
 
   onChangeText = value => {
+    console.log('TCL: FieldAdapter -> value', value);
     const { formik, onChangeText, onChange, name } = this.props;
     if (onChange && !onChangeText) {
       onChange(value);
diff --git a/modules/user/client-react/actions/addUser.ts b/modules/user/client-react/actions/addUser.ts
index a1e3082..fb9dff2 100644
--- a/modules/user/client-react/actions/addUser.ts
+++ b/modules/user/client-react/actions/addUser.ts
@@ -4,7 +4,7 @@ import { User } from '..';
 
 export default function ADD_USER(user: User) {
   return {
-    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
+    types: [null, null, null] as ActionType[],
     callAPI: () => axios.post(`${__API_URL__}/addUser`, { ...user })
   };
 }
diff --git a/modules/user/client-react/actions/editUser.ts b/modules/user/client-react/actions/editUser.ts
index 17300ff..3a12be0 100644
--- a/modules/user/client-react/actions/editUser.ts
+++ b/modules/user/client-react/actions/editUser.ts
@@ -1,9 +1,10 @@
 import axios from 'axios';
+import { ActionType } from '../reducers';
 import { User } from '..';
 
 export default function EDIT_USER(user: User) {
   return {
-    types: [null, null, null] as any,
+    types: [null, null, null] as ActionType[],
     callAPI: () => axios.post(`${__API_URL__}/editUser`, { ...user })
   };
 }
diff --git a/modules/user/client-react/components/ProfileView.tsx b/modules/user/client-react/components/ProfileView.tsx
index 04dab1f..89b1a21 100644
--- a/modules/user/client-react/components/ProfileView.tsx
+++ b/modules/user/client-react/components/ProfileView.tsx
@@ -54,10 +54,10 @@ const ProfileView: React.FunctionComponent<ProfileViewProps> = ({ currentUserLoa
               <CardTitle>{t('profile.card.group.role')}:</CardTitle>
               <CardText>{currentUser.role}</CardText>
             </CardGroup>
-            {currentUser.profile && currentUser.profile.fullName && (
+            {currentUser && currentUser.fullName && (
               <CardGroup>
                 <CardTitle>{t('profile.card.group.full')}:</CardTitle>
-                <CardText>{currentUser.profile.fullName}</CardText>
+                <CardText>{currentUser.fullName}</CardText>
               </CardGroup>
             )}
           </Card>
diff --git a/modules/user/client-react/components/UserForm.tsx b/modules/user/client-react/components/UserForm.tsx
index d713144..b6cd7fa 100644
--- a/modules/user/client-react/components/UserForm.tsx
+++ b/modules/user/client-react/components/UserForm.tsx
@@ -52,11 +52,12 @@ const UserForm: React.FunctionComponent<UserFormProps> = ({
   handleSubmit,
   errors,
   setFieldValue,
+
   t,
   shouldDisplayRole,
   shouldDisplayActive
 }) => {
-  const { username, email, role, isActive, profile, password, passwordConfirmation } = values;
+  const { username, email, role, isActive, lastName, firstName, password, passwordConfirmation } = values;
 
   return (
     <Form name="user" onSubmit={handleSubmit}>
@@ -86,7 +87,7 @@ const UserForm: React.FunctionComponent<UserFormProps> = ({
           component={RenderCheckBox}
           type="checkbox"
           label={t('userEdit.form.field.active')}
-          checked={isActive}
+          checked={!!isActive}
         />
       )}
       <Field
@@ -94,16 +95,14 @@ const UserForm: React.FunctionComponent<UserFormProps> = ({
         component={RenderField}
         type="text"
         label={t('userEdit.form.field.firstName')}
-        value={profile.firstName}
-        onChange={(value: string) => setFieldValue('profile', { ...profile, firstName: value })}
+        value={firstName}
       />
       <Field
         name="lastName"
         component={RenderField}
         type="text"
         label={t('userEdit.form.field.lastName')}
-        value={profile.lastName}
-        onChange={(value: string) => setFieldValue('profile', { ...profile, lastName: value })}
+        value={lastName}
       />
       <Field
         name="password"
@@ -129,7 +128,7 @@ const UserForm: React.FunctionComponent<UserFormProps> = ({
 
 const UserFormWithFormik = withFormik<FormikFormProps, FormValues>({
   mapPropsToValues: values => {
-    const { username, email, role, isActive, profile } = values.initialValues;
+    const { username, email, role, isActive, firstName, lastName, ...rest } = values.initialValues;
     return {
       username,
       email,
@@ -137,13 +136,9 @@ const UserFormWithFormik = withFormik<FormikFormProps, FormValues>({
       isActive,
       password: '',
       passwordConfirmation: '',
-      profile: {
-        firstName: profile && profile.firstName,
-        lastName: profile && profile.lastName
-      },
-      auth: {
-        ...values.initialValues.auth
-      }
+      firstName,
+      lastName,
+      ...rest
     };
   },
   async handleSubmit(values, { setErrors, props: { onSubmit } }) {
diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
index 08f7122..5879d16 100644
--- a/modules/user/client-react/containers/Auth.tsx
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -12,7 +12,7 @@ interface AuthRouteProps extends WithUserProps {
 }
 
 const AuthRoute: React.ComponentType<AuthRouteProps> = withLoadedUser(
-  ({ currentUser, role, redirect = '/register', redirectOnLoggedIn, component: Component, ...rest }) => {
+  ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, ...rest }) => {
     const RenderComponent: React.FunctionComponent<any> = props => {
       // The users is not logged in
       if (redirectOnLoggedIn && currentUser) {
diff --git a/modules/user/client-react/containers/UserAdd.tsx b/modules/user/client-react/containers/UserAdd.tsx
index 7718f8e..f05ffc4 100644
--- a/modules/user/client-react/containers/UserAdd.tsx
+++ b/modules/user/client-react/containers/UserAdd.tsx
@@ -1,39 +1,31 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { compose } from 'redux';
 import { pick } from 'lodash';
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import UserAddView from '../components/UserAddView';
-import settings from '../../../../settings';
 import UserFormatter from '../helpers/UserFormatter';
 import { CommonProps as RNCommonProps } from '../index.native';
 import { User, CommonProps } from '..';
 import { ADD_USER } from '../actions';
 
 interface UserAddProps extends CommonProps, RNCommonProps {
-  addUser: (values: User) => void;
+  addUser: (values: User) => any;
 }
 
 const UserAdd: React.FunctionComponent<UserAddProps> = props => {
   const { addUser, t, history, navigation } = props;
 
   const onSubmit = async (values: User) => {
-    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password']) as User;
+    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
 
-    userValues.profile = pick(values.profile, ['firstName', 'lastName']);
+    userValues = UserFormatter.trimExtraSpaces(userValues);
 
-    userValues = UserFormatter.trimExtraSpaces(userValues) as User;
+    const data = await addUser(userValues as User);
 
-    if (settings.auth.certificate.enabled) {
-      userValues.auth = { certificate: pick(values.auth.certificate, 'serial') };
-    }
-
-    try {
-      await addUser(userValues);
-    } catch (e) {
-      throw new FormError(t('userAdd.errorMsg'), e);
+    if (data && data.errors) {
+      throw new FormError(t('userAdd.errorMsg'), data);
     }
 
     if (history) {
@@ -47,16 +39,9 @@ const UserAdd: React.FunctionComponent<UserAddProps> = props => {
   return <UserAddView onSubmit={onSubmit} {...props} />;
 };
 
-export default compose(
-  translate('user'),
+export default translate('user')(
   connect(
-    _state => ({}),
-    dispatch => ({
-      addUser: (values: User) =>
-        dispatch({
-          type: null,
-          request: () => ADD_USER(values)
-        })
-    })
+    null,
+    { addUser: ADD_USER }
   )(UserAdd)
 );
diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/containers/UserEdit.tsx
index aaffcc0..f507885 100644
--- a/modules/user/client-react/containers/UserEdit.tsx
+++ b/modules/user/client-react/containers/UserEdit.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
-import { compose } from 'redux';
 import { pick } from 'lodash';
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
@@ -9,39 +8,39 @@ import UserEditView from '../components/UserEditView';
 import UserFormatter from '../helpers/UserFormatter';
 import { User, CommonProps } from '..';
 import { CommonProps as RNCommonProps } from '../index.native';
-import { UserModuleState } from '../reducers';
 import { USER, EDIT_USER } from '../actions';
 
 interface UserEditProps extends CommonProps, RNCommonProps {
   user: User;
-  editUser: (value: User) => void;
+  editUser: (value: User) => any;
   location: any;
   match: any;
   getUser?: (id: number) => void;
 }
 
 class UserEdit extends React.Component<UserEditProps> {
-  public componentDidMount() {
+  public state = { ready: false };
+  public async componentDidMount() {
     let id = 0;
     if (this.props.match) {
       id = this.props.match.params.id;
     } else if (this.props.navigation) {
       id = this.props.navigation.state.params.id;
     }
-    this.props.getUser(Number(id));
+    await this.props.getUser(Number(id));
+    this.setState({ ready: true });
   }
   public onSubmit = async (values: User) => {
     const { user, editUser, t, navigation, history } = this.props;
-    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password']) as User;
 
-    userValues.profile = pick(values.profile, ['firstName', 'lastName']);
+    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
 
-    userValues = UserFormatter.trimExtraSpaces(userValues) as User;
+    userValues = UserFormatter.trimExtraSpaces(userValues);
 
-    try {
-      await editUser({ id: user.id, ...userValues });
-    } catch (e) {
-      throw new FormError(t('userEdit.errorMsg'), e);
+    const data = await editUser({ id: user.id, ...userValues } as any);
+
+    if (data && data.errors) {
+      throw new FormError(t('userEdit.errorMsg'), data);
     }
 
     if (history) {
@@ -54,14 +53,13 @@ class UserEdit extends React.Component<UserEditProps> {
   };
 
   public render() {
-    return <UserEditView onSubmit={this.onSubmit} {...this.props} />;
+    return this.state.ready ? <UserEditView onSubmit={this.onSubmit} {...this.props} /> : null;
   }
 }
 
-export default compose(
-  translate('user'),
+export default translate('user')(
   connect(
-    ({ user }: UserModuleState) => ({
+    ({ user: { user } }: any) => ({
       user
     }),
     { getUser: USER, editUser: EDIT_USER }
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index 5142a51..0f05a53 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -24,20 +24,29 @@ export enum UserRole {
   user = 'user'
 }
 
-export interface UserProfile {
+interface Auth {
+  lnDisplayName: string;
+  lnId: string;
+  googleDisplayName: string;
+  googleId: string;
+  ghDisplayName: string;
+  ghId: string;
+  fbId: string;
+  fbDisplayName: string;
+}
+
+interface UserProfile {
   fullName?: string;
   firstName?: string;
   lastName?: string;
 }
 
-export interface User {
+export interface User extends UserProfile, Auth {
   id?: number | string;
   username: string;
   role: UserRole;
   isActive: boolean;
   email: string;
-  profile?: UserProfile;
-  auth?: any;
 }
 
 export interface LoginSubmitProps {

From 454c1294e0ffba3431b71936c5ff7e11822d5ef8 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 13 May 2019 18:31:55 +0300
Subject: [PATCH 048/104] Fix react-native user interface

---
 modules/user/client-react/index.native.tsx | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index b02615b..17a5369 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -24,20 +24,29 @@ export enum UserRole {
   user = 'user'
 }
 
-export interface UserProfile {
+interface Auth {
+  lnDisplayName: string;
+  lnId: string;
+  googleDisplayName: string;
+  googleId: string;
+  ghDisplayName: string;
+  ghId: string;
+  fbId: string;
+  fbDisplayName: string;
+}
+
+interface UserProfile {
   fullName?: string;
   firstName?: string;
   lastName?: string;
 }
 
-export interface User {
+export interface User extends UserProfile, Auth {
   id?: number | string;
   username: string;
   role: UserRole;
   isActive: boolean;
   email: string;
-  profile?: UserProfile;
-  auth?: any;
 }
 
 export interface NavigationOptionsProps {

From 9591392f69f69764977cc729a27db5c39537dd46 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 14 May 2019 11:26:47 +0300
Subject: [PATCH 049/104] Add try catch for form validations

---
 modules/authentication/client-react/access/jwt/index.ts  | 2 +-
 modules/user/client-react/containers/Login.native.tsx    | 6 ++++--
 modules/user/client-react/containers/Login.tsx           | 7 ++++---
 modules/user/client-react/containers/Register.native.tsx | 7 ++++---
 modules/user/client-react/containers/Register.tsx        | 7 ++++---
 modules/user/client-react/containers/UserAdd.tsx         | 7 ++++---
 modules/user/client-react/containers/UserEdit.tsx        | 7 ++++---
 7 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index d09af1e..72e1d21 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -54,7 +54,7 @@ const requestMiddleware: Middleware = ({ dispatch }) => next => action => {
         ...rest,
         payload: data
       });
-      return data;
+      throw e;
     }
   };
 
diff --git a/modules/user/client-react/containers/Login.native.tsx b/modules/user/client-react/containers/Login.native.tsx
index b4d0d44..0e2bc60 100644
--- a/modules/user/client-react/containers/Login.native.tsx
+++ b/modules/user/client-react/containers/Login.native.tsx
@@ -14,9 +14,11 @@ export interface LoginProps extends CommonProps {
 class Login extends React.Component<LoginProps> {
   public onSubmit = async (values: LoginSubmitProps) => {
     const { t, login } = this.props;
-    const data = await login(values);
 
-    if (data && data.errors) {
+    try {
+      await login(values);
+    } catch (e) {
+      const data = e.response && e.response.data;
       throw new FormError(t('reg.errorMsg'), data);
     }
 
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
index fb45fa9..dbfc77e 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/containers/Login.tsx
@@ -35,9 +35,10 @@ const Login: React.FunctionComponent<LoginProps> = props => {
   };
 
   const onSubmit = async (values: LoginSubmitProps) => {
-    const data = await login(values);
-
-    if (data && data.errors) {
+    try {
+      await login(values);
+    } catch (e) {
+      const data = e.response && e.response.data;
       throw new FormError(t('reg.errorMsg'), data);
     }
 
diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/containers/Register.native.tsx
index 3f99a63..936e58b 100644
--- a/modules/user/client-react/containers/Register.native.tsx
+++ b/modules/user/client-react/containers/Register.native.tsx
@@ -24,9 +24,10 @@ class Register extends React.Component<RegisterProps, RegisterState> {
   public onSubmit = async (values: RegisterSubmitProps) => {
     const { t, register, navigation } = this.props;
 
-    const data = await register(values);
-
-    if (data.errors) {
+    try {
+      await await register(values);
+    } catch (e) {
+      const data = e.response && e.response.data;
       throw new FormError(t('reg.errorMsg'), data);
     }
 
diff --git a/modules/user/client-react/containers/Register.tsx b/modules/user/client-react/containers/Register.tsx
index 4af4b22..5e10ed6 100644
--- a/modules/user/client-react/containers/Register.tsx
+++ b/modules/user/client-react/containers/Register.tsx
@@ -19,9 +19,10 @@ const Register: React.FunctionComponent<RegisterProps> = props => {
   const [isRegistered, setIsRegistered] = React.useState(false);
 
   const onSubmit = async (values: RegisterSubmitProps) => {
-    const data = await register(values);
-
-    if (data.errors) {
+    try {
+      await await register(values);
+    } catch (e) {
+      const data = e.response && e.response.data;
       throw new FormError(t('reg.errorMsg'), data);
     }
 
diff --git a/modules/user/client-react/containers/UserAdd.tsx b/modules/user/client-react/containers/UserAdd.tsx
index f05ffc4..7c571f7 100644
--- a/modules/user/client-react/containers/UserAdd.tsx
+++ b/modules/user/client-react/containers/UserAdd.tsx
@@ -22,9 +22,10 @@ const UserAdd: React.FunctionComponent<UserAddProps> = props => {
 
     userValues = UserFormatter.trimExtraSpaces(userValues);
 
-    const data = await addUser(userValues as User);
-
-    if (data && data.errors) {
+    try {
+      await addUser(userValues as User);
+    } catch (e) {
+      const data = e.response && e.response.data;
       throw new FormError(t('userAdd.errorMsg'), data);
     }
 
diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/containers/UserEdit.tsx
index f507885..95e04d2 100644
--- a/modules/user/client-react/containers/UserEdit.tsx
+++ b/modules/user/client-react/containers/UserEdit.tsx
@@ -37,9 +37,10 @@ class UserEdit extends React.Component<UserEditProps> {
 
     userValues = UserFormatter.trimExtraSpaces(userValues);
 
-    const data = await editUser({ id: user.id, ...userValues } as any);
-
-    if (data && data.errors) {
+    try {
+      await editUser({ id: user.id, ...userValues } as any);
+    } catch (e) {
+      const data = e.response && e.response.data;
       throw new FormError(t('userEdit.errorMsg'), data);
     }
 

From 2cbb16733979c124d38fe24785ac462a2cb91059 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 14 May 2019 11:39:10 +0300
Subject: [PATCH 050/104] Add check for accessMiddleware

---
 modules/module/server-ts/ServerModule.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/module/server-ts/ServerModule.ts b/modules/module/server-ts/ServerModule.ts
index 056aec7..4592690 100644
--- a/modules/module/server-ts/ServerModule.ts
+++ b/modules/module/server-ts/ServerModule.ts
@@ -103,7 +103,7 @@ class ServerModule extends CommonModule {
       return (app: Express, modules: ServerModule) => {
         const handlers = [];
 
-        if (isAuthRoute) {
+        if (isAuthRoute && modules.accessMiddleware) {
           handlers.push(modules.accessMiddleware);
         }
         if (!isEmpty(middleware)) {

From 658c71c4b6365aca68a3cbba25619becf902af32 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 14 May 2019 12:23:54 +0300
Subject: [PATCH 051/104] Add forgot and reset password conrtollers

---
 .../user/server-ts/password/controllers.ts    | 75 +++++++++++++++++++
 modules/user/server-ts/password/index.ts      | 16 +++-
 2 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 584360f..429c573 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -90,3 +90,78 @@ export const register = async ({ body, t }: any, res: any) => {
 
   res.json(user);
 };
+
+export const forgotPassword = async ({ body, t }: any, res: any) => {
+  try {
+    const localAuth = pick(body, 'email');
+    const identity = (await userDAO.getUserByEmail(localAuth.email)) as UserShape;
+
+    if (identity && mailer) {
+      // async email
+      jwt.sign(
+        { email: identity.email, passwordHash: identity.passwordHash },
+        secret,
+        { expiresIn: '1d' },
+        (err, emailToken) => {
+          // encoded token since react router does not match dots in params
+          const encodedToken = Buffer.from(emailToken).toString('base64');
+          const url = `${__WEBSITE_URL__}/reset-password/${encodedToken}`;
+          mailer.sendMail({
+            from: `${app.name} <${process.env.EMAIL_USER}>`,
+            to: identity.email,
+            subject: 'Reset Password',
+            html: emailTemplate.passwordReset(url)
+          });
+          log.info(`Sent link to reset email to: ${identity.email}`);
+        }
+      );
+      res.send(t('user:auth.password.forgotPassword'));
+    }
+  } catch (e) {
+    res.send(e);
+  }
+};
+
+export const resetPassword = async ({ body, t }: any, res: any) => {
+  const errors: ValidationErrors = {};
+  const reset = pick(body, ['password', 'passwordConfirmation', 'token']);
+
+  if (reset.password !== reset.passwordConfirmation) {
+    errors.password = t('user:auth.password.passwordsIsNotMatch');
+  }
+
+  if (reset.password.length < password.minLength) {
+    errors.password = t('user:auth.password.passwordLength', { length: password.minLength });
+  }
+
+  if (!isEmpty(errors)) {
+    return res.status(422).send({
+      message: 'Failed reset password',
+      ...errors
+    });
+  }
+
+  const token = Buffer.from(reset.token, 'base64').toString();
+  const { email, passwordHash } = jwt.verify(token, secret) as UserShape;
+  const identity = (await userDAO.getUserByEmail(email)) as UserShape;
+
+  if (identity.passwordHash !== passwordHash) {
+    throw res.status(401).send(t('user:auth.password.invalidToken'));
+  }
+
+  if (identity) {
+    await userDAO.updatePassword(identity.id, reset.password);
+    const url = `${__WEBSITE_URL__}/profile`;
+    res.send(t('user:auth.password.resestPassword'));
+
+    if (mailer && password.sendPasswordChangesEmail) {
+      mailer.sendMail({
+        from: `${app.name} <${process.env.EMAIL_USER}>`,
+        to: identity.email,
+        subject: 'Your Password Has Been Updated',
+        html: emailTemplate.passwordUpdated(url)
+      });
+      log.info(`Sent password has been updated to: ${identity.email}`);
+    }
+  }
+};
diff --git a/modules/user/server-ts/password/index.ts b/modules/user/server-ts/password/index.ts
index 0a5db44..4c3f2bf 100644
--- a/modules/user/server-ts/password/index.ts
+++ b/modules/user/server-ts/password/index.ts
@@ -2,7 +2,7 @@ import bcrypt from 'bcryptjs';
 
 import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 
-import { register, login } from './controllers';
+import { login, register, forgotPassword, resetPassword } from './controllers';
 import settings from '../../../../settings';
 
 export const createPasswordHash = (pswd: string) => bcrypt.hash(pswd, 12);
@@ -10,6 +10,11 @@ export const createPasswordHash = (pswd: string) => bcrypt.hash(pswd, 12);
 export default (settings.auth.password.enabled
   ? new ServerModule({
       apiRouteParams: [
+        {
+          method: RestMethod.POST,
+          route: 'login',
+          controller: login
+        },
         {
           method: RestMethod.POST,
           route: 'register',
@@ -17,8 +22,13 @@ export default (settings.auth.password.enabled
         },
         {
           method: RestMethod.POST,
-          route: 'login',
-          controller: login
+          route: 'forgotPassword',
+          controller: forgotPassword
+        },
+        {
+          method: RestMethod.POST,
+          route: 'resetPassword',
+          controller: resetPassword
         }
       ]
     })

From 42970ec773355f8f6a77a0b1fcba7223dce68cb5 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 14 May 2019 13:25:34 +0300
Subject: [PATCH 052/104] Moved passport loging middleware to auth module

---
 .../server-ts/access/jwt/index.ts             | 32 ++++++++++++++-
 .../server-ts/access/session/index.ts         | 33 ++++++++++++++-
 modules/user/server-ts/index.ts               |  2 +-
 .../user/server-ts/password/controllers.ts    | 40 +++++++------------
 4 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
index 1856e91..7430eb7 100644
--- a/modules/authentication/server-ts/access/jwt/index.ts
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -29,15 +29,36 @@ const grant = async (identity: any, req: any, passwordHash: string = '') => {
   };
 };
 
+const loginMiddleware = (req: any, res: any, next: any) => {
+  passport.authenticate('local', { session: settings.auth.session.enabled }, (err, user, info) => {
+    if (err || !user) {
+      return res.status(400).json({
+        errors: {
+          message: info ? info.message : 'Login failed'
+        }
+      });
+    }
+
+    req.login(user, { session: settings.auth.session.enabled }, async (loginErr: any) => {
+      if (loginErr) {
+        res.send(loginErr);
+      }
+      const tokens = settings.auth.jwt.enabled ? await grant(user, req, user.passwordHash) : null;
+
+      return res.json({ user, tokens });
+    });
+  })(req, res, next);
+};
+
 const onAppCreate = ({ appContext }: AccessModule) => {
   passport.use(
     new LocalStratery({ usernameField: 'usernameOrEmail' }, async (username: string, password: string, done: any) => {
-      const { identity, message } = await appContext.user.validateLogin(username, password);
+      const { user, message } = await appContext.user.validateLogin(username, password);
 
       if (message) {
         return done(null, false, { message });
       }
-      return done(null, identity);
+      return done(null, user);
     })
   );
 
@@ -54,11 +75,18 @@ const onAppCreate = ({ appContext }: AccessModule) => {
   );
 };
 
+const jwtAppContext = {
+  auth: {
+    loginMiddleware
+  }
+};
+
 export default (settings.auth.jwt.enabled
   ? new AccessModule({
       beforeware: [beforeware],
       onAppCreate: [onAppCreate],
       grant: [grant],
+      appContext: jwtAppContext,
       apiRouteParams: [
         {
           method: RestMethod.POST,
diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
index bbeda25..78f438f 100644
--- a/modules/authentication/server-ts/access/session/index.ts
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -5,6 +5,7 @@ import passport from 'passport';
 
 import { RestMethod } from '@restapp/module-server-ts';
 
+import { access } from '../../';
 import settings from '../../../../../settings';
 import AccessModule from '../AccessModule';
 import { logout } from './controllers';
@@ -28,6 +29,27 @@ const beforeware = (app: Express) => {
 const accessMiddleware = (req: Request, res: Response, next: any) =>
   req.isAuthenticated() ? next() : res.send('unauthorized');
 
+const loginMiddleware = (req: any, res: any, next: any) => {
+  passport.authenticate('local', { session: settings.auth.session.enabled }, (err, user, info) => {
+    if (err || !user) {
+      return res.status(400).json({
+        errors: {
+          message: info ? info.message : 'Login failed'
+        }
+      });
+    }
+
+    req.login(user, { session: settings.auth.session.enabled }, async (loginErr: any) => {
+      if (loginErr) {
+        res.send(loginErr);
+      }
+      const tokens = settings.auth.jwt.enabled ? await access.grantAccess(user, req, user.passwordHash) : null;
+
+      return res.json({ user, tokens });
+    });
+  })(req, res, next);
+};
+
 const onAppCreate = ({ appContext }: AccessModule) => {
   passport.serializeUser((identity: { id: number }, cb) => {
     cb(null, identity.id);
@@ -40,21 +62,28 @@ const onAppCreate = ({ appContext }: AccessModule) => {
 
   passport.use(
     new Strategy({ usernameField: 'usernameOrEmail' }, async (username: string, password: string, done: any) => {
-      const { identity, message } = await appContext.user.validateLogin(username, password);
+      const { user, message } = await appContext.user.validateLogin(username, password);
 
       if (message) {
         return done(null, false, { message });
       }
-      return done(null, identity);
+      return done(null, user);
     })
   );
 };
 
+const sessionAppContext = {
+  auth: {
+    loginMiddleware
+  }
+};
+
 export default (settings.auth.session.enabled
   ? new AccessModule({
       beforeware: [beforeware],
       onAppCreate: [onAppCreate],
       accessMiddleware,
+      appContext: sessionAppContext,
       apiRouteParams: [
         {
           method: RestMethod.POST,
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index 8f675ed..404b7ab 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -37,7 +37,7 @@ const validateLogin = async (usernameOrEmail: string, pswd: string) => {
     return { message: i18n.t('user:auth.password.validPassword') };
   }
 
-  return { identity };
+  return { user: identity };
 };
 
 const appContext = {
diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 429c573..27405c1 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -1,8 +1,6 @@
 import { UserShape } from './../sql';
 import { pick, isEmpty } from 'lodash';
 import jwt from 'jsonwebtoken';
-import passport from 'passport';
-import { access } from '@restapp/authentication-server-ts';
 import { log } from '@restapp/core-common';
 import { mailer } from '@restapp/mailer-server-ts';
 
@@ -13,29 +11,19 @@ import emailTemplate from '../emailTemplate';
 import { createPasswordHash } from '.';
 
 const {
-  auth: { session, jwt: jwtSetting, password, secret },
+  auth: { passwordSettings, secret },
   app
 } = settings;
 
-export const login = (req: any, res: any, next: any) => {
-  passport.authenticate('local', { session: session.enabled }, (err, user, info) => {
-    if (err || !user) {
-      return res.status(400).json({
-        errors: {
-          message: info ? info.message : 'Login failed'
-        }
-      });
-    }
+export const login = async (req: any, res: any, next: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { usernameOrEmail, password } = req.body;
 
-    req.login(user, { session: session.enabled }, async (loginErr: any) => {
-      if (loginErr) {
-        res.send(loginErr);
-      }
-      const tokens = jwtSetting.enabled ? await access.grantAccess(user, req, user.passwordHash) : null;
-
-      return res.json({ user, tokens });
-    });
-  })(req, res, next);
+  appContext.auth && appContext.auth.loginMiddleware
+    ? res.locals.appContext.auth.loginMiddleware(req, res, next)
+    : res.json(await appContext.user.validateLogin(usernameOrEmail, password));
 };
 
 export const register = async ({ body, t }: any, res: any) => {
@@ -62,7 +50,7 @@ export const register = async ({ body, t }: any, res: any) => {
   let userId = 0;
   if (!emailExists) {
     const passwordHash = await createPasswordHash(body.password);
-    const isActive = !password.requireEmailConfirmation;
+    const isActive = !passwordSettings.requireEmailConfirmation;
     [userId] = await userDAO.register({ ...body, isActive }, passwordHash);
 
     // if user has previously logged with facebook auth
@@ -73,7 +61,7 @@ export const register = async ({ body, t }: any, res: any) => {
 
   const user = (await userDAO.getUser(userId)) as UserShape;
 
-  if (mailer && password.requireEmailConfirmation && !emailExists) {
+  if (mailer && passwordSettings.requireEmailConfirmation && !emailExists) {
     // async email
     jwt.sign({ identity: pick(user, 'id') }, secret, { expiresIn: '1d' }, (err, emailToken) => {
       const encodedToken = Buffer.from(emailToken).toString('base64');
@@ -130,8 +118,8 @@ export const resetPassword = async ({ body, t }: any, res: any) => {
     errors.password = t('user:auth.password.passwordsIsNotMatch');
   }
 
-  if (reset.password.length < password.minLength) {
-    errors.password = t('user:auth.password.passwordLength', { length: password.minLength });
+  if (reset.password.length < passwordSettings.minLength) {
+    errors.password = t('user:auth.password.passwordLength', { length: passwordSettings.minLength });
   }
 
   if (!isEmpty(errors)) {
@@ -154,7 +142,7 @@ export const resetPassword = async ({ body, t }: any, res: any) => {
     const url = `${__WEBSITE_URL__}/profile`;
     res.send(t('user:auth.password.resestPassword'));
 
-    if (mailer && password.sendPasswordChangesEmail) {
+    if (mailer && passwordSettings.sendPasswordChangesEmail) {
       mailer.sendMail({
         from: `${app.name} <${process.env.EMAIL_USER}>`,
         to: identity.email,

From 7e85182656ae94673c9fdb071c55c6c1393dd40f Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Tue, 14 May 2019 15:20:43 +0300
Subject: [PATCH 053/104] Update session accessMiddleware response

---
 modules/authentication/server-ts/access/session/index.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
index 78f438f..a1a226c 100644
--- a/modules/authentication/server-ts/access/session/index.ts
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -27,7 +27,13 @@ const beforeware = (app: Express) => {
 };
 
 const accessMiddleware = (req: Request, res: Response, next: any) =>
-  req.isAuthenticated() ? next() : res.send('unauthorized');
+  req.isAuthenticated()
+    ? next()
+    : res.send({
+        errors: {
+          message: 'unauthorized'
+        }
+      });
 
 const loginMiddleware = (req: any, res: any, next: any) => {
   passport.authenticate('local', { session: settings.auth.session.enabled }, (err, user, info) => {

From aedd4fad327c581ec0064efd8e0b055bbb412202 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 14 May 2019 17:54:25 +0300
Subject: [PATCH 054/104] Add common redux middleware for async operation and
 middleware in jwt module

---
 config/auth.js                                |  2 +-
 .../client-react/access/jwt/index.ts          | 80 +++++++------------
 modules/core/common/createReduxStore.ts       | 43 +++++++++-
 modules/forms/client-react/FieldAdapter.jsx   |  1 -
 modules/user/client-react/actions/users.ts    |  4 +-
 .../user/client-react/containers/AuthBase.tsx |  4 +-
 .../containers/DataRootComponent.tsx          |  7 +-
 modules/user/client-react/reducers/index.ts   |  6 +-
 8 files changed, 81 insertions(+), 66 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index 61fe596..5371613 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -4,7 +4,7 @@ export default {
     enabled: true
   },
   jwt: {
-    enabled: true,
+    enabled: false,
     tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index 72e1d21..8a2184c 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -23,66 +23,42 @@ const removeTokens = async () => {
   await removeItem(TokensEnum.refreshToken);
 };
 
-const requestMiddleware: Middleware = ({ dispatch }) => next => action => {
-  const { types, callAPI, ...rest } = action;
-
-  if (!types) {
-    return next(action);
+const refreshAccessToken = async () => {
+  try {
+    const { data } = await axios.post(`${__API_URL__}/refreshToken`, {
+      refreshToken: await getItem('refreshToken')
+    });
+    if (data) {
+      const { accessToken, refreshToken } = data;
+      await saveTokens({ accessToken, refreshToken });
+    } else {
+      await removeTokens();
+    }
+  } catch (e) {
+    await removeTokens();
+    throw e;
   }
+};
 
-  const [REQUEST, SUCCESS, FAIL] = types;
-
-  next({ type: REQUEST, ...rest });
+const reduxMiddleware: Middleware = ({ dispatch }) => next => action => {
+  const { types, callAPI, status, ...rest } = action;
 
-  const handleCallApi = async () => {
+  (async () => {
     try {
-      const result = await client(callAPI);
-      const data = result && result.data;
-      next({
-        type: SUCCESS,
-        ...rest,
-        payload: data
-      });
-      return data;
-    } catch (e) {
-      if (e.response && e.response.status === 401) {
-        return dispatch(action);
+      if (status === 401) {
+        await refreshAccessToken();
+        const newAction = { ...action, status: null };
+        return dispatch(newAction);
       }
-      const data = e.response && e.response.data;
+      return next(action);
+    } catch (e) {
       next({
-        type: FAIL,
-        ...rest,
-        payload: data
+        type: types.FAIL,
+        ...rest
       });
       throw e;
     }
-  };
-
-  return handleCallApi();
-};
-
-const client = async (request: () => Promise<any>) => {
-  try {
-    return await request();
-  } catch (e) {
-    if (e.response && e.response.status === 401) {
-      try {
-        const { data } = await axios.post(`${__API_URL__}/refreshToken`, {
-          refreshToken: await getItem('refreshToken')
-        });
-        if (data) {
-          const { accessToken, refreshToken } = data;
-          await saveTokens({ accessToken, refreshToken });
-        } else {
-          await removeTokens();
-        }
-      } catch (e) {
-        await removeTokens();
-        throw e;
-      }
-    }
-    throw e;
-  }
+  })();
 };
 
 axios.interceptors.request.use(async config => {
@@ -116,6 +92,6 @@ axios.interceptors.response.use(async (res: any) => {
 export default (settings.auth.jwt.enabled
   ? new AccessModule({
       logout: [removeTokens],
-      reduxMiddleware: [requestMiddleware]
+      reduxMiddleware: [reduxMiddleware]
     })
   : undefined);
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 643425e..53824c8 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -8,6 +8,47 @@ export const getStoreReducer = (reducers: any) =>
     ...reducers
   });
 
+const requestMiddleware: Middleware = _state => next => action => {
+  const { types, callAPI, ...rest } = action;
+
+  if (!types) {
+    return next(action);
+  }
+
+  const [REQUEST, SUCCESS, FAIL] = types;
+
+  next({ type: REQUEST, ...rest });
+
+  const handleCallApi = async () => {
+    try {
+      const result = await callAPI();
+      const data = result && result.data;
+      if (data.errors) {
+        throw { response: result };
+      }
+      next({
+        type: SUCCESS,
+        ...rest,
+        payload: data
+      });
+      return data;
+    } catch (e) {
+      if (e.response && e.response.status === 401) {
+        return next({ ...action, status: e.response.status });
+      }
+      const data = e.response && e.response.data;
+      next({
+        type: FAIL,
+        ...rest,
+        payload: data
+      });
+      throw e;
+    }
+  };
+
+  return handleCallApi();
+};
+
 const createReduxStore = (
   reducers: Reducer,
   initialState: DeepPartial<any>,
@@ -18,7 +59,7 @@ const createReduxStore = (
     const routerMiddlewares = routerMiddleware ? [routerMiddleware] : [];
     const reduxMiddleware = reduxMiddlewares && reduxMiddlewares.length ? reduxMiddlewares : [];
 
-    return [...routerMiddlewares, ...reduxMiddleware];
+    return [...routerMiddlewares, requestMiddleware, ...reduxMiddleware];
   };
   return createStore(
     getStoreReducer(reducers),
diff --git a/modules/forms/client-react/FieldAdapter.jsx b/modules/forms/client-react/FieldAdapter.jsx
index c513a23..fe55444 100644
--- a/modules/forms/client-react/FieldAdapter.jsx
+++ b/modules/forms/client-react/FieldAdapter.jsx
@@ -46,7 +46,6 @@ class FieldAdapter extends Component {
   };
 
   onChangeText = value => {
-    console.log('TCL: FieldAdapter -> value', value);
     const { formik, onChangeText, onChange, name } = this.props;
     if (onChange && !onChangeText) {
       onChange(value);
diff --git a/modules/user/client-react/actions/users.ts b/modules/user/client-react/actions/users.ts
index 2fa3b2a..92975d7 100644
--- a/modules/user/client-react/actions/users.ts
+++ b/modules/user/client-react/actions/users.ts
@@ -2,9 +2,9 @@ import axios from 'axios';
 import { ActionType } from '../reducers';
 import { OrderBy, Filter } from '..';
 
-export default function USERS(orderBy: OrderBy, filter: Filter, type = 'null') {
+export default function USERS(orderBy: OrderBy, filter: Filter, type?: ActionType) {
   return {
-    types: [ActionType[type], ActionType.SET_USERS, null],
+    types: [type ? ActionType[type] : null, ActionType.SET_USERS, null],
     payload: { orderBy, filter },
     callAPI: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
   };
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index 7cf99d9..087535d 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -29,9 +29,7 @@ export interface WithLogoutProps extends WithUserProps {
 }
 
 const withUser = (Component: React.ComponentType<any>) => {
-  const WithUser = ({ currentUser, ...rest }: WithUserProps) => {
-    return <Component currentUser={currentUser} {...rest} />;
-  };
+  const WithUser = ({ currentUser, ...rest }: WithUserProps) => <Component currentUser={currentUser} {...rest} />;
   return connect(({ user: { loading, currentUser } }: any) => ({
     currentUserLoading: loading,
     currentUser
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index 62eac81..6482aaf 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -6,6 +6,7 @@ import Loading from '../components/Loading';
 import { UserModuleState } from '../reducers';
 import { CURRENT_USER } from '../actions';
 import { User } from '..';
+import setting from '../../../../settings';
 
 interface DataRootComponent {
   currentUser: User;
@@ -18,8 +19,10 @@ const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({ current
 
   React.useEffect(() => {
     (async () => {
-      if (!ready && (await getItem('refreshToken')) && !currentUser) {
-        await getCurrentUser();
+      if (!ready && !currentUser && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
+        try {
+          await getCurrentUser();
+        } catch (e) {}
       }
       setReady(true);
     })();
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index 61737b2..22ef04c 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -1,7 +1,6 @@
 import { User, OrderBy, Filter } from '..';
 
 export enum ActionType {
-  null = 'null',
   SET_CURRENT_USER = 'SET_CURRENT_USER',
   CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
   SET_LOADING = 'SET_LOADING',
@@ -49,12 +48,11 @@ export default function(state = defaultState, action: UserModuleActionProps) {
       return {
         ...state,
         currentUser: null,
-        loading: false,
-        ...action.payload
+        loading: false
       };
 
     case ActionType.SET_CURRENT_USER:
-      const currentUser = action.payload.errors ? null : (action.payload.user && action.payload) || action.payload;
+      const currentUser = action.payload && action.payload.errors ? null : action.payload.user || action.payload;
       return {
         ...state,
         currentUser,

From 5b16e3f5f5f4d1b4298f2447d825d11c59224258 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 14 May 2019 18:01:40 +0300
Subject: [PATCH 055/104] removed extra features

---
 .../containers/DataRootComponent.native.tsx        | 14 +++++---------
 .../client-react/containers/DataRootComponent.tsx  | 14 +++++---------
 .../user/client-react/containers/Login.native.tsx  |  6 ++----
 .../user/client-react/containers/Logout.native.tsx |  2 +-
 modules/user/client-react/containers/Profile.tsx   |  1 -
 .../client-react/containers/Register.native.tsx    |  6 ++----
 modules/user/client-react/containers/UserAdd.tsx   | 10 ++++------
 modules/user/client-react/containers/UserEdit.tsx  | 14 ++++++--------
 8 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/modules/user/client-react/containers/DataRootComponent.native.tsx b/modules/user/client-react/containers/DataRootComponent.native.tsx
index 160963c..d2d476b 100644
--- a/modules/user/client-react/containers/DataRootComponent.native.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.native.tsx
@@ -30,13 +30,9 @@ class DataRootComponent extends React.Component<DataRootComponent> {
   }
 }
 
-const mapState = ({ currentUser }: UserModuleState) => ({
-  currentUser
-});
-
-const withConnect = connect(
-  mapState,
+export default connect(
+  ({ currentUser }: UserModuleState) => ({
+    currentUser
+  }),
   { getCurrentUser: CURRENT_USER }
-);
-
-export default withConnect(DataRootComponent);
+)(DataRootComponent);
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index 6482aaf..d535ef4 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -30,13 +30,9 @@ const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({ current
   return ready ? children : <Loading />;
 };
 
-const mapState = ({ currentUser }: UserModuleState) => ({
-  currentUser
-});
-
-const withConnect = connect(
-  mapState,
+export default connect(
+  ({ currentUser }: UserModuleState) => ({
+    currentUser
+  }),
   { getCurrentUser: CURRENT_USER }
-);
-
-export default withConnect(DataRootComponent);
+)(DataRootComponent);
diff --git a/modules/user/client-react/containers/Login.native.tsx b/modules/user/client-react/containers/Login.native.tsx
index 0e2bc60..06f1543 100644
--- a/modules/user/client-react/containers/Login.native.tsx
+++ b/modules/user/client-react/containers/Login.native.tsx
@@ -29,9 +29,7 @@ class Login extends React.Component<LoginProps> {
   }
 }
 
-const withConnect = connect(
+export default connect(
   null,
   { login: LOGIN }
-);
-
-export default translate('user')(withConnect(Login));
+)(translate('user')(Login));
diff --git a/modules/user/client-react/containers/Logout.native.tsx b/modules/user/client-react/containers/Logout.native.tsx
index bdc21d3..56d7931 100644
--- a/modules/user/client-react/containers/Logout.native.tsx
+++ b/modules/user/client-react/containers/Logout.native.tsx
@@ -29,4 +29,4 @@ const LogoutView = ({ logout, t }: LogoutViewProps) => {
   );
 };
 
-export default translate('user')(withLogout(LogoutView));
+export default withLogout(translate('user')(LogoutView));
diff --git a/modules/user/client-react/containers/Profile.tsx b/modules/user/client-react/containers/Profile.tsx
index 09e4ed8..76802ca 100644
--- a/modules/user/client-react/containers/Profile.tsx
+++ b/modules/user/client-react/containers/Profile.tsx
@@ -6,7 +6,6 @@ import { User } from '..';
 interface ProfileProps {
   currentUser: User;
   currentUserLoading: boolean;
-  error: any;
 }
 
 const Profile: React.FunctionComponent<ProfileProps> = props => {
diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/containers/Register.native.tsx
index 936e58b..b40e01a 100644
--- a/modules/user/client-react/containers/Register.native.tsx
+++ b/modules/user/client-react/containers/Register.native.tsx
@@ -54,9 +54,7 @@ class Register extends React.Component<RegisterProps, RegisterState> {
   }
 }
 
-const withConnect = connect(
+export default connect(
   null,
   { register: REGISTER }
-);
-
-export default translate('user')(withConnect(Register));
+)(translate('user')(Register));
diff --git a/modules/user/client-react/containers/UserAdd.tsx b/modules/user/client-react/containers/UserAdd.tsx
index 7c571f7..d682bc1 100644
--- a/modules/user/client-react/containers/UserAdd.tsx
+++ b/modules/user/client-react/containers/UserAdd.tsx
@@ -40,9 +40,7 @@ const UserAdd: React.FunctionComponent<UserAddProps> = props => {
   return <UserAddView onSubmit={onSubmit} {...props} />;
 };
 
-export default translate('user')(
-  connect(
-    null,
-    { addUser: ADD_USER }
-  )(UserAdd)
-);
+export default connect(
+  null,
+  { addUser: ADD_USER }
+)(translate('user')(UserAdd));
diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/containers/UserEdit.tsx
index 95e04d2..54a1536 100644
--- a/modules/user/client-react/containers/UserEdit.tsx
+++ b/modules/user/client-react/containers/UserEdit.tsx
@@ -58,11 +58,9 @@ class UserEdit extends React.Component<UserEditProps> {
   }
 }
 
-export default translate('user')(
-  connect(
-    ({ user: { user } }: any) => ({
-      user
-    }),
-    { getUser: USER, editUser: EDIT_USER }
-  )(UserEdit)
-);
+export default connect(
+  ({ user: { user } }: any) => ({
+    user
+  }),
+  { getUser: USER, editUser: EDIT_USER }
+)(translate('user')(UserEdit));

From 4e6c08f7cc26703962e11523d10eacbb6424efd6 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 14 May 2019 18:04:00 +0300
Subject: [PATCH 056/104] Reaname callAPI to APICall

---
 modules/authentication/client-react/access/jwt/index.ts | 2 +-
 modules/core/common/createReduxStore.ts                 | 8 ++++----
 modules/user/client-react/actions/addUser.ts            | 2 +-
 modules/user/client-react/actions/currentUser.ts        | 2 +-
 modules/user/client-react/actions/deleteUser.ts         | 2 +-
 modules/user/client-react/actions/editUser.ts           | 2 +-
 modules/user/client-react/actions/login.ts              | 2 +-
 modules/user/client-react/actions/register.ts           | 2 +-
 modules/user/client-react/actions/user.ts               | 2 +-
 modules/user/client-react/actions/users.ts              | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index 8a2184c..e76810a 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -41,7 +41,7 @@ const refreshAccessToken = async () => {
 };
 
 const reduxMiddleware: Middleware = ({ dispatch }) => next => action => {
-  const { types, callAPI, status, ...rest } = action;
+  const { types, status, ...rest } = action;
 
   (async () => {
     try {
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 53824c8..36b96bd 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -9,7 +9,7 @@ export const getStoreReducer = (reducers: any) =>
   });
 
 const requestMiddleware: Middleware = _state => next => action => {
-  const { types, callAPI, ...rest } = action;
+  const { types, APICall, ...rest } = action;
 
   if (!types) {
     return next(action);
@@ -19,9 +19,9 @@ const requestMiddleware: Middleware = _state => next => action => {
 
   next({ type: REQUEST, ...rest });
 
-  const handleCallApi = async () => {
+  const handleAPICall = async () => {
     try {
-      const result = await callAPI();
+      const result = await APICall();
       const data = result && result.data;
       if (data.errors) {
         throw { response: result };
@@ -46,7 +46,7 @@ const requestMiddleware: Middleware = _state => next => action => {
     }
   };
 
-  return handleCallApi();
+  return handleAPICall();
 };
 
 const createReduxStore = (
diff --git a/modules/user/client-react/actions/addUser.ts b/modules/user/client-react/actions/addUser.ts
index fb9dff2..c8e95b7 100644
--- a/modules/user/client-react/actions/addUser.ts
+++ b/modules/user/client-react/actions/addUser.ts
@@ -5,6 +5,6 @@ import { User } from '..';
 export default function ADD_USER(user: User) {
   return {
     types: [null, null, null] as ActionType[],
-    callAPI: () => axios.post(`${__API_URL__}/addUser`, { ...user })
+    APICall: () => axios.post(`${__API_URL__}/addUser`, { ...user })
   };
 }
diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
index dab1a55..34bd4e5 100644
--- a/modules/user/client-react/actions/currentUser.ts
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -4,6 +4,6 @@ import { ActionType } from '../reducers';
 export default function CURRENT_USER() {
   return {
     types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
-    callAPI: () => axios.get(`${__API_URL__}/currentUser`)
+    APICall: () => axios.get(`${__API_URL__}/currentUser`)
   };
 }
diff --git a/modules/user/client-react/actions/deleteUser.ts b/modules/user/client-react/actions/deleteUser.ts
index 3a9a2d9..19e69f6 100644
--- a/modules/user/client-react/actions/deleteUser.ts
+++ b/modules/user/client-react/actions/deleteUser.ts
@@ -4,6 +4,6 @@ import { ActionType } from '../reducers';
 export default function DELETE_USER(id: number) {
   return {
     types: [null, ActionType.DELETE_USER, null] as ActionType[],
-    callAPI: () => axios.delete(`${__API_URL__}/deleteUser`, { data: { id } })
+    APICall: () => axios.delete(`${__API_URL__}/deleteUser`, { data: { id } })
   };
 }
diff --git a/modules/user/client-react/actions/editUser.ts b/modules/user/client-react/actions/editUser.ts
index 3a12be0..d8818e4 100644
--- a/modules/user/client-react/actions/editUser.ts
+++ b/modules/user/client-react/actions/editUser.ts
@@ -5,6 +5,6 @@ import { User } from '..';
 export default function EDIT_USER(user: User) {
   return {
     types: [null, null, null] as ActionType[],
-    callAPI: () => axios.post(`${__API_URL__}/editUser`, { ...user })
+    APICall: () => axios.post(`${__API_URL__}/editUser`, { ...user })
   };
 }
diff --git a/modules/user/client-react/actions/login.ts b/modules/user/client-react/actions/login.ts
index d0c5544..cbaa74f 100644
--- a/modules/user/client-react/actions/login.ts
+++ b/modules/user/client-react/actions/login.ts
@@ -5,6 +5,6 @@ import { ActionType } from '../reducers';
 export default function LOGIN(value: LoginSubmitProps) {
   return {
     types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
-    callAPI: () => axios.post(`${__API_URL__}/login`, { ...value })
+    APICall: () => axios.post(`${__API_URL__}/login`, { ...value })
   };
 }
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index 461a872..5a2686e 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -4,6 +4,6 @@ import { RegisterSubmitProps } from '..';
 export default function REGISTER(value: RegisterSubmitProps) {
   return {
     types: [null, null, null] as any,
-    callAPI: () => axios.post(`${__API_URL__}/register`, { ...value })
+    APICall: () => axios.post(`${__API_URL__}/register`, { ...value })
   };
 }
diff --git a/modules/user/client-react/actions/user.ts b/modules/user/client-react/actions/user.ts
index f6754b1..3047bdf 100644
--- a/modules/user/client-react/actions/user.ts
+++ b/modules/user/client-react/actions/user.ts
@@ -4,6 +4,6 @@ import { ActionType } from '../reducers';
 export default function USER(id: number) {
   return {
     types: [null, ActionType.SET_USER, null],
-    callAPI: () => axios.get(`${__API_URL__}/user/${id}`)
+    APICall: () => axios.get(`${__API_URL__}/user/${id}`)
   };
 }
diff --git a/modules/user/client-react/actions/users.ts b/modules/user/client-react/actions/users.ts
index 92975d7..8c7c851 100644
--- a/modules/user/client-react/actions/users.ts
+++ b/modules/user/client-react/actions/users.ts
@@ -6,6 +6,6 @@ export default function USERS(orderBy: OrderBy, filter: Filter, type?: ActionTyp
   return {
     types: [type ? ActionType[type] : null, ActionType.SET_USERS, null],
     payload: { orderBy, filter },
-    callAPI: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
+    APICall: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
   };
 }

From f58a58e1e89ebfe156a3cfc57305edd20cbcf6cf Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 15 May 2019 08:42:05 +0300
Subject: [PATCH 057/104] Fix prew commit

---
 modules/user/client-react/containers/Login.native.tsx    | 4 ++--
 modules/user/client-react/containers/Login.tsx           | 2 +-
 modules/user/client-react/containers/Logout.native.tsx   | 2 +-
 modules/user/client-react/containers/Register.native.tsx | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/user/client-react/containers/Login.native.tsx b/modules/user/client-react/containers/Login.native.tsx
index 06f1543..99aba46 100644
--- a/modules/user/client-react/containers/Login.native.tsx
+++ b/modules/user/client-react/containers/Login.native.tsx
@@ -8,7 +8,7 @@ import { CommonProps, LoginSubmitProps } from '../index.native';
 import { LOGIN } from '../actions';
 
 export interface LoginProps extends CommonProps {
-  login: (values: LoginSubmitProps) => Promise<void> | any;
+  login?: (values: LoginSubmitProps) => Promise<void> | any;
 }
 
 class Login extends React.Component<LoginProps> {
@@ -29,7 +29,7 @@ class Login extends React.Component<LoginProps> {
   }
 }
 
-export default connect(
+export default connect<{}, {}, LoginProps>(
   null,
   { login: LOGIN }
 )(translate('user')(Login));
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
index dbfc77e..e9b5c5e 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/containers/Login.tsx
@@ -10,7 +10,7 @@ import { CommonProps, LoginSubmitProps } from '..';
 import { LOGIN } from '../actions';
 
 export interface LoginProps extends CommonProps {
-  login: (values: LoginSubmitProps) => any;
+  login?: (values: LoginSubmitProps) => any;
 }
 
 const Login: React.FunctionComponent<LoginProps> = props => {
diff --git a/modules/user/client-react/containers/Logout.native.tsx b/modules/user/client-react/containers/Logout.native.tsx
index 56d7931..bdc21d3 100644
--- a/modules/user/client-react/containers/Logout.native.tsx
+++ b/modules/user/client-react/containers/Logout.native.tsx
@@ -29,4 +29,4 @@ const LogoutView = ({ logout, t }: LogoutViewProps) => {
   );
 };
 
-export default withLogout(translate('user')(LogoutView));
+export default translate('user')(withLogout(LogoutView));
diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/containers/Register.native.tsx
index b40e01a..c16f1a6 100644
--- a/modules/user/client-react/containers/Register.native.tsx
+++ b/modules/user/client-react/containers/Register.native.tsx
@@ -9,7 +9,7 @@ import { REGISTER } from '../actions';
 import { CommonProps, RegisterSubmitProps } from '../index.native';
 
 interface RegisterProps extends CommonProps {
-  register: (values: RegisterSubmitProps) => any;
+  register?: (values: RegisterSubmitProps) => any;
 }
 
 interface RegisterState {
@@ -54,7 +54,7 @@ class Register extends React.Component<RegisterProps, RegisterState> {
   }
 }
 
-export default connect(
+export default connect<{}, {}, RegisterProps>(
   null,
   { register: REGISTER }
 )(translate('user')(Register));

From a099c753ee63d6d24f71492ad59b6e04cebb738f Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Wed, 15 May 2019 10:30:55 +0300
Subject: [PATCH 058/104] Update controllers with identity check

---
 modules/user/server-ts/controllers.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index ca243e2..1c9dd15 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -17,7 +17,7 @@ const {
 } = settings;
 
 export const user = async ({ params: { id }, user: identity, t }: any, res: any) => {
-  if (+identity.id === +id || identity.role === 'admin') {
+  if ((identity && +identity.id === +id) || identity.role === 'admin') {
     try {
       res.json(await userDAO.getUser(id));
     } catch (e) {
@@ -27,14 +27,15 @@ export const user = async ({ params: { id }, user: identity, t }: any, res: any)
     res.status(401).send(t('user:accessDenied'));
   }
 };
+
 export const users = async ({ body: { orderBy, filter }, user: identity, t }: any, res: any) => {
-  identity.role === 'admin'
+  true // identity && identity.role === 'admin'
     ? res.json(await userDAO.getUsers(orderBy, filter))
     : res.status(401).send(t('user:accessDenied'));
 };
 
 export const currentUser = async ({ user: identity }: any, res: any) => {
-  if (identity.id) {
+  if (identity && identity.id) {
     res.json(await userDAO.getUser(identity.id));
   } else {
     res.send(null);
@@ -42,7 +43,7 @@ export const currentUser = async ({ user: identity }: any, res: any) => {
 };
 
 export const addUser = async ({ body, user: identity, t }: any, res: any) => {
-  if (identity.role !== 'admin') {
+  if (identity && identity.role !== 'admin') {
     return res.status(401).send(t('user:accessDenied'));
   }
   const errors: ValidationErrors = {};
@@ -117,8 +118,8 @@ export const addUser = async ({ body, user: identity, t }: any, res: any) => {
 };
 
 export const editUser = async ({ user: identity, body, t }: any, res: any) => {
-  const isAdmin = () => identity.role === 'admin';
-  const isSelf = () => +identity.id === +body.id;
+  const isAdmin = () => identity && identity.role === 'admin';
+  const isSelf = () => identity && +identity.id === +body.id;
 
   if (!isSelf() && !isAdmin()) {
     return res.status(401).send(t('user:accessDenied'));
@@ -192,8 +193,8 @@ export const editUser = async ({ user: identity, body, t }: any, res: any) => {
 };
 
 export const deleteUser = async ({ user: identity, body: { id }, t }: any, res: any) => {
-  const isAdmin = () => identity.role === 'admin';
-  const isSelf = () => +identity.id === +id;
+  const isAdmin = () => identity && identity.role === 'admin';
+  const isSelf = () => identity && +identity.id === +id;
 
   const userData = await userDAO.getUser(id);
   if (!userData) {

From b3ec2b177996d3a4f813d61acd1cb6d112ade788 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Wed, 15 May 2019 10:32:07 +0300
Subject: [PATCH 059/104] Remove table auth_certificate from migrations

---
 modules/user/server-ts/migrations/002_user.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/user/server-ts/migrations/002_user.js b/modules/user/server-ts/migrations/002_user.js
index d60f829..6719073 100644
--- a/modules/user/server-ts/migrations/002_user.js
+++ b/modules/user/server-ts/migrations/002_user.js
@@ -21,17 +21,6 @@ exports.up = function(knex, Promise) {
         .onDelete('CASCADE');
       table.timestamps(false, true);
     }),
-    knex.schema.createTable('auth_certificate', table => {
-      table.increments();
-      table.string('serial').unique();
-      table
-        .integer('user_id')
-        .unsigned()
-        .references('id')
-        .inTable('user')
-        .onDelete('CASCADE');
-      table.timestamps(false, true);
-    }),
     knex.schema.createTable('auth_facebook', table => {
       table.increments();
       table.string('fb_id').unique();

From 8095418856b6ddd256f11f192dc4e7aa907e9d0c Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Wed, 15 May 2019 10:36:07 +0300
Subject: [PATCH 060/104] Fix typo in user conrtollers

---
 modules/user/server-ts/controllers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index 1c9dd15..290e247 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -29,7 +29,7 @@ export const user = async ({ params: { id }, user: identity, t }: any, res: any)
 };
 
 export const users = async ({ body: { orderBy, filter }, user: identity, t }: any, res: any) => {
-  true // identity && identity.role === 'admin'
+  identity && identity.role === 'admin'
     ? res.json(await userDAO.getUsers(orderBy, filter))
     : res.status(401).send(t('user:accessDenied'));
 };

From c63245bea8315a747ffb272c72f3f033bff5124e Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 15 May 2019 11:17:20 +0300
Subject: [PATCH 061/104] Add reset and forgot password components

---
 .../client-react/actions/forgotPassword.ts    |  10 ++
 modules/user/client-react/actions/index.ts    |  16 ++-
 .../client-react/actions/resetPassword.ts     |  14 ++
 .../components/ForgotPasswordForm.native.tsx  | 129 ++++++++++++++++++
 .../components/ForgotPasswordForm.tsx         |  63 +++++++++
 .../components/ForgotPasswordView.native.tsx  |  30 ++++
 .../components/ForgotPasswordView.tsx         |  38 ++++++
 .../components/ResetPasswordForm.native.tsx   |  82 +++++++++++
 .../components/ResetPasswordForm.tsx          |  63 +++++++++
 .../components/ResetPasswordView.native.tsx   |  25 ++++
 .../components/ResetPasswordView.tsx          |  34 +++++
 .../containers/ForgotPassword.native.tsx      |  39 ++++++
 .../containers/ForgotPassword.tsx             |  35 +++++
 .../containers/ResetPassword.native.tsx       |  36 +++++
 .../client-react/containers/ResetPassword.tsx |  37 +++++
 15 files changed, 650 insertions(+), 1 deletion(-)
 create mode 100644 modules/user/client-react/actions/forgotPassword.ts
 create mode 100644 modules/user/client-react/actions/resetPassword.ts
 create mode 100644 modules/user/client-react/components/ForgotPasswordForm.native.tsx
 create mode 100644 modules/user/client-react/components/ForgotPasswordForm.tsx
 create mode 100644 modules/user/client-react/components/ForgotPasswordView.native.tsx
 create mode 100644 modules/user/client-react/components/ForgotPasswordView.tsx
 create mode 100644 modules/user/client-react/components/ResetPasswordForm.native.tsx
 create mode 100644 modules/user/client-react/components/ResetPasswordForm.tsx
 create mode 100644 modules/user/client-react/components/ResetPasswordView.native.tsx
 create mode 100644 modules/user/client-react/components/ResetPasswordView.tsx
 create mode 100644 modules/user/client-react/containers/ForgotPassword.native.tsx
 create mode 100644 modules/user/client-react/containers/ForgotPassword.tsx
 create mode 100644 modules/user/client-react/containers/ResetPassword.native.tsx
 create mode 100644 modules/user/client-react/containers/ResetPassword.tsx

diff --git a/modules/user/client-react/actions/forgotPassword.ts b/modules/user/client-react/actions/forgotPassword.ts
new file mode 100644
index 0000000..88104ea
--- /dev/null
+++ b/modules/user/client-react/actions/forgotPassword.ts
@@ -0,0 +1,10 @@
+import axios from 'axios';
+import { ForgotPasswordSubmitProps } from '..';
+import { ActionType } from '../reducers';
+
+export default function FORGOT_PASSWORD(value: ForgotPasswordSubmitProps) {
+  return {
+    types: [null, null, null] as ActionType[],
+    APICall: () => axios.post(`${__API_URL__}/forgotPassword`, { value })
+  };
+}
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 7dace9f..7e91e58 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -7,5 +7,19 @@ import USER from './user';
 import DELETE_USER from './deleteUser';
 import EDIT_USER from './editUser';
 import ADD_USER from './addUser';
+import RESET_PASSWORD from './resetPassword';
+import FORGOT_PASSWORD from './forgotPassword';
 
-export { REGISTER, LOGIN, CURRENT_USER, CLEAR_USER, USERS, USER, DELETE_USER, EDIT_USER, ADD_USER };
+export {
+  REGISTER,
+  LOGIN,
+  CURRENT_USER,
+  CLEAR_USER,
+  USERS,
+  USER,
+  DELETE_USER,
+  EDIT_USER,
+  ADD_USER,
+  RESET_PASSWORD,
+  FORGOT_PASSWORD
+};
diff --git a/modules/user/client-react/actions/resetPassword.ts b/modules/user/client-react/actions/resetPassword.ts
new file mode 100644
index 0000000..ad5982c
--- /dev/null
+++ b/modules/user/client-react/actions/resetPassword.ts
@@ -0,0 +1,14 @@
+import axios from 'axios';
+import { ResetPasswordSubmitProps } from '..';
+import { ActionType } from '../reducers';
+
+interface ResetPasswordProps extends ResetPasswordSubmitProps {
+  token: string;
+}
+
+export default function RESET_PASSWORD(value: ResetPasswordProps) {
+  return {
+    types: [null, null, null] as ActionType[],
+    APICall: () => axios.post(`${__API_URL__}/resetPassword`, { ...value })
+  };
+}
diff --git a/modules/user/client-react/components/ForgotPasswordForm.native.tsx b/modules/user/client-react/components/ForgotPasswordForm.native.tsx
new file mode 100644
index 0000000..5ba5502
--- /dev/null
+++ b/modules/user/client-react/components/ForgotPasswordForm.native.tsx
@@ -0,0 +1,129 @@
+import * as React from 'react';
+import { withFormik, FormikProps } from 'formik';
+import { FontAwesome } from '@expo/vector-icons';
+import { View, StyleSheet, Text, Keyboard } from 'react-native';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { RenderField, Button, primary } from '@restapp/look-client-react-native';
+import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
+import { required, email, validate } from '@restapp/validation-common-react';
+import { translate } from '@restapp/i18n-client-react';
+import { CommonProps, FormProps, ForgotPasswordSubmitProps } from '../index.native';
+
+interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
+  sent: boolean;
+}
+
+const forgotPasswordFormSchema = {
+  email: [required, email]
+};
+
+const ForgotPasswordForm: React.FunctionComponent<ForgotPasswordFormProps & FormikProps<ForgotPasswordSubmitProps>> = ({
+  handleSubmit,
+  values,
+  sent,
+  t
+}) => {
+  return (
+    <View style={styles.formContainer}>
+      <View style={styles.alertContainer}>
+        {sent && (
+          <View style={styles.alertWrapper}>
+            <View style={styles.alertIconWrapper}>
+              <FontAwesome name="check-circle" size={30} style={{ color: '#155724' }} />
+            </View>
+            <View style={styles.alertTextWrapper}>
+              <Text style={styles.alertText}>{t('forgotPass.form.submitMsg')}</Text>
+            </View>
+          </View>
+        )}
+      </View>
+      <View style={styles.form}>
+        <View>
+          <Field
+            name="email"
+            component={RenderField}
+            type="email"
+            placeholder={t('forgotPass.form.fldEmail')}
+            value={values.email}
+            keyboardType="email-address"
+            placeholderTextColor={placeholderColor}
+          />
+        </View>
+        <View style={styles.submit}>
+          <Button type={primary} onPress={handleSubmit}>
+            {t('forgotPass.form.btnSubmit')}
+          </Button>
+        </View>
+      </View>
+      <KeyboardSpacer />
+    </View>
+  );
+};
+
+const ForgotPasswordFormWithFormik = withFormik<ForgotPasswordFormProps, ForgotPasswordSubmitProps>({
+  enableReinitialize: true,
+  mapPropsToValues: () => ({ email: '' }),
+  async handleSubmit(values, { setErrors, resetForm, props: { onSubmit } }) {
+    Keyboard.dismiss();
+    await onSubmit(values)
+      .then(() => {
+        resetForm();
+      })
+      .catch((e: any) => {
+        if (e && e.errors) {
+          setErrors(e.errors);
+        } else {
+          throw e;
+        }
+      });
+  },
+  validate: values => validate(values, forgotPasswordFormSchema),
+  displayName: 'ForgotPasswordForm' // helps with React DevTools
+});
+
+const styles = StyleSheet.create({
+  submit,
+  formContainer: {
+    flex: 1,
+    alignItems: 'stretch',
+    justifyContent: 'center',
+    paddingHorizontal: 20
+  },
+  form: {
+    flex: 2
+  },
+  alertWrapper: {
+    backgroundColor: '#d4edda',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    borderRadius: 5,
+    paddingVertical: 10
+  },
+  alertContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'stretch'
+  },
+  alertTextWrapper: {
+    padding: 5,
+    flex: 20,
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  alertIconWrapper: {
+    padding: 5,
+    flex: 4,
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  alertText: {
+    color: '#155724',
+    fontSize: 20,
+    fontWeight: '400'
+  }
+});
+
+export default translate('user')(ForgotPasswordFormWithFormik(ForgotPasswordForm));
diff --git a/modules/user/client-react/components/ForgotPasswordForm.tsx b/modules/user/client-react/components/ForgotPasswordForm.tsx
new file mode 100644
index 0000000..ef7cabb
--- /dev/null
+++ b/modules/user/client-react/components/ForgotPasswordForm.tsx
@@ -0,0 +1,63 @@
+import * as React from 'react';
+import { withFormik, FormikProps } from 'formik';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate } from '@restapp/i18n-client-react';
+import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
+import { required, email, validate } from '@restapp/validation-common-react';
+
+import { CommonProps, FormProps, ForgotPasswordSubmitProps } from '..';
+
+interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
+  sent: boolean;
+}
+
+const forgotPasswordFormSchema = {
+  email: [required, email]
+};
+
+const ForgotPasswordForm: React.FunctionComponent<ForgotPasswordFormProps & FormikProps<ForgotPasswordSubmitProps>> = ({
+  handleSubmit,
+  errors,
+  sent,
+  values,
+  t
+}) => {
+  return (
+    <Form name="forgotPassword" onSubmit={handleSubmit}>
+      {sent && <Alert color="success">{t('forgotPass.form.submitMsg')}</Alert>}
+      <Field
+        name="email"
+        component={RenderField}
+        type="email"
+        label={t('forgotPass.form.fldEmail')}
+        value={values.email}
+      />
+      <div className="text-center">
+        {errors && errors.message && <Alert color="error">{errors.message}</Alert>}
+        <Button color="primary" type="submit">
+          {t('forgotPass.form.btnSubmit')}
+        </Button>
+      </div>
+    </Form>
+  );
+};
+
+const ForgotPasswordFormWithFormik = withFormik<ForgotPasswordFormProps, ForgotPasswordSubmitProps>({
+  enableReinitialize: true,
+  mapPropsToValues: () => ({ email: '' }),
+  async handleSubmit(values, { setErrors, resetForm, props: { onSubmit } }) {
+    await onSubmit(values)
+      .then(() => resetForm())
+      .catch((e: any) => {
+        if (e && e.errors) {
+          setErrors(e.errors);
+        } else {
+          throw e;
+        }
+      });
+  },
+  validate: values => validate(values, forgotPasswordFormSchema),
+  displayName: 'ForgotPasswordForm' // helps with React DevTools
+});
+
+export default translate('user')(ForgotPasswordFormWithFormik(ForgotPasswordForm));
diff --git a/modules/user/client-react/components/ForgotPasswordView.native.tsx b/modules/user/client-react/components/ForgotPasswordView.native.tsx
new file mode 100644
index 0000000..8e180ac
--- /dev/null
+++ b/modules/user/client-react/components/ForgotPasswordView.native.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react';
+import { StyleSheet, View } from 'react-native';
+import ForgotPasswordForm from './ForgotPasswordForm.native';
+import { ForgotPasswordSubmitProps } from '../index.native';
+
+interface ForgotPasswordViewProps {
+  onSubmit: (values: ForgotPasswordSubmitProps) => void;
+  sent: boolean;
+}
+
+class ForgotPasswordView extends React.PureComponent<ForgotPasswordViewProps> {
+  public render() {
+    const { onSubmit, sent } = this.props;
+    return (
+      <View style={styles.forgotPassContainer}>
+        <ForgotPasswordForm onSubmit={onSubmit} sent={sent} />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  forgotPassContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'stretch'
+  }
+});
+
+export default ForgotPasswordView;
diff --git a/modules/user/client-react/components/ForgotPasswordView.tsx b/modules/user/client-react/components/ForgotPasswordView.tsx
new file mode 100644
index 0000000..dff5d02
--- /dev/null
+++ b/modules/user/client-react/components/ForgotPasswordView.tsx
@@ -0,0 +1,38 @@
+import * as React from 'react';
+import Helmet from 'react-helmet';
+import { LayoutCenter, PageLayout } from '@restapp/look-client-react';
+
+import ForgotPasswordForm from '../components/ForgotPasswordForm';
+import settings from '../../../../settings';
+import { CommonProps, ForgotPasswordSubmitProps } from '..';
+
+interface ForgotPasswordViewProps extends CommonProps {
+  onSubmit: (values: ForgotPasswordSubmitProps) => void;
+  sent: boolean;
+}
+
+const ForgotPasswordView: React.FunctionComponent<ForgotPasswordViewProps> = ({ onSubmit, t, sent }) => {
+  const renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - ${t('forgotPass.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('forgotPass.meta')}`
+        }
+      ]}
+    />
+  );
+
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      <LayoutCenter>
+        <h1 className="text-center">{t('forgotPass.form.title')}</h1>
+        <ForgotPasswordForm onSubmit={onSubmit} sent={sent} />
+      </LayoutCenter>
+    </PageLayout>
+  );
+};
+
+export default ForgotPasswordView;
diff --git a/modules/user/client-react/components/ResetPasswordForm.native.tsx b/modules/user/client-react/components/ResetPasswordForm.native.tsx
new file mode 100644
index 0000000..cabc400
--- /dev/null
+++ b/modules/user/client-react/components/ResetPasswordForm.native.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { withFormik, FormikProps } from 'formik';
+import { View, StyleSheet } from 'react-native';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate } from '@restapp/i18n-client-react';
+
+import { RenderField, Button, primary } from '@restapp/look-client-react-native';
+import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
+import { required, minLength, validate, match } from '@restapp/validation-common-react';
+import settings from '../../../../settings';
+import { CommonProps, FormProps, ResetPasswordSubmitProps } from '../index.native';
+
+interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
+
+const resetPasswordFormSchema = {
+  password: [required, minLength(settings.auth.password.minLength)],
+  passwordConfirmation: [match('password'), required, minLength(settings.auth.password.minLength)]
+};
+
+const ResetPasswordForm: React.FunctionComponent<ResetPasswordFormProps & FormikProps<ResetPasswordSubmitProps>> = ({
+  values,
+  handleSubmit,
+  t
+}) => {
+  return (
+    <View style={styles.formContainer}>
+      <Field
+        name="password"
+        component={RenderField}
+        type="password"
+        label={t('resetPass.form.field.pass')}
+        value={values.password}
+        secureTextEntry={true}
+        placeholderTextColor={placeholderColor}
+      />
+      <Field
+        name="passwordConfirmation"
+        component={RenderField}
+        type="password"
+        label={t('resetPass.form.field.passConf')}
+        value={values.passwordConfirmation}
+        secureTextEntry={true}
+        placeholderTextColor={placeholderColor}
+      />
+      <View style={styles.submit}>
+        <Button type={primary} onPress={handleSubmit}>
+          {t('resetPass.form.btnSubmit')}
+        </Button>
+      </View>
+      <KeyboardSpacer />
+    </View>
+  );
+};
+
+const ResetPasswordFormWithFormik = withFormik<ResetPasswordFormProps, ResetPasswordSubmitProps>({
+  enableReinitialize: true,
+  mapPropsToValues: () => ({ password: '', passwordConfirmation: '' }),
+  async handleSubmit(values, { setErrors, resetForm, props: { onSubmit } }) {
+    await onSubmit(values)
+      .then(() => resetForm())
+      .catch((e: any) => {
+        if (e && e.errors) {
+          setErrors(e.errors);
+        } else {
+          throw e;
+        }
+      });
+  },
+  validate: values => validate(values, resetPasswordFormSchema),
+  displayName: 'LoginForm' // helps with React DevTools
+});
+
+const styles = StyleSheet.create({
+  submit,
+  formContainer: {
+    paddingHorizontal: 20,
+    justifyContent: 'center'
+  }
+});
+
+export default translate('user')(ResetPasswordFormWithFormik(ResetPasswordForm));
diff --git a/modules/user/client-react/components/ResetPasswordForm.tsx b/modules/user/client-react/components/ResetPasswordForm.tsx
new file mode 100644
index 0000000..94330d0
--- /dev/null
+++ b/modules/user/client-react/components/ResetPasswordForm.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { withFormik, FormikProps } from 'formik';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate } from '@restapp/i18n-client-react';
+import { required, minLength, validate, match } from '@restapp/validation-common-react';
+import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
+import settings from '../../../../settings';
+import { CommonProps, FormProps, ResetPasswordSubmitProps } from '..';
+
+interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
+
+const resetPasswordFormSchema = {
+  password: [required, minLength(settings.auth.password.minLength)],
+  passwordConfirmation: [match('password'), required, minLength(settings.auth.password.minLength)]
+};
+
+const ResetPasswordForm: React.FunctionComponent<ResetPasswordFormProps & FormikProps<ResetPasswordSubmitProps>> = ({
+  values,
+  handleSubmit,
+  errors,
+  t
+}) => (
+  <Form name="resetPassword" onSubmit={handleSubmit}>
+    <Field
+      name="password"
+      component={RenderField}
+      type="password"
+      label={t('resetPass.form.field.pass')}
+      value={values.password}
+    />
+    <Field
+      name="passwordConfirmation"
+      component={RenderField}
+      type="password"
+      label={t('resetPass.form.field.passConf')}
+      value={values.passwordConfirmation}
+    />
+    {errors && errors.message && <Alert color="error">{errors.message}</Alert>}
+    <Button color="primary" type="submit">
+      {t('resetPass.form.btnSubmit')}
+    </Button>
+  </Form>
+);
+
+const ResetPasswordFormWithFormik = withFormik<ResetPasswordFormProps, ResetPasswordSubmitProps>({
+  enableReinitialize: true,
+  mapPropsToValues: () => ({ password: '', passwordConfirmation: '' }),
+  async handleSubmit(values, { setErrors, resetForm, props: { onSubmit } }) {
+    await onSubmit(values)
+      .then(() => resetForm())
+      .catch((e: any) => {
+        if (e && e.errors) {
+          setErrors(e.errors);
+        } else {
+          throw e;
+        }
+      });
+  },
+  validate: values => validate(values, resetPasswordFormSchema),
+  displayName: 'LoginForm' // helps with React DevTools
+});
+
+export default translate('user')(ResetPasswordFormWithFormik(ResetPasswordForm));
diff --git a/modules/user/client-react/components/ResetPasswordView.native.tsx b/modules/user/client-react/components/ResetPasswordView.native.tsx
new file mode 100644
index 0000000..6c594ff
--- /dev/null
+++ b/modules/user/client-react/components/ResetPasswordView.native.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+
+import ResetPasswordForm from '../components/ResetPasswordForm.native';
+import { ResetPasswordSubmitProps } from '../index.native';
+
+interface ResetPasswordViewProps {
+  onSubmit: (values: ResetPasswordSubmitProps) => void;
+}
+
+const ResetPasswordView: React.FunctionComponent<ResetPasswordViewProps> = ({ onSubmit }) => (
+  <View style={styles.container}>
+    <ResetPasswordForm onSubmit={onSubmit} />
+  </View>
+);
+
+const styles = StyleSheet.create({
+  container: {
+    justifyContent: 'center',
+    alignItems: 'stretch',
+    flex: 1
+  }
+});
+
+export default ResetPasswordView;
diff --git a/modules/user/client-react/components/ResetPasswordView.tsx b/modules/user/client-react/components/ResetPasswordView.tsx
new file mode 100644
index 0000000..b5886aa
--- /dev/null
+++ b/modules/user/client-react/components/ResetPasswordView.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import { PageLayout } from '@restapp/look-client-react';
+import ResetPasswordForm from '../components/ResetPasswordForm';
+import { CommonProps, ResetPasswordSubmitProps } from '..';
+import settings from '../../../../settings';
+
+interface ResetPasswordViewProps extends CommonProps {
+  onSubmit: (values: ResetPasswordSubmitProps) => void;
+}
+
+const ResetPasswordView: React.FunctionComponent<ResetPasswordViewProps> = ({ t, onSubmit }) => {
+  const renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - ${t('resetPass.title')}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${t('resetPass.meta')}`
+        }
+      ]}
+    />
+  );
+
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      <h1>{t('resetPass.form.title')}</h1>
+      <ResetPasswordForm onSubmit={onSubmit} />
+    </PageLayout>
+  );
+};
+
+export default ResetPasswordView;
diff --git a/modules/user/client-react/containers/ForgotPassword.native.tsx b/modules/user/client-react/containers/ForgotPassword.native.tsx
new file mode 100644
index 0000000..ed595d7
--- /dev/null
+++ b/modules/user/client-react/containers/ForgotPassword.native.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+import ForgotPasswordView from '../components/ForgotPasswordView.native';
+import { CommonProps, User, ForgotPasswordSubmitProps } from '../index.native';
+import { FORGOT_PASSWORD } from '../actions';
+
+interface ForgotPasswordProps extends CommonProps {
+  forgotPassword: (values: ForgotPasswordSubmitProps) => any;
+}
+
+class ForgotPassword extends React.Component<ForgotPasswordProps> {
+  public state = {
+    sent: false
+  };
+
+  public onSubmit = async (values: User) => {
+    const { t, forgotPassword } = this.props;
+
+    this.setState({ sent: true });
+    try {
+      await forgotPassword(values);
+    } catch (e) {
+      throw new FormError(t('forgotPass.errorMsg'), e);
+    }
+  };
+
+  public render() {
+    const { sent } = this.state;
+
+    return <ForgotPasswordView {...this.props} sent={sent} onSubmit={this.onSubmit} />;
+  }
+}
+
+export default connect(
+  null,
+  { forgotPassword: FORGOT_PASSWORD }
+)(translate('user')(ForgotPassword));
diff --git a/modules/user/client-react/containers/ForgotPassword.tsx b/modules/user/client-react/containers/ForgotPassword.tsx
new file mode 100644
index 0000000..38c8598
--- /dev/null
+++ b/modules/user/client-react/containers/ForgotPassword.tsx
@@ -0,0 +1,35 @@
+import React, { useState } from 'react';
+import { connect } from 'react-redux';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+import ForgotPasswordView from '../components/ForgotPasswordView';
+
+import { CommonProps, ForgotPasswordSubmitProps } from '..';
+
+import { FORGOT_PASSWORD } from '../actions';
+
+interface ForgotPasswordProps extends CommonProps {
+  forgotPassword: (values: ForgotPasswordSubmitProps) => any;
+}
+
+const ForgotPassword: React.FunctionComponent<ForgotPasswordProps> = props => {
+  const { t, forgotPassword } = props;
+
+  const [sent, setSent] = useState(false);
+
+  const onSubmit = async (values: ForgotPasswordSubmitProps) => {
+    setSent(true);
+    try {
+      await forgotPassword(values);
+    } catch (e) {
+      throw new FormError(t('forgotPass.errorMsg'), e);
+    }
+  };
+
+  return <ForgotPasswordView {...props} sent={sent} onSubmit={onSubmit} />;
+};
+
+export default connect(
+  null,
+  { forgotPassword: FORGOT_PASSWORD }
+)(translate('user')(ForgotPassword));
diff --git a/modules/user/client-react/containers/ResetPassword.native.tsx b/modules/user/client-react/containers/ResetPassword.native.tsx
new file mode 100644
index 0000000..2e85b3d
--- /dev/null
+++ b/modules/user/client-react/containers/ResetPassword.native.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+import ResetPasswordView from '../components/ResetPasswordView.native';
+import { RESET_PASSWORD } from '../actions';
+import { CommonProps, ResetPasswordSubmitProps } from '../index.native';
+
+interface Token {
+  token: string;
+}
+
+interface ResetPasswordProps extends CommonProps {
+  resetPassword: (value: ResetPasswordSubmitProps & Token) => void;
+  match: any;
+}
+
+const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
+  const { t, resetPassword, navigation, match } = props;
+
+  const onSubmit = async (values: ResetPasswordSubmitProps) => {
+    try {
+      await resetPassword({ ...values, token: match.params.token });
+    } catch (e) {
+      throw new FormError(t('resetPass.errorMsg'), e);
+    }
+    navigation.navigate('Login');
+  };
+
+  return <ResetPasswordView {...props} onSubmit={onSubmit} />;
+};
+
+export default connect(
+  null,
+  { resetPassword: RESET_PASSWORD }
+)(translate('user')(ResetPassword));
diff --git a/modules/user/client-react/containers/ResetPassword.tsx b/modules/user/client-react/containers/ResetPassword.tsx
new file mode 100644
index 0000000..76905c5
--- /dev/null
+++ b/modules/user/client-react/containers/ResetPassword.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+import ResetPasswordView from '../components/ResetPasswordView';
+
+import { CommonProps, ResetPasswordSubmitProps } from '..';
+import { RESET_PASSWORD } from '../actions';
+
+interface Token {
+  token: string;
+}
+
+interface ResetPasswordProps extends CommonProps {
+  resetPassword: (value: ResetPasswordSubmitProps & Token) => void;
+  match: any;
+}
+
+const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
+  const { t, resetPassword, history, match } = props;
+
+  const onSubmit = async (values: ResetPasswordSubmitProps) => {
+    try {
+      await resetPassword({ ...values, token: match.params.token });
+    } catch (e) {
+      throw new FormError(t('resetPass.errorMsg'), e);
+    }
+    history.push('/login');
+  };
+
+  return <ResetPasswordView {...props} onSubmit={onSubmit} />;
+};
+
+export default connect(
+  null,
+  { resetPassword: RESET_PASSWORD }
+)(translate('user')(ResetPassword));

From d43956b71e4b3095435e50f1e94069cc9042d891 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 15 May 2019 11:21:47 +0300
Subject: [PATCH 062/104] Add routes and navigations screens for forgot and
 reset password

---
 .../containers/ForgotPassword.native.tsx      |  4 ++--
 .../containers/ResetPassword.native.tsx       |  6 ++---
 modules/user/client-react/index.native.tsx    | 24 +++++++++++++++++++
 modules/user/client-react/index.tsx           |  6 ++++-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/modules/user/client-react/containers/ForgotPassword.native.tsx b/modules/user/client-react/containers/ForgotPassword.native.tsx
index ed595d7..d604c84 100644
--- a/modules/user/client-react/containers/ForgotPassword.native.tsx
+++ b/modules/user/client-react/containers/ForgotPassword.native.tsx
@@ -7,7 +7,7 @@ import { CommonProps, User, ForgotPasswordSubmitProps } from '../index.native';
 import { FORGOT_PASSWORD } from '../actions';
 
 interface ForgotPasswordProps extends CommonProps {
-  forgotPassword: (values: ForgotPasswordSubmitProps) => any;
+  forgotPassword?: (values: ForgotPasswordSubmitProps) => any;
 }
 
 class ForgotPassword extends React.Component<ForgotPasswordProps> {
@@ -33,7 +33,7 @@ class ForgotPassword extends React.Component<ForgotPasswordProps> {
   }
 }
 
-export default connect(
+export default connect<{}, {}, ForgotPasswordProps>(
   null,
   { forgotPassword: FORGOT_PASSWORD }
 )(translate('user')(ForgotPassword));
diff --git a/modules/user/client-react/containers/ResetPassword.native.tsx b/modules/user/client-react/containers/ResetPassword.native.tsx
index 2e85b3d..077ff2f 100644
--- a/modules/user/client-react/containers/ResetPassword.native.tsx
+++ b/modules/user/client-react/containers/ResetPassword.native.tsx
@@ -11,8 +11,8 @@ interface Token {
 }
 
 interface ResetPasswordProps extends CommonProps {
-  resetPassword: (value: ResetPasswordSubmitProps & Token) => void;
-  match: any;
+  resetPassword?: (value: ResetPasswordSubmitProps & Token) => void;
+  match?: any;
 }
 
 const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
@@ -30,7 +30,7 @@ const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
   return <ResetPasswordView {...props} onSubmit={onSubmit} />;
 };
 
-export default connect(
+export default connect<{}, {}, ResetPasswordProps>(
   null,
   { resetPassword: RESET_PASSWORD }
 )(translate('user')(ResetPassword));
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index 17a5369..0ce58ab 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -16,6 +16,8 @@ import UserScreenNavigator from './containers/UserScreenNavigator.native';
 import Login from './containers/Login.native';
 import Logout from './containers/Logout.native';
 import Register from './containers/Register.native';
+import ForgotPassword from './containers/ForgotPassword.native';
+import ResetPassword from './containers/ResetPassword.native';
 
 import reducers from './reducers';
 
@@ -131,9 +133,31 @@ class RegisterScreen extends React.Component<NavigationOptionsProps> {
   }
 }
 
+class ForgotPasswordScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.forgotPassword" style="subTitle" />,
+    headerForceInset: {}
+  });
+  public render() {
+    return <ForgotPassword navigation={this.props.navigation} />;
+  }
+}
+
+class ResetPasswordScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.resetPassword" style="subTitle" />,
+    headerForceInset: {}
+  });
+  public render() {
+    return <ResetPassword navigation={this.props.navigation} />;
+  }
+}
+
 const AuthScreen = createStackNavigator(
   {
     Login: { screen: LoginScreen },
+    ForgotPassword: { screen: ForgotPasswordScreen },
+    ResetPassword: { screen: ResetPasswordScreen },
     Register: { screen: RegisterScreen }
   },
   {
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index 0f05a53..d713a3f 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -15,6 +15,8 @@ import Users from './containers/Users';
 import UserEdit from './containers/UserEdit';
 import UserAdd from './containers/UserAdd';
 import Profile from './containers/Profile';
+import ForgotPassword from './containers/ForgotPassword';
+import ResetPassword from './containers/ResetPassword';
 import reducers from './reducers';
 
 import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLoadedUser, withLogout, WithLogoutProps } from './containers/Auth';
@@ -142,7 +144,9 @@ export default new ClientModule({
     <AuthRoute exact path="/users/new" role={[UserRole.admin]} component={UserAdd} />,
     <AuthRoute path="/users/:id" redirect="/profile" role={[UserRole.user, UserRole.admin]} component={UserEdit} />,
     <AuthRoute exact path="/login" redirectOnLoggedIn redirect="/" component={Login} />,
-    <AuthRoute exact path="/register" redirectOnLoggedIn redirect="/profile" component={Register} />
+    <AuthRoute exact path="/register" redirectOnLoggedIn redirect="/profile" component={Register} />,
+    <AuthRoute exact path="/forgot-password" redirectOnLoggedIn redirect="/profile" component={ForgotPassword} />,
+    <AuthRoute exact path="/reset-password/:token" redirectOnLoggedIn redirect="/profile" component={ResetPassword} />
   ],
   navItem: [
     <IfLoggedIn key="/users" role={UserRole.admin}>

From 3f21abdf502c6ae67cca32941c093d59578223ee Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Wed, 15 May 2019 15:20:22 +0300
Subject: [PATCH 063/104] Add social to user and auth modules

---
 config/auth.js                                | 18 ++---
 .../facebook/containers/FacebookButton.tsx    |  2 +-
 .../social/github/containers/GitHubButton.tsx |  2 +-
 .../social/google/containers/GoogleButton.tsx |  2 +-
 .../linkedin/containers/LinkedInButton.tsx    |  2 +-
 modules/authentication/server-ts/index.ts     |  6 +-
 .../server-ts/social/AuthModule.ts            | 13 ++++
 .../server-ts/social/facebook/controllers.ts  | 15 +++++
 .../server-ts/social/facebook/index.ts        | 51 ++++++++++++++
 .../server-ts/social/github/controllers.ts    | 15 +++++
 .../server-ts/social/github/index.ts          | 51 ++++++++++++++
 .../server-ts/social/google/controllers.ts    | 25 +++++++
 .../server-ts/social/google/index.ts          | 53 +++++++++++++++
 .../authentication/server-ts/social/index.ts  |  7 ++
 .../server-ts/social/linkedIn/controllers.ts  | 15 +++++
 .../server-ts/social/linkedIn/index.ts        | 51 ++++++++++++++
 modules/user/server-ts/index.ts               |  3 +-
 .../user/server-ts/social/facebook/index.ts   | 40 +++++++++++
 modules/user/server-ts/social/github/index.ts | 41 ++++++++++++
 modules/user/server-ts/social/google/index.ts | 66 +++++++++++++++++++
 modules/user/server-ts/social/index.ts        | 16 +++++
 .../user/server-ts/social/linkedIn/index.ts   | 36 ++++++++++
 modules/user/server-ts/social/shared.ts       | 28 ++++++++
 23 files changed, 542 insertions(+), 16 deletions(-)
 create mode 100644 modules/authentication/server-ts/social/AuthModule.ts
 create mode 100644 modules/authentication/server-ts/social/facebook/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/facebook/index.ts
 create mode 100644 modules/authentication/server-ts/social/github/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/github/index.ts
 create mode 100644 modules/authentication/server-ts/social/google/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/google/index.ts
 create mode 100644 modules/authentication/server-ts/social/index.ts
 create mode 100644 modules/authentication/server-ts/social/linkedIn/controllers.ts
 create mode 100644 modules/authentication/server-ts/social/linkedIn/index.ts
 create mode 100644 modules/user/server-ts/social/facebook/index.ts
 create mode 100644 modules/user/server-ts/social/github/index.ts
 create mode 100644 modules/user/server-ts/social/google/index.ts
 create mode 100644 modules/user/server-ts/social/index.ts
 create mode 100644 modules/user/server-ts/social/linkedIn/index.ts
 create mode 100644 modules/user/server-ts/social/shared.ts

diff --git a/config/auth.js b/config/auth.js
index 61fe596..a941ab9 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -16,32 +16,32 @@ export default {
   },
   social: {
     facebook: {
-      enabled: false,
+      enabled: true,
       clientID: process.env.FACEBOOK_CLIENTID,
       clientSecret: process.env.FACEBOOK_CLIENTSECRET,
-      callbackURL: '/auth/facebook/callback',
+      callbackURL: '/api/auth/facebook/callback',
       scope: ['email'],
       profileFields: ['id', 'emails', 'displayName']
     },
     github: {
-      enabled: false,
+      enabled: true,
       clientID: process.env.GITHUB_CLIENTID,
       clientSecret: process.env.GITHUB_CLIENTSECRET,
-      callbackURL: '/auth/github/callback',
+      callbackURL: '/api/auth/github/callback',
       scope: ['user:email']
     },
     linkedin: {
-      enabled: false,
+      enabled: true,
       clientID: process.env.LINKEDIN_CLIENTID,
       clientSecret: process.env.LINKEDIN_CLIENTSECRET,
-      callbackURL: '/auth/linkedin/callback',
-      scope: ['r_emailaddress', 'r_basicprofile']
+      callbackURL: '/api/auth/linkedin/callback',
+      scope: ['r_liteprofile']
     },
     google: {
-      enabled: false,
+      enabled: true,
       clientID: process.env.GOOGLE_CLIENTID,
       clientSecret: process.env.GOOGLE_CLIENTSECRET,
-      callbackURL: '/auth/google/callback',
+      callbackURL: '/api/auth/google/callback',
       scope: ['https://www.googleapis.com/auth/userinfo.email', 'https://www.googleapis.com/auth/userinfo.profile']
     }
   }
diff --git a/modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx b/modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx
index 5d8ada5..9f654c2 100644
--- a/modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx
+++ b/modules/authentication/client-react/social/facebook/containers/FacebookButton.tsx
@@ -8,7 +8,7 @@ import { SocialButton, SocialButtonComponent } from '../../..';
 import './FacebookButton.css';
 
 const facebookLogin = () => {
-  window.location.href = '/auth/facebook';
+  window.location.href = '/api/auth/facebook';
 };
 
 const FacebookButton = ({ text }: SocialButtonComponent) => {
diff --git a/modules/authentication/client-react/social/github/containers/GitHubButton.tsx b/modules/authentication/client-react/social/github/containers/GitHubButton.tsx
index a459525..97285a2 100644
--- a/modules/authentication/client-react/social/github/containers/GitHubButton.tsx
+++ b/modules/authentication/client-react/social/github/containers/GitHubButton.tsx
@@ -8,7 +8,7 @@ import { SocialButton, SocialButtonComponent } from '../..';
 import './GitHubButton.css';
 
 const githubLogin = () => {
-  window.location.href = '/auth/github';
+  window.location.href = '/api/auth/github';
 };
 
 const GitHubButton = ({ text }: SocialButtonComponent) => {
diff --git a/modules/authentication/client-react/social/google/containers/GoogleButton.tsx b/modules/authentication/client-react/social/google/containers/GoogleButton.tsx
index 168482c..dce2914 100644
--- a/modules/authentication/client-react/social/google/containers/GoogleButton.tsx
+++ b/modules/authentication/client-react/social/google/containers/GoogleButton.tsx
@@ -8,7 +8,7 @@ import { SocialButtonComponent, SocialButton } from '../..';
 import './GoogleButton.css';
 
 const googleLogin = () => {
-  window.location.href = '/auth/google';
+  window.location.href = '/api/auth/google';
 };
 
 const GoogleButton = ({ text }: SocialButtonComponent) => {
diff --git a/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx
index 696c6eb..f32c1ab 100644
--- a/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx
+++ b/modules/authentication/client-react/social/linkedin/containers/LinkedInButton.tsx
@@ -8,7 +8,7 @@ import { SocialButtonComponent, SocialButton } from '../..';
 import './LinkedInButton.css';
 
 const linkedInLogin = () => {
-  window.location.href = '/auth/linkedin';
+  window.location.href = '/api/auth/linkedin';
 };
 
 const LinkedInButton = ({ text }: SocialButtonComponent) => {
diff --git a/modules/authentication/server-ts/index.ts b/modules/authentication/server-ts/index.ts
index 62f2a4d..29e12d5 100644
--- a/modules/authentication/server-ts/index.ts
+++ b/modules/authentication/server-ts/index.ts
@@ -1,5 +1,7 @@
 import ServerModule from '@restapp/module-server-ts';
+import AuthModule from './social/AuthModule';
 import access from './access';
+import social from './social';
 
-export default new ServerModule(access);
-export { access };
+export default new ServerModule(access, social);
+export { access, AuthModule };
diff --git a/modules/authentication/server-ts/social/AuthModule.ts b/modules/authentication/server-ts/social/AuthModule.ts
new file mode 100644
index 0000000..4cf31cc
--- /dev/null
+++ b/modules/authentication/server-ts/social/AuthModule.ts
@@ -0,0 +1,13 @@
+import ServerModule, { ServerModuleShape } from '@restapp/module-server-ts';
+
+interface AuthModuleShape extends ServerModuleShape {}
+
+interface AuthModule extends AuthModuleShape {}
+
+class AuthModule extends ServerModule {
+  constructor(...modules: AuthModuleShape[]) {
+    super(...modules);
+  }
+}
+
+export default AuthModule;
diff --git a/modules/authentication/server-ts/social/facebook/controllers.ts b/modules/authentication/server-ts/social/facebook/controllers.ts
new file mode 100644
index 0000000..37ee72c
--- /dev/null
+++ b/modules/authentication/server-ts/social/facebook/controllers.ts
@@ -0,0 +1,15 @@
+import passport from 'passport';
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('facebook', { state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.facebook.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/facebook/index.ts b/modules/authentication/server-ts/social/facebook/index.ts
new file mode 100644
index 0000000..9b21f35
--- /dev/null
+++ b/modules/authentication/server-ts/social/facebook/index.ts
@@ -0,0 +1,51 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { Strategy as FacebookStrategy } from 'passport-facebook';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import AuthModule from '../AuthModule';
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    session,
+    social: {
+      facebook: { clientID, clientSecret, callbackURL, profileFields, enabled }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  passport.use(
+    new FacebookStrategy(
+      { clientID, clientSecret, callbackURL, profileFields },
+      appContext.social ? appContext.social.facebook.verifyCallback : undefined
+    )
+  );
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/facebook',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/facebook/callback',
+          middleware: [passport.authenticate('facebook', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/social/github/controllers.ts b/modules/authentication/server-ts/social/github/controllers.ts
new file mode 100644
index 0000000..dcf0bd1
--- /dev/null
+++ b/modules/authentication/server-ts/social/github/controllers.ts
@@ -0,0 +1,15 @@
+import passport from 'passport';
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('github', { state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.github.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/github/index.ts b/modules/authentication/server-ts/social/github/index.ts
new file mode 100644
index 0000000..c0e00f6
--- /dev/null
+++ b/modules/authentication/server-ts/social/github/index.ts
@@ -0,0 +1,51 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { Strategy as GitHubStrategy } from 'passport-github';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import settings from '../../../../../settings';
+import AuthModule from '../AuthModule';
+
+const {
+  auth: {
+    session,
+    social: {
+      github: { clientID, clientSecret, scope, callbackURL, enabled }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  passport.use(
+    new GitHubStrategy(
+      { clientID, clientSecret, scope, callbackURL },
+      appContext.social ? appContext.social.github.verifyCallback : undefined
+    )
+  );
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/github',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/github/callback',
+          middleware: [passport.authenticate('github', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/social/google/controllers.ts b/modules/authentication/server-ts/social/google/controllers.ts
new file mode 100644
index 0000000..8de72c8
--- /dev/null
+++ b/modules/authentication/server-ts/social/google/controllers.ts
@@ -0,0 +1,25 @@
+import passport from 'passport';
+
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    social: {
+      google: { scope }
+    }
+  }
+} = settings;
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('google', { scope, state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.google.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/google/index.ts b/modules/authentication/server-ts/social/google/index.ts
new file mode 100644
index 0000000..1f40c7c
--- /dev/null
+++ b/modules/authentication/server-ts/social/google/index.ts
@@ -0,0 +1,53 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { OAuth2Strategy as GoogleStrategy } from 'passport-google-oauth';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import AuthModule from '../AuthModule';
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    session,
+    social: {
+      google: { clientID, clientSecret, callbackURL, enabled }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  if (enabled && !__TEST__) {
+    passport.use(
+      new GoogleStrategy(
+        { clientID, clientSecret, callbackURL },
+        appContext.social ? appContext.social.google.verifyCallback : undefined
+      )
+    );
+  }
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/google',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/google/callback',
+          middleware: [passport.authenticate('google', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/authentication/server-ts/social/index.ts b/modules/authentication/server-ts/social/index.ts
new file mode 100644
index 0000000..38d571a
--- /dev/null
+++ b/modules/authentication/server-ts/social/index.ts
@@ -0,0 +1,7 @@
+import ServerModule from '@restapp/module-server-ts';
+import github from './github';
+import google from './google';
+import facebook from './facebook';
+import linkedin from './linkedIn';
+
+export default new ServerModule(github, google, facebook, linkedin);
diff --git a/modules/authentication/server-ts/social/linkedIn/controllers.ts b/modules/authentication/server-ts/social/linkedIn/controllers.ts
new file mode 100644
index 0000000..355bae4
--- /dev/null
+++ b/modules/authentication/server-ts/social/linkedIn/controllers.ts
@@ -0,0 +1,15 @@
+import passport from 'passport';
+
+export const auth = (req: any, res: any) => {
+  passport.authenticate('linkedin', { state: req.query.expoUrl })(req, res);
+};
+
+export const onAuthenticationSuccess = (req: any, res: any) => {
+  const {
+    locals: { appContext }
+  } = res;
+  const { t } = req;
+  appContext.social
+    ? appContext.social.google.onAuthenticationSuccess(req, res)
+    : res.status(500).send(t('auth:social'));
+};
diff --git a/modules/authentication/server-ts/social/linkedIn/index.ts b/modules/authentication/server-ts/social/linkedIn/index.ts
new file mode 100644
index 0000000..a4ce503
--- /dev/null
+++ b/modules/authentication/server-ts/social/linkedIn/index.ts
@@ -0,0 +1,51 @@
+import { Express } from 'express';
+import passport from 'passport';
+import { Strategy as LinkedInStrategy } from '@sokratis/passport-linkedin-oauth2';
+
+import { RestMethod } from '@restapp/module-server-ts';
+
+import { auth, onAuthenticationSuccess } from './controllers';
+import AuthModule from '../AuthModule';
+import settings from '../../../../../settings';
+
+const {
+  auth: {
+    session,
+    social: {
+      linkedin: { clientID, clientSecret, callbackURL, enabled, scope }
+    }
+  }
+} = settings;
+
+const beforeware = (app: Express) => {
+  app.use(passport.initialize());
+};
+
+const onAppCreate = ({ appContext }: AuthModule) => {
+  passport.use(
+    new LinkedInStrategy(
+      { clientID, clientSecret, callbackURL, scopeSeparator: scope },
+      appContext.social ? appContext.social.linkedin.verifyCallback : undefined
+    )
+  );
+};
+
+export default (enabled && !__TEST__
+  ? new AuthModule({
+      beforeware: [beforeware],
+      onAppCreate: [onAppCreate],
+      apiRouteParams: [
+        {
+          method: RestMethod.GET,
+          route: 'auth/linkedin',
+          controller: auth
+        },
+        {
+          method: RestMethod.GET,
+          route: 'auth/linkedin/callback',
+          middleware: [passport.authenticate('linkedin', { session: session.enabled, failureRedirect: '/login' })],
+          controller: onAuthenticationSuccess
+        }
+      ]
+    })
+  : undefined);
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index 404b7ab..d564afe 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -5,6 +5,7 @@ import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 
 import { user, users, currentUser, addUser, editUser, deleteUser } from './controllers';
 import password from './password';
+import social from './social';
 import UserDAO, { UserShape } from './sql';
 import settings from '../../../settings';
 import resources from './locales';
@@ -48,7 +49,7 @@ const appContext = {
   }
 };
 
-export default new ServerModule(password, {
+export default new ServerModule(password, social, {
   appContext,
   localization: [{ ns: 'user', resources }],
   apiRouteParams: [
diff --git a/modules/user/server-ts/social/facebook/index.ts b/modules/user/server-ts/social/facebook/index.ts
new file mode 100644
index 0000000..fa23afd
--- /dev/null
+++ b/modules/user/server-ts/social/facebook/index.ts
@@ -0,0 +1,40 @@
+import { pick } from 'lodash';
+import { AuthModule } from '@restapp/authentication-server-ts';
+import { onAuthenticationSuccess, registerUser, UserSocial } from '../shared';
+import UserDAO, { UserShape } from '../../sql';
+import settings from '../../../../../settings';
+
+const createFacebookAuth = async (user: any) => UserDAO.createFacebookAuth(user);
+
+async function verifyCallback(accessToken: string, refreshToken: string, profile: UserSocial, cb: any) {
+  const {
+    id,
+    displayName,
+    emails: [{ value }]
+  } = profile;
+
+  try {
+    let user = (await UserDAO.getUserByFbIdOrEmail(id, value)) as UserShape & { fbId: number };
+
+    if (!user) {
+      const [createdUserId] = await registerUser(profile);
+      await createFacebookAuth({ id, displayName, userId: createdUserId });
+      user = (await UserDAO.getUser(createdUserId)) as UserShape & { fbId: number };
+    } else if (!user.fbId) {
+      await createFacebookAuth({ id, displayName, userId: user.id });
+    }
+
+    return cb(null, pick(user, ['id', 'username', 'role', 'email']));
+  } catch (err) {
+    return cb(err, {});
+  }
+}
+
+export const facebookData = {
+  facebook: {
+    onAuthenticationSuccess,
+    verifyCallback
+  }
+};
+
+export default (settings.auth.social.facebook.enabled && !__TEST__ ? new AuthModule() : undefined);
diff --git a/modules/user/server-ts/social/github/index.ts b/modules/user/server-ts/social/github/index.ts
new file mode 100644
index 0000000..e28c59f
--- /dev/null
+++ b/modules/user/server-ts/social/github/index.ts
@@ -0,0 +1,41 @@
+import { pick } from 'lodash';
+import { AuthModule } from '@restapp/authentication-server-ts';
+import { onAuthenticationSuccess, registerUser, UserSocial } from '../shared';
+import UserDAO, { UserShape } from '../../sql';
+
+import settings from '../../../../../settings';
+
+const createGithubAuth = async (user: any) => UserDAO.createGithubAuth(user);
+
+async function verifyCallback(accessToken: string, refreshToken: string, profile: UserSocial, cb: any) {
+  const {
+    id,
+    displayName,
+    emails: [{ value }]
+  } = profile;
+
+  try {
+    let user = (await UserDAO.getUserByGHIdOrEmail(id, value)) as UserShape & { ghId: number };
+
+    if (!user) {
+      const [createdUserId] = await registerUser(profile);
+      await createGithubAuth({ id, displayName, userId: createdUserId });
+      user = (await UserDAO.getUser(createdUserId)) as UserShape & { ghId: number };
+    } else if (!user.ghId) {
+      await createGithubAuth({ id, displayName, userId: user.id });
+    }
+
+    return cb(null, pick(user, ['id', 'username', 'role', 'email']));
+  } catch (err) {
+    return cb(err, {});
+  }
+}
+
+export const githubData = {
+  github: {
+    onAuthenticationSuccess,
+    verifyCallback
+  }
+};
+
+export default (settings.auth.social.github.enabled && !__TEST__ ? new AuthModule() : undefined);
diff --git a/modules/user/server-ts/social/google/index.ts b/modules/user/server-ts/social/google/index.ts
new file mode 100644
index 0000000..cae3da2
--- /dev/null
+++ b/modules/user/server-ts/social/google/index.ts
@@ -0,0 +1,66 @@
+import { pick } from 'lodash';
+import { AuthModule } from '@restapp/authentication-server-ts';
+import { onAuthenticationSuccess, UserSocial } from '../shared';
+import UserDAO from '../../sql';
+import settings from '../../../../../settings';
+import { UserShape } from '@restapp/authentication-server-ts/access';
+
+interface UserSocialGoogle extends UserSocial {
+  name: {
+    givenName?: string;
+    familyName?: string;
+  };
+}
+
+const registerUser = async ({ emails: [{ value }] }: UserSocial) => {
+  return UserDAO.register({
+    username: value,
+    email: value,
+    isActive: true
+  });
+};
+
+const createGoogleOAuth = async (user: any) => UserDAO.createGoogleOAuth(user);
+
+async function verifyCallback(accessToken: string, refreshToken: string, profile: UserSocialGoogle, cb: any) {
+  const {
+    id,
+    displayName,
+    emails: [{ value }]
+  } = profile;
+
+  try {
+    let user = (await UserDAO.getUserByGoogleIdOrEmail(id, value)) as UserShape & { googleId: number };
+
+    if (!user) {
+      const [createdUserId] = await registerUser(profile);
+
+      await createGoogleOAuth({ id, displayName, userId: createdUserId });
+
+      await UserDAO.editUserProfile({
+        id: createdUserId,
+        profile: {
+          firstName: profile.name.givenName,
+          lastName: profile.name.familyName
+        }
+      });
+
+      user = (await UserDAO.getUser(createdUserId)) as UserShape & { googleId: number };
+    } else if (!user.googleId) {
+      await createGoogleOAuth({ id, displayName, userId: user.id });
+    }
+
+    return cb(null, pick(user, ['id', 'username', 'role', 'email']));
+  } catch (err) {
+    return cb(err, {});
+  }
+}
+
+export const googleData = {
+  google: {
+    onAuthenticationSuccess,
+    verifyCallback
+  }
+};
+
+export default (settings.auth.social.google.enabled && !__TEST__ ? new AuthModule() : undefined);
diff --git a/modules/user/server-ts/social/index.ts b/modules/user/server-ts/social/index.ts
new file mode 100644
index 0000000..011b17a
--- /dev/null
+++ b/modules/user/server-ts/social/index.ts
@@ -0,0 +1,16 @@
+import { AuthModule } from '@restapp/authentication-server-ts';
+import facebook, { facebookData } from './facebook';
+import github, { githubData } from './github';
+import google, { googleData } from './google';
+import linkedin, { linkedinData } from './linkedIn';
+
+const social = {
+  ...facebookData,
+  ...githubData,
+  ...googleData,
+  ...linkedinData
+};
+
+export default new AuthModule(facebook, github, google, linkedin, {
+  appContext: { social }
+});
diff --git a/modules/user/server-ts/social/linkedIn/index.ts b/modules/user/server-ts/social/linkedIn/index.ts
new file mode 100644
index 0000000..6831bba
--- /dev/null
+++ b/modules/user/server-ts/social/linkedIn/index.ts
@@ -0,0 +1,36 @@
+import { UserShape } from './../../sql';
+import { pick } from 'lodash';
+import { AuthModule } from '@restapp/authentication-server-ts';
+import { onAuthenticationSuccess, registerUser, UserSocial } from '../shared';
+import UserDAO from '../../sql';
+import settings from '../../../../../settings';
+
+const createLinkedInAuth = async (user: any) => UserDAO.createLinkedInAuth(user);
+
+async function verifyCallback(accessToken: string, refreshToken: string, profile: UserSocial, cb: any) {
+  const { id, displayName } = profile;
+  try {
+    let user = (await UserDAO.getUserByLnInIdOrEmail(id)) as UserShape & { lnId: number };
+
+    if (!user) {
+      const [createdUserId] = await registerUser(profile);
+      await createLinkedInAuth({ id, displayName, userId: createdUserId });
+      user = (await UserDAO.getUser(createdUserId)) as UserShape & { lnId: number };
+    } else if (!user.lnId) {
+      await createLinkedInAuth({ id, displayName, userId: user.id });
+    }
+
+    return cb(null, pick(user, ['id', 'username', 'role', 'email']));
+  } catch (err) {
+    return cb(err, {});
+  }
+}
+
+export const linkedinData = {
+  linkedin: {
+    onAuthenticationSuccess,
+    verifyCallback
+  }
+};
+
+export default (settings.auth.social.linkedin.enabled && !__TEST__ ? new AuthModule() : undefined);
diff --git a/modules/user/server-ts/social/shared.ts b/modules/user/server-ts/social/shared.ts
new file mode 100644
index 0000000..344d568
--- /dev/null
+++ b/modules/user/server-ts/social/shared.ts
@@ -0,0 +1,28 @@
+import { access } from '@restapp/authentication-server-ts';
+import UserDAO, { UserShape } from '../sql';
+
+export interface UserSocial {
+  id: number;
+  username: string;
+  displayName: string;
+  emails: Array<{ value: string }>;
+}
+
+export async function onAuthenticationSuccess(req: any, res: any) {
+  const user = (await UserDAO.getUserWithPassword(req.user.id)) as UserShape;
+  const redirectUrl = req.query.state;
+  const tokens = await access.grantAccess(user, req, user.passwordHash);
+  if (redirectUrl) {
+    res.redirect(redirectUrl + (tokens ? '?data=' + JSON.stringify({ tokens }) : ''));
+  } else {
+    res.redirect('/profile');
+  }
+}
+
+export const registerUser = async ({ username, displayName, emails: [{ value }] = [{ value: '' }] }: UserSocial) => {
+  return UserDAO.register({
+    username: username || displayName,
+    email: value,
+    isActive: true
+  });
+};

From ff7e86d2457e83a96f22e6a0aa29e7d123427e79 Mon Sep 17 00:00:00 2001
From: Alexandr Belokur <alexandr.belokur@sysgears.com>
Date: Wed, 15 May 2019 17:18:26 +0300
Subject: [PATCH 064/104] Fix invalid refresh token response

---
 .../authentication/server-ts/access/jwt/controllers.ts    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/authentication/server-ts/access/jwt/controllers.ts b/modules/authentication/server-ts/access/jwt/controllers.ts
index ed769a5..004853c 100644
--- a/modules/authentication/server-ts/access/jwt/controllers.ts
+++ b/modules/authentication/server-ts/access/jwt/controllers.ts
@@ -19,7 +19,11 @@ export const refreshTokens = async (req: any, res: any) => {
   const isValidToken = decodedToken && decodedToken.id;
 
   if (!isValidToken) {
-    res.send(t('auth:invalidRefresh'));
+    return res.status(401).send({
+      errors: {
+        message: t('auth:invalidRefresh')
+      }
+    });
   }
 
   const identity = await getIdentity(decodedToken.id);
@@ -29,7 +33,7 @@ export const refreshTokens = async (req: any, res: any) => {
   try {
     jwt.verify(inputRefreshToken, refreshSecret);
   } catch (err) {
-    res.send(err);
+    return res.send(err);
   }
 
   const [accessToken, refreshToken] = await createTokens(identity, settings.auth.secret, refreshSecret, req.t);

From db05f63f94d3f140e31e15c2f5930c676e74cb66 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 16 May 2019 12:11:57 +0300
Subject: [PATCH 065/104] Divide the storage into several

---
 config/auth.js                                |  6 +-
 .../user/client-react/containers/AuthBase.tsx |  2 +-
 .../containers/DataRootComponent.native.tsx   |  3 +-
 .../containers/DataRootComponent.tsx          |  3 +-
 .../user/client-react/containers/Profile.tsx  | 16 ++--
 .../user/client-react/containers/UserEdit.tsx |  2 +-
 .../containers/UserOperations.tsx             |  4 +-
 modules/user/client-react/index.native.tsx    |  4 +-
 modules/user/client-react/index.tsx           |  4 +-
 .../user/client-react/reducers/currentUser.ts | 46 +++++++++++
 modules/user/client-react/reducers/index.ts   | 79 +------------------
 modules/user/client-react/reducers/users.ts   | 61 ++++++++++++++
 packages/server/.env                          |  4 +-
 13 files changed, 133 insertions(+), 101 deletions(-)
 create mode 100644 modules/user/client-react/reducers/currentUser.ts
 create mode 100644 modules/user/client-react/reducers/users.ts

diff --git a/config/auth.js b/config/auth.js
index 28d18ab..11f648a 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -24,21 +24,21 @@ export default {
       profileFields: ['id', 'emails', 'displayName']
     },
     github: {
-      enabled: true,
+      enabled: false,
       clientID: process.env.GITHUB_CLIENTID,
       clientSecret: process.env.GITHUB_CLIENTSECRET,
       callbackURL: '/api/auth/github/callback',
       scope: ['user:email']
     },
     linkedin: {
-      enabled: true,
+      enabled: false,
       clientID: process.env.LINKEDIN_CLIENTID,
       clientSecret: process.env.LINKEDIN_CLIENTSECRET,
       callbackURL: '/api/auth/linkedin/callback',
       scope: ['r_liteprofile']
     },
     google: {
-      enabled: true,
+      enabled: false,
       clientID: process.env.GOOGLE_CLIENTID,
       clientSecret: process.env.GOOGLE_CLIENTSECRET,
       callbackURL: '/api/auth/google/callback',
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index 087535d..04ca876 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -30,7 +30,7 @@ export interface WithLogoutProps extends WithUserProps {
 
 const withUser = (Component: React.ComponentType<any>) => {
   const WithUser = ({ currentUser, ...rest }: WithUserProps) => <Component currentUser={currentUser} {...rest} />;
-  return connect(({ user: { loading, currentUser } }: any) => ({
+  return connect(({ currentUser: { loading, currentUser } }: any) => ({
     currentUserLoading: loading,
     currentUser
   }))(WithUser);
diff --git a/modules/user/client-react/containers/DataRootComponent.native.tsx b/modules/user/client-react/containers/DataRootComponent.native.tsx
index d2d476b..d760074 100644
--- a/modules/user/client-react/containers/DataRootComponent.native.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.native.tsx
@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import { getItem } from '@restapp/core-common/clientStorage';
 
 import Loading from '../components/Loading.native';
-import { UserModuleState } from '../reducers';
 import { CURRENT_USER } from '../actions';
 import { User } from '..';
 
@@ -31,7 +30,7 @@ class DataRootComponent extends React.Component<DataRootComponent> {
 }
 
 export default connect(
-  ({ currentUser }: UserModuleState) => ({
+  ({ currentUser: { currentUser } }: any) => ({
     currentUser
   }),
   { getCurrentUser: CURRENT_USER }
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index d535ef4..9a4078b 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import { getItem } from '@restapp/core-common/clientStorage';
 
 import Loading from '../components/Loading';
-import { UserModuleState } from '../reducers';
 import { CURRENT_USER } from '../actions';
 import { User } from '..';
 import setting from '../../../../settings';
@@ -31,7 +30,7 @@ const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({ current
 };
 
 export default connect(
-  ({ currentUser }: UserModuleState) => ({
+  ({ currentUser: { currentUser } }: any) => ({
     currentUser
   }),
   { getCurrentUser: CURRENT_USER }
diff --git a/modules/user/client-react/containers/Profile.tsx b/modules/user/client-react/containers/Profile.tsx
index 76802ca..48d6e19 100644
--- a/modules/user/client-react/containers/Profile.tsx
+++ b/modules/user/client-react/containers/Profile.tsx
@@ -2,19 +2,21 @@ import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView';
 import { User } from '..';
+import { CURRENT_USER } from '../actions';
 
 interface ProfileProps {
   currentUser: User;
   currentUserLoading: boolean;
+  getCurrentUser: () => void;
 }
 
-const Profile: React.FunctionComponent<ProfileProps> = props => {
+const Profile: React.FunctionComponent<ProfileProps> = ({ getCurrentUser, ...props }) => {
   return <ProfileView {...props} />;
 };
 
-export default connect(({ user: { loading, currentUser } }: any) => {
-  return {
-    currentUser,
-    currentUserLoading: loading
-  };
-})(Profile);
+export default connect(
+  ({ currentUser: { currentUser } }: any) => ({
+    currentUser
+  }),
+  { getCurrentUser: CURRENT_USER }
+)(Profile);
diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/containers/UserEdit.tsx
index 54a1536..ac1d00e 100644
--- a/modules/user/client-react/containers/UserEdit.tsx
+++ b/modules/user/client-react/containers/UserEdit.tsx
@@ -59,7 +59,7 @@ class UserEdit extends React.Component<UserEditProps> {
 }
 
 export default connect(
-  ({ user: { user } }: any) => ({
+  ({ users: { user } }: any) => ({
     user
   }),
   { getUser: USER, editUser: EDIT_USER }
diff --git a/modules/user/client-react/containers/UserOperations.tsx b/modules/user/client-react/containers/UserOperations.tsx
index c61951e..9b8c294 100644
--- a/modules/user/client-react/containers/UserOperations.tsx
+++ b/modules/user/client-react/containers/UserOperations.tsx
@@ -23,7 +23,7 @@ const withUsers = (Component: React.ComponentType<any>) => {
     }
   }
   return connect(
-    ({ user: { loading, users } }: any) => ({
+    ({ users: { loading, users } }: any) => ({
       loading,
       users
     }),
@@ -58,7 +58,7 @@ const withSortAndFilter = (Component: React.ComponentType<any>) => {
   };
 
   return connect(
-    ({ user: { orderBy, filter } }: any) => ({
+    ({ users: { orderBy, filter } }: any) => ({
       orderBy,
       filter
     }),
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index 0ce58ab..6868f76 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -19,7 +19,7 @@ import Register from './containers/Register.native';
 import ForgotPassword from './containers/ForgotPassword.native';
 import ResetPassword from './containers/ResetPassword.native';
 
-import reducers from './reducers';
+import { currentUserReducer, usersReducer } from './reducers';
 
 export enum UserRole {
   admin = 'admin',
@@ -210,7 +210,7 @@ export default new ClientModule({
   ],
   localization: [{ ns: 'user', resources }],
   router: <MainScreenNavigator />,
-  reducer: [{ user: reducers }],
+  reducer: [{ currentUser: currentUserReducer, users: usersReducer }],
   dataRootComponent: [DataRootComponent],
   onAppCreate: [(module: ClientModule) => (ref.navigator = UserScreenNavigator(module.drawerItems))]
 });
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index d713a3f..cd6b571 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -17,7 +17,7 @@ import UserAdd from './containers/UserAdd';
 import Profile from './containers/Profile';
 import ForgotPassword from './containers/ForgotPassword';
 import ResetPassword from './containers/ResetPassword';
-import reducers from './reducers';
+import { currentUserReducer, usersReducer } from './reducers';
 
 import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLoadedUser, withLogout, WithLogoutProps } from './containers/Auth';
 
@@ -175,7 +175,7 @@ export default new ClientModule({
     </IfNotLoggedIn>
   ],
   localization: [{ ns: 'user', resources }],
-  reducer: [{ user: reducers }],
+  reducer: [{ currentUser: currentUserReducer, users: usersReducer }],
   dataRootComponent: [DataRootComponent],
   rootComponentFactory: [req => (req ? <CookiesProvider cookies={req.universalCookies} /> : <CookiesProvider />)]
 });
diff --git a/modules/user/client-react/reducers/currentUser.ts b/modules/user/client-react/reducers/currentUser.ts
new file mode 100644
index 0000000..1909969
--- /dev/null
+++ b/modules/user/client-react/reducers/currentUser.ts
@@ -0,0 +1,46 @@
+import { User } from '..';
+import { UserModuleActionProps, ActionType } from '.';
+
+export enum CurrentUserActionType {
+  SET_CURRENT_USER = 'SET_CURRENT_USER',
+  CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
+  SET_LOADING = 'SET_LOADING'
+}
+
+export interface CurrentUserState {
+  currentUser: User;
+  loading: boolean;
+}
+
+const defaultState: CurrentUserState = {
+  currentUser: null,
+  loading: false
+};
+
+export default function(state = defaultState, action: UserModuleActionProps) {
+  switch (action.type) {
+    case ActionType.SET_LOADING:
+      return {
+        ...state,
+        loading: true
+      };
+
+    case ActionType.CLEAR_CURRENT_USER:
+      return {
+        ...state,
+        currentUser: null,
+        loading: false
+      };
+
+    case ActionType.SET_CURRENT_USER:
+      const currentUser = action.payload && action.payload.errors ? null : action.payload.user || action.payload;
+      return {
+        ...state,
+        currentUser,
+        loading: false
+      };
+
+    default:
+      return state;
+  }
+}
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index 22ef04c..7e17c9c 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -1,4 +1,5 @@
-import { User, OrderBy, Filter } from '..';
+export { default as currentUserReducer } from './currentUser';
+export { default as usersReducer } from './users';
 
 export enum ActionType {
   SET_CURRENT_USER = 'SET_CURRENT_USER',
@@ -11,85 +12,9 @@ export enum ActionType {
   DELETE_USER = 'DELETE_USER'
 }
 
-export interface UserModuleState {
-  currentUser: User;
-  loading: boolean;
-  user: User;
-  users: User[];
-  orderBy: OrderBy;
-  filter: Filter;
-}
-
 export interface UserModuleActionProps {
   type: ActionType | ActionType[];
   payload?: any;
   request?: () => Promise<any>;
   [key: string]: any;
 }
-
-const defaultState: UserModuleState = {
-  currentUser: null,
-  loading: false,
-  user: null,
-  users: [],
-  orderBy: { column: '', order: '' },
-  filter: { searchText: '', role: '', isActive: true }
-};
-
-export default function(state = defaultState, action: UserModuleActionProps) {
-  switch (action.type) {
-    case ActionType.SET_LOADING:
-      return {
-        ...state,
-        loading: true
-      };
-
-    case ActionType.CLEAR_CURRENT_USER:
-      return {
-        ...state,
-        currentUser: null,
-        loading: false
-      };
-
-    case ActionType.SET_CURRENT_USER:
-      const currentUser = action.payload && action.payload.errors ? null : action.payload.user || action.payload;
-      return {
-        ...state,
-        currentUser,
-        loading: false
-      };
-
-    case ActionType.SET_USER:
-      return {
-        ...state,
-        user: action.payload
-      };
-    case ActionType.SET_USERS:
-      return {
-        ...state,
-        users: action.payload
-      };
-
-    case ActionType.SET_FILTER:
-      return {
-        ...state,
-        filter: action.payload && action.payload.filter
-      };
-
-    case ActionType.SET_ORDER_BY:
-      return {
-        ...state,
-        orderBy: action.payload && action.payload.orderBy
-      };
-
-    case ActionType.DELETE_USER:
-      const users = state.users.filter(user => user.id !== action.payload.id);
-      return {
-        ...state,
-        users
-      };
-
-    default:
-      return state;
-  }
-}
diff --git a/modules/user/client-react/reducers/users.ts b/modules/user/client-react/reducers/users.ts
new file mode 100644
index 0000000..88ea9ba
--- /dev/null
+++ b/modules/user/client-react/reducers/users.ts
@@ -0,0 +1,61 @@
+import { User, OrderBy, Filter } from '..';
+import { UserModuleActionProps, ActionType } from '.';
+
+export interface UserModuleState {
+  loading: boolean;
+  user: User;
+  users: User[];
+  orderBy: OrderBy;
+  filter: Filter;
+}
+
+const defaultState: UserModuleState = {
+  loading: false,
+  user: null,
+  users: [],
+  orderBy: { column: '', order: '' },
+  filter: { searchText: '', role: '', isActive: true }
+};
+
+export default function(state = defaultState, action: UserModuleActionProps) {
+  switch (action.type) {
+    case ActionType.SET_LOADING:
+      return {
+        ...state,
+        loading: true
+      };
+
+    case ActionType.SET_USER:
+      return {
+        ...state,
+        user: action.payload
+      };
+    case ActionType.SET_USERS:
+      return {
+        ...state,
+        users: action.payload
+      };
+
+    case ActionType.SET_FILTER:
+      return {
+        ...state,
+        filter: action.payload && action.payload.filter
+      };
+
+    case ActionType.SET_ORDER_BY:
+      return {
+        ...state,
+        orderBy: action.payload && action.payload.orderBy
+      };
+
+    case ActionType.DELETE_USER:
+      const users = state.users.filter(user => user.id !== action.payload.id);
+      return {
+        ...state,
+        users
+      };
+
+    default:
+      return state;
+  }
+}
diff --git a/packages/server/.env b/packages/server/.env
index e43508d..649b576 100644
--- a/packages/server/.env
+++ b/packages/server/.env
@@ -9,8 +9,8 @@ DB_SSL=
 
 # Auth
 AUTH_SECRET=secret, change for production
-FACEBOOK_CLIENTID=
-FACEBOOK_CLIENTSECRET=
+FACEBOOK_CLIENTID=958659907661417
+FACEBOOK_CLIENTSECRET=ab666fb2b096fda0916d895e8d9f68c9
 GITHUB_CLIENTID=
 GITHUB_CLIENTSECRET=
 LINKEDIN_CLIENTID=

From 9a38a0dce5fabda79b0b553f838dedf7a8cd983b Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 16 May 2019 12:13:10 +0300
Subject: [PATCH 066/104] Clear data

---
 packages/server/.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/.env b/packages/server/.env
index 649b576..e43508d 100644
--- a/packages/server/.env
+++ b/packages/server/.env
@@ -9,8 +9,8 @@ DB_SSL=
 
 # Auth
 AUTH_SECRET=secret, change for production
-FACEBOOK_CLIENTID=958659907661417
-FACEBOOK_CLIENTSECRET=ab666fb2b096fda0916d895e8d9f68c9
+FACEBOOK_CLIENTID=
+FACEBOOK_CLIENTSECRET=
 GITHUB_CLIENTID=
 GITHUB_CLIENTSECRET=
 LINKEDIN_CLIENTID=

From 886b611cf8c2e35cef5dc6ccaf6d7d8a7116c4d6 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 16 May 2019 16:09:54 +0300
Subject: [PATCH 067/104] Add request on currentUser in AuthRoute

---
 .../authentication/server-ts/access/jwt/index.ts    | 13 +++++++++++--
 modules/user/client-react/containers/Auth.tsx       | 13 ++++++++-----
 modules/user/client-react/containers/AuthBase.tsx   | 12 ++++++++----
 .../containers/UserScreenNavigator.native.tsx       |  2 +-
 modules/user/client-react/reducers/currentUser.ts   |  2 +-
 modules/user/server-ts/index.ts                     |  2 +-
 modules/user/server-ts/locales/en/translations.json |  2 +-
 modules/user/server-ts/locales/ru/translations.json |  2 +-
 8 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
index 7430eb7..6d3625e 100644
--- a/modules/authentication/server-ts/access/jwt/index.ts
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -1,4 +1,4 @@
-import { Express } from 'express';
+import { Express, Request, Response } from 'express';
 import { Strategy as LocalStratery } from 'passport-local';
 import passport from 'passport';
 import { Strategy as JWTStrategy, ExtractJwt } from 'passport-jwt';
@@ -17,7 +17,16 @@ const beforeware = (app: Express) => {
   app.use(passport.initialize());
 };
 
-const accessMiddleware = passport.authenticate('jwt', { session: false });
+const accessMiddleware = (req: Request, res: Response, next: any) => {
+  // passport.authenticate('jwt', { session: false });
+  return req.isAuthenticated()
+    ? next()
+    : res.send({
+        errors: {
+          message: 'unauthorized'
+        }
+      });
+};
 
 const grant = async (identity: any, req: any, passwordHash: string = '') => {
   const refreshSecret = settings.auth.secret + passwordHash;
diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
index 5879d16..437c679 100644
--- a/modules/user/client-react/containers/Auth.tsx
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React, { ComponentType, FunctionComponent } from 'react';
 import { Route, Redirect, RouteComponentProps } from 'react-router-dom';
 import { withLoadedUser } from './AuthBase';
 import { UserRole, User } from '..';
@@ -8,12 +8,15 @@ interface AuthRouteProps extends WithUserProps {
   role?: UserRole | UserRole[];
   redirect?: string;
   redirectOnLoggedIn?: boolean;
-  component?: React.ComponentType<RouteComponentProps<any>> | React.ComponentType<any>;
+  component?: ComponentType<RouteComponentProps<any>> | ComponentType<any>;
 }
 
-const AuthRoute: React.ComponentType<AuthRouteProps> = withLoadedUser(
-  ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, ...rest }) => {
-    const RenderComponent: React.FunctionComponent<any> = props => {
+const AuthRoute: ComponentType<AuthRouteProps> = withLoadedUser(
+  ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, getCurrentUser, ...rest }) => {
+    const RenderComponent: FunctionComponent<any> = props => {
+      if (currentUser === undefined) {
+        getCurrentUser();
+      }
       // The users is not logged in
       if (redirectOnLoggedIn && currentUser) {
         return <Redirect to={{ pathname: redirect }} />;
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index 04ca876..e27881d 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import authentication from '@restapp/authentication-client-react';
 import { User, UserRole } from '..';
 import CLEAR_USER from '../actions/clearUser';
+import { CURRENT_USER } from '../actions';
 
 export interface WithUserProps extends RouteProps {
   currentUser?: User;
@@ -30,10 +31,13 @@ export interface WithLogoutProps extends WithUserProps {
 
 const withUser = (Component: React.ComponentType<any>) => {
   const WithUser = ({ currentUser, ...rest }: WithUserProps) => <Component currentUser={currentUser} {...rest} />;
-  return connect(({ currentUser: { loading, currentUser } }: any) => ({
-    currentUserLoading: loading,
-    currentUser
-  }))(WithUser);
+  return connect(
+    ({ currentUser: { loading, currentUser } }: any) => ({
+      currentUserLoading: loading,
+      currentUser
+    }),
+    { getCurrentUser: CURRENT_USER }
+  )(WithUser);
 };
 
 const hasRole = (role: UserRole | UserRole[], currentUser: User) => {
diff --git a/modules/user/client-react/containers/UserScreenNavigator.native.tsx b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
index 924ef4d..2c23e73 100644
--- a/modules/user/client-react/containers/UserScreenNavigator.native.tsx
+++ b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
@@ -54,7 +54,7 @@ class UserScreenNavigator extends React.Component<UserScreenNavigator> {
   };
   public getInitialRoute = () => {
     const { currentUser } = this.props;
-    return currentUser ? 'Welcome' : 'Login';
+    return currentUser ? 'Profile' : 'Login';
   };
 
   public render() {
diff --git a/modules/user/client-react/reducers/currentUser.ts b/modules/user/client-react/reducers/currentUser.ts
index 1909969..afe8862 100644
--- a/modules/user/client-react/reducers/currentUser.ts
+++ b/modules/user/client-react/reducers/currentUser.ts
@@ -13,7 +13,7 @@ export interface CurrentUserState {
 }
 
 const defaultState: CurrentUserState = {
-  currentUser: null,
+  currentUser: undefined,
   loading: false
 };
 
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index d564afe..269b68a 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -25,7 +25,7 @@ const getHash = async (id: number) => ((await UserDAO.getUserWithPassword(id)) a
 const validateLogin = async (usernameOrEmail: string, pswd: string) => {
   const identity = (await UserDAO.getUserByUsernameOrEmail(usernameOrEmail)) as UserShape;
 
-  if (!identity) {
+  if (!identity || !identity.passwordHash) {
     return { message: i18n.t('user:auth.password.validPasswordEmail') };
   }
 
diff --git a/modules/user/server-ts/locales/en/translations.json b/modules/user/server-ts/locales/en/translations.json
index a230977..d816ae1 100644
--- a/modules/user/server-ts/locales/en/translations.json
+++ b/modules/user/server-ts/locales/en/translations.json
@@ -8,7 +8,7 @@
   "userCouldNotDeleted": "Could not delete user. Please try again later.",
   "auth": {
     "password": {
-      "validPasswordEmail": "Please enter a valid username or e-mail.",
+      "validPasswordEmail": "Please enter a valid username or password.",
       "emailConfirmation": "Please confirm your e-mail first.",
       "registrationFailed": "Registration failed due to validation errors",
       "validPassword": "Please enter a valid password.",
diff --git a/modules/user/server-ts/locales/ru/translations.json b/modules/user/server-ts/locales/ru/translations.json
index b50aa94..29227c8 100644
--- a/modules/user/server-ts/locales/ru/translations.json
+++ b/modules/user/server-ts/locales/ru/translations.json
@@ -8,7 +8,7 @@
   "userCouldNotDeleted": "Невозможно удалить пользователя. Побробуйте повторить попытку позже.",
   "auth": {
     "password": {
-      "validPasswordEmail": "Пожалуйста, введите Ваш username или e-mail.",
+      "validPasswordEmail": "Пожалуйста, введите Ваш username или пароль.",
       "emailConfirmation": "Пожалуйста, подтвердите Ваш e-mail",
       "registrationFailed": "Регистрация не была успешной из-за ошибок валидации.",
       "validPassword": "Пожалуйста, введите действительный пароль.",

From 30cb6269a255a615a3b15a8aed40cd84d54dcef5 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 16 May 2019 17:40:32 +0300
Subject: [PATCH 068/104] Implement working socils with jwt module

---
 .../server-ts/access/jwt/index.ts             |  7 ++---
 .../server-ts/access/session/index.ts         |  2 +-
 modules/module/server-ts/ServerModule.ts      |  6 ++---
 modules/user/client-react/containers/Auth.tsx |  6 ++++-
 .../containers/DataRootComponent.native.tsx   |  3 ++-
 .../user/client-react/containers/Login.tsx    | 27 +++++++++++++++++--
 modules/user/server-ts/social/shared.ts       |  2 +-
 7 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
index 6d3625e..abe0af8 100644
--- a/modules/authentication/server-ts/access/jwt/index.ts
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -17,8 +17,9 @@ const beforeware = (app: Express) => {
   app.use(passport.initialize());
 };
 
-const accessMiddleware = (req: Request, res: Response, next: any) => {
-  // passport.authenticate('jwt', { session: false });
+const accessMiddleware = passport.authenticate('jwt', { session: false });
+
+const checkAuthentication = (req: Request, res: Response, next: any) => {
   return req.isAuthenticated()
     ? next()
     : res.send({
@@ -103,6 +104,6 @@ export default (settings.auth.jwt.enabled
           controller: refreshTokens
         }
       ],
-      accessMiddleware
+      accessMiddleware: [accessMiddleware, checkAuthentication]
     })
   : undefined);
diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
index a1a226c..b6b5c30 100644
--- a/modules/authentication/server-ts/access/session/index.ts
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -88,7 +88,7 @@ export default (settings.auth.session.enabled
   ? new AccessModule({
       beforeware: [beforeware],
       onAppCreate: [onAppCreate],
-      accessMiddleware,
+      accessMiddleware: [accessMiddleware],
       appContext: sessionAppContext,
       apiRouteParams: [
         {
diff --git a/modules/module/server-ts/ServerModule.ts b/modules/module/server-ts/ServerModule.ts
index 4592690..9dd0472 100644
--- a/modules/module/server-ts/ServerModule.ts
+++ b/modules/module/server-ts/ServerModule.ts
@@ -57,7 +57,7 @@ export interface ServerModuleShape extends CommonModuleShape {
   beforeware?: MiddlewareFunc[];
   // A list of functions to register normal-priority middlewares
   middleware?: MiddlewareFunc[];
-  accessMiddleware?: RequestHandler;
+  accessMiddleware?: RequestHandler[];
   apiRouteParams?: Array<{
     method: RestMethod;
     route: string;
@@ -103,8 +103,8 @@ class ServerModule extends CommonModule {
       return (app: Express, modules: ServerModule) => {
         const handlers = [];
 
-        if (isAuthRoute && modules.accessMiddleware) {
-          handlers.push(modules.accessMiddleware);
+        if (isAuthRoute && modules.accessMiddleware && modules.accessMiddleware.length) {
+          handlers.push(...modules.accessMiddleware);
         }
         if (!isEmpty(middleware)) {
           handlers.push(...middleware);
diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
index 437c679..cb58304 100644
--- a/modules/user/client-react/containers/Auth.tsx
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -15,7 +15,11 @@ const AuthRoute: ComponentType<AuthRouteProps> = withLoadedUser(
   ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, getCurrentUser, ...rest }) => {
     const RenderComponent: FunctionComponent<any> = props => {
       if (currentUser === undefined) {
-        getCurrentUser();
+        (async () => {
+          try {
+            await getCurrentUser();
+          } catch (e) {}
+        })();
       }
       // The users is not logged in
       if (redirectOnLoggedIn && currentUser) {
diff --git a/modules/user/client-react/containers/DataRootComponent.native.tsx b/modules/user/client-react/containers/DataRootComponent.native.tsx
index d760074..0b65fc1 100644
--- a/modules/user/client-react/containers/DataRootComponent.native.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.native.tsx
@@ -5,6 +5,7 @@ import { getItem } from '@restapp/core-common/clientStorage';
 import Loading from '../components/Loading.native';
 import { CURRENT_USER } from '../actions';
 import { User } from '..';
+import setting from '../../../../settings';
 
 interface DataRootComponent {
   currentUser: User;
@@ -18,7 +19,7 @@ class DataRootComponent extends React.Component<DataRootComponent> {
 
   public async componentDidMount() {
     const { currentUser, getCurrentUser } = this.props;
-    if (!this.state.ready && (await getItem('refreshToken')) && !currentUser) {
+    if (!this.state.ready && !currentUser && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
       await getCurrentUser();
     }
     this.setState({ ready: true });
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
index e9b5c5e..e8315cc 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/containers/Login.tsx
@@ -1,8 +1,9 @@
-import * as React from 'react';
+import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { translate } from '@restapp/i18n-client-react';
 import authentication from '@restapp/authentication-client-react';
 import { FormError } from '@restapp/forms-client-react';
+import { setItem } from '@restapp/core-common/clientStorage';
 
 import LoginView from '../components/LoginView';
 import { CommonProps, LoginSubmitProps } from '..';
@@ -22,13 +23,35 @@ const Login: React.FunctionComponent<LoginProps> = props => {
   const [isRegistered, setIsRegistered] = React.useState(false);
   const [isReady, setIsReady] = React.useState(false);
 
-  React.useEffect(() => {
+  useEffect(() => {
+    if (search && search.includes('data')) {
+      checkAndSaveTokens();
+    }
+  }, []);
+
+  useEffect(() => {
     if (search.includes('email-verified')) {
       setIsRegistered(true);
     }
     setIsReady(true);
   }, []);
 
+  const checkAndSaveTokens = async () => {
+    const dataRegExp = /data=([^#]+)/;
+
+    const [, data] = search.match(dataRegExp);
+    const decodedData = JSON.parse(decodeURI(data));
+
+    if (decodedData.tokens) {
+      await setItem('accessToken', decodedData.tokens.accessToken);
+      await setItem('refreshToken', decodedData.tokens.refreshToken);
+
+      await authentication.doLogin();
+    }
+
+    history.push('profile');
+  };
+
   const hideModal = () => {
     setIsRegistered(false);
     history.push({ search: '' });
diff --git a/modules/user/server-ts/social/shared.ts b/modules/user/server-ts/social/shared.ts
index 344d568..ea80be7 100644
--- a/modules/user/server-ts/social/shared.ts
+++ b/modules/user/server-ts/social/shared.ts
@@ -15,7 +15,7 @@ export async function onAuthenticationSuccess(req: any, res: any) {
   if (redirectUrl) {
     res.redirect(redirectUrl + (tokens ? '?data=' + JSON.stringify({ tokens }) : ''));
   } else {
-    res.redirect('/profile');
+    res.redirect(`/login${tokens ? '?data=' + JSON.stringify({ tokens }) : ''}`);
   }
 }
 

From d227a1ed3e259a71b93be2fcad484fb3bb75ab4c Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 17 May 2019 18:03:08 +0300
Subject: [PATCH 069/104] Fix social auth with jwt

---
 .../client-react/access/jwt/index.ts          | 11 ++++---
 .../server-ts/access/jwt/controllers.ts       |  2 +-
 .../server-ts/access/jwt/index.ts             | 33 ++++++++++++-------
 .../server-ts/access/session/index.ts         |  1 +
 modules/core/common/createReduxStore.ts       |  6 ++--
 modules/user/client-react/actions/addUser.ts  |  3 +-
 .../user/client-react/actions/currentUser.ts  |  6 +++-
 .../user/client-react/actions/deleteUser.ts   |  4 ++-
 modules/user/client-react/actions/editUser.ts |  3 +-
 .../client-react/actions/forgotPassword.ts    |  3 +-
 modules/user/client-react/actions/login.ts    |  5 ++-
 modules/user/client-react/actions/register.ts |  2 +-
 .../client-react/actions/resetPassword.ts     |  3 +-
 modules/user/client-react/actions/user.ts     |  4 ++-
 modules/user/client-react/actions/users.ts    |  6 +++-
 modules/user/client-react/containers/Auth.tsx | 14 +++-----
 .../user/client-react/containers/AuthBase.tsx | 33 +++++++++++--------
 .../user/client-react/containers/Profile.tsx  | 12 +++----
 modules/user/client-react/index.tsx           |  4 +--
 modules/user/client-react/reducers/index.ts   |  1 +
 modules/user/client-react/reducers/users.ts   |  7 ++++
 21 files changed, 97 insertions(+), 66 deletions(-)

diff --git a/modules/authentication/client-react/access/jwt/index.ts b/modules/authentication/client-react/access/jwt/index.ts
index e76810a..cc76fa9 100644
--- a/modules/authentication/client-react/access/jwt/index.ts
+++ b/modules/authentication/client-react/access/jwt/index.ts
@@ -42,13 +42,16 @@ const refreshAccessToken = async () => {
 
 const reduxMiddleware: Middleware = ({ dispatch }) => next => action => {
   const { types, status, ...rest } = action;
-
   (async () => {
     try {
       if (status === 401) {
-        await refreshAccessToken();
-        const newAction = { ...action, status: null };
-        return dispatch(newAction);
+        try {
+          await refreshAccessToken();
+          const newAction = { ...action, status: null };
+          return dispatch(newAction);
+        } catch (e) {
+          throw e;
+        }
       }
       return next(action);
     } catch (e) {
diff --git a/modules/authentication/server-ts/access/jwt/controllers.ts b/modules/authentication/server-ts/access/jwt/controllers.ts
index 004853c..783b3b4 100644
--- a/modules/authentication/server-ts/access/jwt/controllers.ts
+++ b/modules/authentication/server-ts/access/jwt/controllers.ts
@@ -33,7 +33,7 @@ export const refreshTokens = async (req: any, res: any) => {
   try {
     jwt.verify(inputRefreshToken, refreshSecret);
   } catch (err) {
-    return res.send(err);
+    return res.status(401).send({ errors: err });
   }
 
   const [accessToken, refreshToken] = await createTokens(identity, settings.auth.secret, refreshSecret, req.t);
diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
index abe0af8..6fab715 100644
--- a/modules/authentication/server-ts/access/jwt/index.ts
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -1,4 +1,4 @@
-import { Express, Request, Response } from 'express';
+import { Express, Request, Response, NextFunction } from 'express';
 import { Strategy as LocalStratery } from 'passport-local';
 import passport from 'passport';
 import { Strategy as JWTStrategy, ExtractJwt } from 'passport-jwt';
@@ -17,20 +17,31 @@ const beforeware = (app: Express) => {
   app.use(passport.initialize());
 };
 
-const accessMiddleware = passport.authenticate('jwt', { session: false });
+const accessMiddleware = (req: Request, res: Response, next: NextFunction) =>
+  passport.authenticate('jwt', { session: false }, (_err, user, info) => {
+    if (info) {
+      res.locals.error = info;
+      return next();
+    }
+    req.user = { ...user };
+    return next();
+  })(req, res, next);
 
-const checkAuthentication = (req: Request, res: Response, next: any) => {
-  return req.isAuthenticated()
-    ? next()
-    : res.send({
-        errors: {
-          message: 'unauthorized'
-        }
-      });
+const checkAuthentication = (req: Request, res: Response, next: NextFunction) => {
+  if (req.user) {
+    return next();
+  }
+  return res.send({
+    status: 401,
+    errors: {
+      message: res.locals.error ? res.locals.error.message : 'unauthorized'
+    }
+  });
 };
 
 const grant = async (identity: any, req: any, passwordHash: string = '') => {
-  const refreshSecret = settings.auth.secret + passwordHash;
+  const refreshSecret = settings.auth.secret + (passwordHash || '');
+
   const [accessToken, refreshToken] = await createTokens(identity, settings.auth.secret, refreshSecret, req.t);
 
   return {
diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
index b6b5c30..d2b53aa 100644
--- a/modules/authentication/server-ts/access/session/index.ts
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -30,6 +30,7 @@ const accessMiddleware = (req: Request, res: Response, next: any) =>
   req.isAuthenticated()
     ? next()
     : res.send({
+        status: 401,
         errors: {
           message: 'unauthorized'
         }
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 36b96bd..4bd4e54 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -15,7 +15,7 @@ const requestMiddleware: Middleware = _state => next => action => {
     return next(action);
   }
 
-  const [REQUEST, SUCCESS, FAIL] = types;
+  const { REQUEST, SUCCESS, FAIL } = types;
 
   next({ type: REQUEST, ...rest });
 
@@ -33,8 +33,8 @@ const requestMiddleware: Middleware = _state => next => action => {
       });
       return data;
     } catch (e) {
-      if (e.response && e.response.status === 401) {
-        return next({ ...action, status: e.response.status });
+      if (e.response && e.response.data && e.response.data.status === 401) {
+        return next({ ...action, status: e.response.data.status });
       }
       const data = e.response && e.response.data;
       next({
diff --git a/modules/user/client-react/actions/addUser.ts b/modules/user/client-react/actions/addUser.ts
index c8e95b7..53ce677 100644
--- a/modules/user/client-react/actions/addUser.ts
+++ b/modules/user/client-react/actions/addUser.ts
@@ -1,10 +1,9 @@
 import axios from 'axios';
-import { ActionType } from '../reducers';
 import { User } from '..';
 
 export default function ADD_USER(user: User) {
   return {
-    types: [null, null, null] as ActionType[],
+    types: {},
     APICall: () => axios.post(`${__API_URL__}/addUser`, { ...user })
   };
 }
diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
index 34bd4e5..97aac0c 100644
--- a/modules/user/client-react/actions/currentUser.ts
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -3,7 +3,11 @@ import { ActionType } from '../reducers';
 
 export default function CURRENT_USER() {
   return {
-    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
+    types: {
+      REQUEST: ActionType.CLEAR_CURRENT_USER,
+      SUCCESS: ActionType.SET_CURRENT_USER,
+      FAIL: ActionType.CLEAR_CURRENT_USER
+    },
     APICall: () => axios.get(`${__API_URL__}/currentUser`)
   };
 }
diff --git a/modules/user/client-react/actions/deleteUser.ts b/modules/user/client-react/actions/deleteUser.ts
index 19e69f6..ed55d61 100644
--- a/modules/user/client-react/actions/deleteUser.ts
+++ b/modules/user/client-react/actions/deleteUser.ts
@@ -3,7 +3,9 @@ import { ActionType } from '../reducers';
 
 export default function DELETE_USER(id: number) {
   return {
-    types: [null, ActionType.DELETE_USER, null] as ActionType[],
+    types: {
+      SUCCESS: ActionType.DELETE_USER
+    },
     APICall: () => axios.delete(`${__API_URL__}/deleteUser`, { data: { id } })
   };
 }
diff --git a/modules/user/client-react/actions/editUser.ts b/modules/user/client-react/actions/editUser.ts
index d8818e4..fd4a609 100644
--- a/modules/user/client-react/actions/editUser.ts
+++ b/modules/user/client-react/actions/editUser.ts
@@ -1,10 +1,9 @@
 import axios from 'axios';
-import { ActionType } from '../reducers';
 import { User } from '..';
 
 export default function EDIT_USER(user: User) {
   return {
-    types: [null, null, null] as ActionType[],
+    types: {},
     APICall: () => axios.post(`${__API_URL__}/editUser`, { ...user })
   };
 }
diff --git a/modules/user/client-react/actions/forgotPassword.ts b/modules/user/client-react/actions/forgotPassword.ts
index 88104ea..7f5aaf5 100644
--- a/modules/user/client-react/actions/forgotPassword.ts
+++ b/modules/user/client-react/actions/forgotPassword.ts
@@ -1,10 +1,9 @@
 import axios from 'axios';
 import { ForgotPasswordSubmitProps } from '..';
-import { ActionType } from '../reducers';
 
 export default function FORGOT_PASSWORD(value: ForgotPasswordSubmitProps) {
   return {
-    types: [null, null, null] as ActionType[],
+    types: {},
     APICall: () => axios.post(`${__API_URL__}/forgotPassword`, { value })
   };
 }
diff --git a/modules/user/client-react/actions/login.ts b/modules/user/client-react/actions/login.ts
index cbaa74f..7e34347 100644
--- a/modules/user/client-react/actions/login.ts
+++ b/modules/user/client-react/actions/login.ts
@@ -4,7 +4,10 @@ import { ActionType } from '../reducers';
 
 export default function LOGIN(value: LoginSubmitProps) {
   return {
-    types: [null, ActionType.SET_CURRENT_USER, ActionType.CLEAR_CURRENT_USER],
+    types: {
+      SUCCESS: ActionType.SET_CURRENT_USER,
+      FAIL: ActionType.CLEAR_CURRENT_USER
+    },
     APICall: () => axios.post(`${__API_URL__}/login`, { ...value })
   };
 }
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index 5a2686e..b976900 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -3,7 +3,7 @@ import { RegisterSubmitProps } from '..';
 
 export default function REGISTER(value: RegisterSubmitProps) {
   return {
-    types: [null, null, null] as any,
+    types: {},
     APICall: () => axios.post(`${__API_URL__}/register`, { ...value })
   };
 }
diff --git a/modules/user/client-react/actions/resetPassword.ts b/modules/user/client-react/actions/resetPassword.ts
index ad5982c..5546002 100644
--- a/modules/user/client-react/actions/resetPassword.ts
+++ b/modules/user/client-react/actions/resetPassword.ts
@@ -1,6 +1,5 @@
 import axios from 'axios';
 import { ResetPasswordSubmitProps } from '..';
-import { ActionType } from '../reducers';
 
 interface ResetPasswordProps extends ResetPasswordSubmitProps {
   token: string;
@@ -8,7 +7,7 @@ interface ResetPasswordProps extends ResetPasswordSubmitProps {
 
 export default function RESET_PASSWORD(value: ResetPasswordProps) {
   return {
-    types: [null, null, null] as ActionType[],
+    types: {},
     APICall: () => axios.post(`${__API_URL__}/resetPassword`, { ...value })
   };
 }
diff --git a/modules/user/client-react/actions/user.ts b/modules/user/client-react/actions/user.ts
index 3047bdf..41d5ca9 100644
--- a/modules/user/client-react/actions/user.ts
+++ b/modules/user/client-react/actions/user.ts
@@ -3,7 +3,9 @@ import { ActionType } from '../reducers';
 
 export default function USER(id: number) {
   return {
-    types: [null, ActionType.SET_USER, null],
+    types: {
+      SUCCESS: ActionType.SET_USER
+    },
     APICall: () => axios.get(`${__API_URL__}/user/${id}`)
   };
 }
diff --git a/modules/user/client-react/actions/users.ts b/modules/user/client-react/actions/users.ts
index 8c7c851..9369ba8 100644
--- a/modules/user/client-react/actions/users.ts
+++ b/modules/user/client-react/actions/users.ts
@@ -4,7 +4,11 @@ import { OrderBy, Filter } from '..';
 
 export default function USERS(orderBy: OrderBy, filter: Filter, type?: ActionType) {
   return {
-    types: [type ? ActionType[type] : null, ActionType.SET_USERS, null],
+    types: {
+      REQUEST: type ? ActionType[type] : null,
+      SUCCESS: ActionType.SET_USERS,
+      FAIL: ActionType.CLEAR_USERS
+    },
     payload: { orderBy, filter },
     APICall: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
   };
diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
index cb58304..c239ead 100644
--- a/modules/user/client-react/containers/Auth.tsx
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -1,6 +1,7 @@
 import React, { ComponentType, FunctionComponent } from 'react';
 import { Route, Redirect, RouteComponentProps } from 'react-router-dom';
-import { withLoadedUser } from './AuthBase';
+
+import { withUser } from './AuthBase';
 import { UserRole, User } from '..';
 import { WithUserProps } from './AuthBase';
 
@@ -11,16 +12,9 @@ interface AuthRouteProps extends WithUserProps {
   component?: ComponentType<RouteComponentProps<any>> | ComponentType<any>;
 }
 
-const AuthRoute: ComponentType<AuthRouteProps> = withLoadedUser(
-  ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, getCurrentUser, ...rest }) => {
+const AuthRoute: ComponentType<AuthRouteProps> = withUser(
+  ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, ...rest }) => {
     const RenderComponent: FunctionComponent<any> = props => {
-      if (currentUser === undefined) {
-        (async () => {
-          try {
-            await getCurrentUser();
-          } catch (e) {}
-        })();
-      }
       // The users is not logged in
       if (redirectOnLoggedIn && currentUser) {
         return <Redirect to={{ pathname: redirect }} />;
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index e27881d..7c6786e 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -1,12 +1,15 @@
-import * as React from 'react';
+import React, { useEffect } from 'react';
 import { RouteProps } from 'react-router';
 import { History } from 'history';
 import { connect } from 'react-redux';
 import authentication from '@restapp/authentication-client-react';
+import { getItem } from '@restapp/core-common/clientStorage';
 import { User, UserRole } from '..';
 import CLEAR_USER from '../actions/clearUser';
 import { CURRENT_USER } from '../actions';
 
+import setting from '../../../../settings';
+
 export interface WithUserProps extends RouteProps {
   currentUser?: User;
   currentUserLoading?: boolean;
@@ -30,7 +33,19 @@ export interface WithLogoutProps extends WithUserProps {
 }
 
 const withUser = (Component: React.ComponentType<any>) => {
-  const WithUser = ({ currentUser, ...rest }: WithUserProps) => <Component currentUser={currentUser} {...rest} />;
+  const WithUser = ({ currentUser, getCurrentUser, currentUserLoading, ...rest }: WithUserProps) => {
+    useEffect(() => {
+      (async () => {
+        if (currentUser === undefined && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
+          try {
+            await getCurrentUser();
+          } catch (e) {}
+        }
+      })();
+    }, []);
+
+    return currentUserLoading ? null : <Component currentUser={currentUser} currentUserLoading {...rest} />;
+  };
   return connect(
     ({ currentUser: { loading, currentUser } }: any) => ({
       currentUserLoading: loading,
@@ -44,14 +59,6 @@ const hasRole = (role: UserRole | UserRole[], currentUser: User) => {
   return currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
 };
 
-const withLoadedUser = (Component: React.ComponentType<any>) => {
-  const WithLoadedUser = ({ currentUserLoading, ...props }: WithUserProps) => {
-    return currentUserLoading ? null : <Component {...props} />;
-  };
-
-  return withUser(WithLoadedUser);
-};
-
 const IfLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({
   currentUser,
   role,
@@ -59,13 +66,13 @@ const IfLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({
   elseComponent
 }) => (hasRole(role, currentUser) ? React.cloneElement(children, {}) : elseComponent || null);
 
-const IfLoggedIn: React.ComponentType<IfLoggedInComponent> = withLoadedUser(IfLoggedInComponent);
+const IfLoggedIn: React.ComponentType<IfLoggedInComponent> = withUser(IfLoggedInComponent);
 
 const IfNotLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({ currentUser, children }) => {
   return !currentUser ? React.cloneElement(children, {}) : null;
 };
 
-const IfNotLoggedIn: React.ComponentType<IfLoggedInComponent> = withLoadedUser(IfNotLoggedInComponent);
+const IfNotLoggedIn: React.ComponentType<IfLoggedInComponent> = withUser(IfNotLoggedInComponent);
 
 const withLogout = (Component: React.ComponentType<any>) => {
   const WithLogout = ({ clearUser, ...props }: WithLogoutProps) => {
@@ -82,4 +89,4 @@ const withLogout = (Component: React.ComponentType<any>) => {
   )(WithLogout);
 };
 
-export { withUser, hasRole, withLoadedUser, IfLoggedIn, IfNotLoggedIn, withLogout };
+export { withUser, hasRole, IfLoggedIn, IfNotLoggedIn, withLogout };
diff --git a/modules/user/client-react/containers/Profile.tsx b/modules/user/client-react/containers/Profile.tsx
index 48d6e19..8d5558f 100644
--- a/modules/user/client-react/containers/Profile.tsx
+++ b/modules/user/client-react/containers/Profile.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView';
 import { User } from '..';
-import { CURRENT_USER } from '../actions';
 
 interface ProfileProps {
   currentUser: User;
@@ -10,13 +9,10 @@ interface ProfileProps {
   getCurrentUser: () => void;
 }
 
-const Profile: React.FunctionComponent<ProfileProps> = ({ getCurrentUser, ...props }) => {
+const Profile: React.FunctionComponent<ProfileProps> = ({ ...props }) => {
   return <ProfileView {...props} />;
 };
 
-export default connect(
-  ({ currentUser: { currentUser } }: any) => ({
-    currentUser
-  }),
-  { getCurrentUser: CURRENT_USER }
-)(Profile);
+export default connect(({ currentUser: { currentUser } }: any) => ({
+  currentUser
+}))(Profile);
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index cd6b571..f5c0a1a 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -19,7 +19,7 @@ import ForgotPassword from './containers/ForgotPassword';
 import ResetPassword from './containers/ResetPassword';
 import { currentUserReducer, usersReducer } from './reducers';
 
-import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLoadedUser, withLogout, WithLogoutProps } from './containers/Auth';
+import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLogout, WithLogoutProps, withUser } from './containers/Auth';
 
 export enum UserRole {
   admin = 'admin',
@@ -103,7 +103,7 @@ export interface Filter {
   isActive: boolean;
 }
 
-const ProfileName = withLoadedUser(({ currentUser }) => (
+const ProfileName = withUser(({ currentUser }) => (
   <>{currentUser ? currentUser.fullName || currentUser.username : null}</>
 ));
 
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index 7e17c9c..d41fd99 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -7,6 +7,7 @@ export enum ActionType {
   SET_LOADING = 'SET_LOADING',
   SET_USER = 'SET_USER',
   SET_USERS = 'SET_USERS',
+  CLEAR_USERS = 'CLEAR_USERS',
   SET_ORDER_BY = 'SET_ORDER_BY',
   SET_FILTER = 'SET_FILTER',
   DELETE_USER = 'DELETE_USER'
diff --git a/modules/user/client-react/reducers/users.ts b/modules/user/client-react/reducers/users.ts
index 88ea9ba..b0d8ac8 100644
--- a/modules/user/client-react/reducers/users.ts
+++ b/modules/user/client-react/reducers/users.ts
@@ -30,12 +30,19 @@ export default function(state = defaultState, action: UserModuleActionProps) {
         ...state,
         user: action.payload
       };
+
     case ActionType.SET_USERS:
       return {
         ...state,
         users: action.payload
       };
 
+    case ActionType.CLEAR_USERS:
+      return {
+        ...state,
+        users: null
+      };
+
     case ActionType.SET_FILTER:
       return {
         ...state,

From 7cb9828d70c14c52e535276203dc896f5c2d611a Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 20 May 2019 11:07:01 +0300
Subject: [PATCH 070/104] Fix socials with session

---
 modules/authentication/server-ts/access/AccessModule.ts | 8 +++++---
 modules/core/common/createReduxStore.ts                 | 6 +++---
 modules/user/client-react/containers/Login.tsx          | 1 +
 packages/server/.env                                    | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/authentication/server-ts/access/AccessModule.ts b/modules/authentication/server-ts/access/AccessModule.ts
index 1a01662..928f961 100644
--- a/modules/authentication/server-ts/access/AccessModule.ts
+++ b/modules/authentication/server-ts/access/AccessModule.ts
@@ -5,7 +5,6 @@ import ServerModule, { ServerModuleShape } from '@restapp/module-server-ts';
 
 interface AccessModuleShape extends ServerModuleShape {
   grant?: Array<(identity: UserShape, req: Request, passwordHash: string) => { [key: string]: any } | void>;
-  // grant?: (user: any) => Promise<[string, string]>;
 }
 
 interface AccessModule extends AccessModuleShape {}
@@ -20,9 +19,12 @@ class AccessModule extends ServerModule {
   get grantAccess(): GrantAccessFunc {
     return async (identity: UserShape, req: Request, passwordHash: string) => {
       let result = {};
-      for (const grant of this.grant) {
-        result = merge(result, await grant(identity, req, passwordHash));
+      if (this.grant) {
+        for (const grant of this.grant) {
+          result = merge(result, await grant(identity, req, passwordHash));
+        }
       }
+
       return result;
     };
   }
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 4bd4e54..e30cc55 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -17,7 +17,7 @@ const requestMiddleware: Middleware = _state => next => action => {
 
   const { REQUEST, SUCCESS, FAIL } = types;
 
-  next({ type: REQUEST, ...rest });
+  next({ type: REQUEST || null, ...rest });
 
   const handleAPICall = async () => {
     try {
@@ -27,7 +27,7 @@ const requestMiddleware: Middleware = _state => next => action => {
         throw { response: result };
       }
       next({
-        type: SUCCESS,
+        type: SUCCESS || null,
         ...rest,
         payload: data
       });
@@ -38,7 +38,7 @@ const requestMiddleware: Middleware = _state => next => action => {
       }
       const data = e.response && e.response.data;
       next({
-        type: FAIL,
+        type: FAIL || null,
         ...rest,
         payload: data
       });
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
index e8315cc..9355e77 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/containers/Login.tsx
@@ -62,6 +62,7 @@ const Login: React.FunctionComponent<LoginProps> = props => {
       await login(values);
     } catch (e) {
       const data = e.response && e.response.data;
+
       throw new FormError(t('reg.errorMsg'), data);
     }
 
diff --git a/packages/server/.env b/packages/server/.env
index e43508d..649b576 100644
--- a/packages/server/.env
+++ b/packages/server/.env
@@ -9,8 +9,8 @@ DB_SSL=
 
 # Auth
 AUTH_SECRET=secret, change for production
-FACEBOOK_CLIENTID=
-FACEBOOK_CLIENTSECRET=
+FACEBOOK_CLIENTID=958659907661417
+FACEBOOK_CLIENTSECRET=ab666fb2b096fda0916d895e8d9f68c9
 GITHUB_CLIENTID=
 GITHUB_CLIENTSECRET=
 LINKEDIN_CLIENTID=

From dd6a25cad47481f365f90d287c58de3c4d8fa12d Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 20 May 2019 11:14:56 +0300
Subject: [PATCH 071/104] Clear data

---
 config/auth.js                                 | 2 +-
 modules/user/server-ts/password/controllers.ts | 2 +-
 packages/server/.env                           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index 11f648a..a770655 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -16,7 +16,7 @@ export default {
   },
   social: {
     facebook: {
-      enabled: true,
+      enabled: false,
       clientID: process.env.FACEBOOK_CLIENTID,
       clientSecret: process.env.FACEBOOK_CLIENTSECRET,
       callbackURL: '/api/auth/facebook/callback',
diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 27405c1..8660234 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -11,7 +11,7 @@ import emailTemplate from '../emailTemplate';
 import { createPasswordHash } from '.';
 
 const {
-  auth: { passwordSettings, secret },
+  auth: { password: passwordSettings, secret },
   app
 } = settings;
 
diff --git a/packages/server/.env b/packages/server/.env
index 649b576..e43508d 100644
--- a/packages/server/.env
+++ b/packages/server/.env
@@ -9,8 +9,8 @@ DB_SSL=
 
 # Auth
 AUTH_SECRET=secret, change for production
-FACEBOOK_CLIENTID=958659907661417
-FACEBOOK_CLIENTSECRET=ab666fb2b096fda0916d895e8d9f68c9
+FACEBOOK_CLIENTID=
+FACEBOOK_CLIENTSECRET=
 GITHUB_CLIENTID=
 GITHUB_CLIENTSECRET=
 LINKEDIN_CLIENTID=

From 8e91567c01690f961da1ebb19fe5539f01156310 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 20 May 2019 11:49:43 +0300
Subject: [PATCH 072/104] Change interfaces

---
 .../authentication/server-ts/access/index.ts  | 10 +++---
 .../server-ts/access/jwt/index.ts             |  4 +--
 modules/user/server-ts/controllers.ts         |  2 --
 modules/user/server-ts/index.ts               |  7 ++--
 .../user/server-ts/password/controllers.ts    |  8 ++---
 modules/user/server-ts/social/shared.ts       |  4 +--
 modules/user/server-ts/sql.ts                 | 34 +++++++++----------
 7 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/modules/authentication/server-ts/access/index.ts b/modules/authentication/server-ts/access/index.ts
index e0b9b14..db2e9a8 100644
--- a/modules/authentication/server-ts/access/index.ts
+++ b/modules/authentication/server-ts/access/index.ts
@@ -5,12 +5,12 @@ import resources from '../locales';
 import AccessModule from './AccessModule';
 
 export interface UserShape {
-  id: number;
+  id?: number;
   username: string;
-  role: string;
-  isActive: boolean;
-  email: string;
-  passwordHash: string;
+  role?: string;
+  isActive?: boolean;
+  email?: string;
+  passwordHash?: string;
 }
 
 // Try to grant access via sessions first, and if that fails, then try using JWT
diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
index 6fab715..df6918a 100644
--- a/modules/authentication/server-ts/access/jwt/index.ts
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -1,5 +1,5 @@
 import { Express, Request, Response, NextFunction } from 'express';
-import { Strategy as LocalStratery } from 'passport-local';
+import { Strategy as LocalStrategy } from 'passport-local';
 import passport from 'passport';
 import { Strategy as JWTStrategy, ExtractJwt } from 'passport-jwt';
 
@@ -73,7 +73,7 @@ const loginMiddleware = (req: any, res: any, next: any) => {
 
 const onAppCreate = ({ appContext }: AccessModule) => {
   passport.use(
-    new LocalStratery({ usernameField: 'usernameOrEmail' }, async (username: string, password: string, done: any) => {
+    new LocalStrategy({ usernameField: 'usernameOrEmail' }, async (username: string, password: string, done: any) => {
       const { user, message } = await appContext.user.validateLogin(username, password);
 
       if (message) {
diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index 290e247..7e9a03a 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -152,13 +152,11 @@ export const editUser = async ({ user: identity, body, t }: any, res: any) => {
 
   const userInfo = !isSelf() && isAdmin() ? body : pick(body, ['id', 'username', 'email', 'password']);
 
-  const isProfileExists = await userDAO.isUserProfileExists(body.id);
   const passwordHash = await createPasswordHash(body.password);
 
   const trx = await createTransaction();
   try {
     await userDAO.editUser(userInfo, passwordHash).transacting(trx);
-    await userDAO.editUserProfile(body, isProfileExists).transacting(trx);
 
     if (mailer && body.password && password.sendPasswordChangesEmail) {
       const url = `${__WEBSITE_URL__}/profile`;
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index 269b68a..47d38c4 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -6,7 +6,7 @@ import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 import { user, users, currentUser, addUser, editUser, deleteUser } from './controllers';
 import password from './password';
 import social from './social';
-import UserDAO, { UserShape } from './sql';
+import UserDAO, { UserShape, UserShapePassword } from './sql';
 import settings from '../../../settings';
 import resources from './locales';
 
@@ -20,10 +20,11 @@ const getIdentity = (id: number) => {
   return UserDAO.getUser(id);
 };
 
-const getHash = async (id: number) => ((await UserDAO.getUserWithPassword(id)) as UserShape).passwordHash || '';
+const getHash = async (id: number) =>
+  ((await UserDAO.getUserWithPassword(id)) as UserShape & UserShapePassword).passwordHash || '';
 
 const validateLogin = async (usernameOrEmail: string, pswd: string) => {
-  const identity = (await UserDAO.getUserByUsernameOrEmail(usernameOrEmail)) as UserShape;
+  const identity = (await UserDAO.getUserByUsernameOrEmail(usernameOrEmail)) as UserShape & UserShapePassword;
 
   if (!identity || !identity.passwordHash) {
     return { message: i18n.t('user:auth.password.validPasswordEmail') };
diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 8660234..d0bd1eb 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -1,4 +1,4 @@
-import { UserShape } from './../sql';
+import { UserShape, UserShapePassword } from './../sql';
 import { pick, isEmpty } from 'lodash';
 import jwt from 'jsonwebtoken';
 import { log } from '@restapp/core-common';
@@ -82,7 +82,7 @@ export const register = async ({ body, t }: any, res: any) => {
 export const forgotPassword = async ({ body, t }: any, res: any) => {
   try {
     const localAuth = pick(body, 'email');
-    const identity = (await userDAO.getUserByEmail(localAuth.email)) as UserShape;
+    const identity = (await userDAO.getUserByEmail(localAuth.email)) as UserShape & UserShapePassword;
 
     if (identity && mailer) {
       // async email
@@ -130,8 +130,8 @@ export const resetPassword = async ({ body, t }: any, res: any) => {
   }
 
   const token = Buffer.from(reset.token, 'base64').toString();
-  const { email, passwordHash } = jwt.verify(token, secret) as UserShape;
-  const identity = (await userDAO.getUserByEmail(email)) as UserShape;
+  const { email, passwordHash } = jwt.verify(token, secret) as UserShape & UserShapePassword;
+  const identity = (await userDAO.getUserByEmail(email)) as UserShape & UserShapePassword;
 
   if (identity.passwordHash !== passwordHash) {
     throw res.status(401).send(t('user:auth.password.invalidToken'));
diff --git a/modules/user/server-ts/social/shared.ts b/modules/user/server-ts/social/shared.ts
index ea80be7..8b05857 100644
--- a/modules/user/server-ts/social/shared.ts
+++ b/modules/user/server-ts/social/shared.ts
@@ -1,5 +1,5 @@
 import { access } from '@restapp/authentication-server-ts';
-import UserDAO, { UserShape } from '../sql';
+import UserDAO, { UserShape, UserShapePassword } from '../sql';
 
 export interface UserSocial {
   id: number;
@@ -9,7 +9,7 @@ export interface UserSocial {
 }
 
 export async function onAuthenticationSuccess(req: any, res: any) {
-  const user = (await UserDAO.getUserWithPassword(req.user.id)) as UserShape;
+  const user = (await UserDAO.getUserWithPassword(req.user.id)) as UserShape & UserShapePassword;
   const redirectUrl = req.query.state;
   const tokens = await access.grantAccess(user, req, user.passwordHash);
   if (redirectUrl) {
diff --git a/modules/user/server-ts/sql.ts b/modules/user/server-ts/sql.ts
index 45c0e28..3247659 100644
--- a/modules/user/server-ts/sql.ts
+++ b/modules/user/server-ts/sql.ts
@@ -5,13 +5,21 @@ import bcrypt from 'bcryptjs';
 import { knex, returnId } from '@restapp/database-server-ts';
 
 export interface UserShape {
-  id: number;
+  id?: number;
   username: string;
-  role: string;
-  isActive: boolean;
-  email: string;
-  passwordHash: string;
-  userId: number;
+  role?: string;
+  isActive?: boolean;
+  email?: string;
+  userId?: number;
+}
+
+export interface Profile {
+  firstName?: string;
+  lastName?: string;
+}
+
+export interface UserShapePassword {
+  passwordHash?: string;
 }
 
 interface OrderBy {
@@ -31,16 +39,6 @@ interface SocialInterface {
   userId: number;
 }
 
-export interface Profile {
-  firstName?: string;
-  lastName?: string;
-  id?: number;
-  username: string;
-  email: string;
-  role?: string;
-  isActive: boolean;
-}
-
 const userColumns = ['u.id', 'u.username', 'u.role', 'u.is_active', 'u.email', 'up.first_name', 'up.last_name'];
 const userColumnsWithSocial = [
   ...userColumns,
@@ -130,7 +128,7 @@ class UserDAO {
     );
   }
 
-  public register({ username, email, role = 'user', isActive }: Profile, passwordHash?: string | false) {
+  public register({ username, email, role = 'user', isActive }: UserShape, passwordHash?: string | false) {
     return knex('user').insert(decamelizeKeys({ username, email, role, passwordHash, isActive }));
   }
 
@@ -150,7 +148,7 @@ class UserDAO {
     return returnId(knex('auth_linkedin')).insert({ ln_id: id, display_name: displayName, user_id: userId });
   }
 
-  public editUser({ id, username, email, role, isActive }: Profile, passwordHash: string) {
+  public editUser({ id, username, email, role, isActive }: UserShape, passwordHash: string) {
     const localAuthInput = passwordHash ? { email, passwordHash } : { email };
     return knex('user')
       .update(decamelizeKeys({ username, role, isActive, ...localAuthInput }))

From 38be3a84d0ad4a071ca38e8e81206084a02a3a6b Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 20 May 2019 11:50:33 +0300
Subject: [PATCH 073/104] Move session settings to settings module

---
 config/auth.js                                |  9 ++++++--
 .../server-ts/access/session/index.ts         | 22 ++++++++++---------
 modules/core/common/clientStorage.ts          |  6 ++---
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index a770655..6fe1372 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -1,10 +1,15 @@
 export default {
   secret: process.env.NODE_ENV === 'test' ? 'secret for tests' : process.env.AUTH_SECRET,
   session: {
-    enabled: true
+    enabled: true,
+    secret: 'secret',
+    store: null,
+    cookie: { maxAge: 60000 },
+    resave: false,
+    saveUninitialized: false
   },
   jwt: {
-    enabled: false,
+    enabled: true,
     tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
index d2b53aa..c839a27 100644
--- a/modules/authentication/server-ts/access/session/index.ts
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -5,21 +5,24 @@ import passport from 'passport';
 
 import { RestMethod } from '@restapp/module-server-ts';
 
-import { access } from '../../';
 import settings from '../../../../../settings';
 import AccessModule from '../AccessModule';
 import { logout } from './controllers';
 
 const FileStore = require('session-file-store')(session);
 
+const {
+  auth: { session: sessionSetting }
+} = settings;
+
 const beforeware = (app: Express) => {
   app.use(
     session({
-      secret: 'secret',
-      store: __DEV__ ? new FileStore() : null,
-      cookie: { maxAge: 60000 },
-      resave: false,
-      saveUninitialized: false
+      secret: sessionSetting.secret,
+      store: __DEV__ ? new FileStore() : sessionSetting.store,
+      cookie: sessionSetting.cookie,
+      resave: sessionSetting.resave,
+      saveUninitialized: sessionSetting.saveUninitialized
     })
   );
   app.use(passport.initialize());
@@ -37,7 +40,7 @@ const accessMiddleware = (req: Request, res: Response, next: any) =>
       });
 
 const loginMiddleware = (req: any, res: any, next: any) => {
-  passport.authenticate('local', { session: settings.auth.session.enabled }, (err, user, info) => {
+  passport.authenticate('local', { session: sessionSetting.enabled }, (err, user, info) => {
     if (err || !user) {
       return res.status(400).json({
         errors: {
@@ -46,13 +49,12 @@ const loginMiddleware = (req: any, res: any, next: any) => {
       });
     }
 
-    req.login(user, { session: settings.auth.session.enabled }, async (loginErr: any) => {
+    req.login(user, { session: sessionSetting.enabled }, async (loginErr: any) => {
       if (loginErr) {
         res.send(loginErr);
       }
-      const tokens = settings.auth.jwt.enabled ? await access.grantAccess(user, req, user.passwordHash) : null;
 
-      return res.json({ user, tokens });
+      return res.json({ user });
     });
   })(req, res, next);
 };
diff --git a/modules/core/common/clientStorage.ts b/modules/core/common/clientStorage.ts
index e5a6e99..77dc203 100644
--- a/modules/core/common/clientStorage.ts
+++ b/modules/core/common/clientStorage.ts
@@ -1,3 +1,3 @@
-export const getItem = async (name: string) => window.sessionStorage.getItem(name);
-export const setItem = async (name: string, value: string) => window.sessionStorage.setItem(name, value);
-export const removeItem = async (name: string) => window.sessionStorage.removeItem(name);
+export const getItem = async (name: string) => window.localStorage.getItem(name);
+export const setItem = async (name: string, value: string) => window.localStorage.setItem(name, value);
+export const removeItem = async (name: string) => window.localStorage.removeItem(name);

From f568b2def52fe1ecdb944d4f6645f173fc6c9de9 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 20 May 2019 12:02:54 +0300
Subject: [PATCH 074/104] Fix check on empty tokens

---
 config/auth.js                          | 2 +-
 modules/user/server-ts/social/shared.ts | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index 6fe1372..ce14dc8 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -9,7 +9,7 @@ export default {
     saveUninitialized: false
   },
   jwt: {
-    enabled: true,
+    enabled: false,
     tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
diff --git a/modules/user/server-ts/social/shared.ts b/modules/user/server-ts/social/shared.ts
index 8b05857..1eb0877 100644
--- a/modules/user/server-ts/social/shared.ts
+++ b/modules/user/server-ts/social/shared.ts
@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash';
 import { access } from '@restapp/authentication-server-ts';
 import UserDAO, { UserShape, UserShapePassword } from '../sql';
 
@@ -13,9 +14,9 @@ export async function onAuthenticationSuccess(req: any, res: any) {
   const redirectUrl = req.query.state;
   const tokens = await access.grantAccess(user, req, user.passwordHash);
   if (redirectUrl) {
-    res.redirect(redirectUrl + (tokens ? '?data=' + JSON.stringify({ tokens }) : ''));
+    res.redirect(redirectUrl + (isEmpty(tokens) ? '?data=' + JSON.stringify({ tokens }) : ''));
   } else {
-    res.redirect(`/login${tokens ? '?data=' + JSON.stringify({ tokens }) : ''}`);
+    res.redirect(`/login${isEmpty(tokens) ? '?data=' + JSON.stringify({ tokens }) : ''}`);
   }
 }
 

From 84db025dca0244814cefde9cca62f85a32da556e Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 20 May 2019 13:02:41 +0300
Subject: [PATCH 075/104] Add interface for user action creators

---
 modules/user/client-react/actions/addUser.ts  | 13 ++++++-----
 .../user/client-react/actions/clearUser.ts    | 11 +++++----
 .../user/client-react/actions/currentUser.ts  | 20 ++++++++--------
 .../user/client-react/actions/deleteUser.ts   | 17 +++++++-------
 modules/user/client-react/actions/editUser.ts | 13 ++++++-----
 .../client-react/actions/forgotPassword.ts    | 13 ++++++-----
 modules/user/client-react/actions/index.ts    | 22 ++++++++++++++++++
 modules/user/client-react/actions/login.ts    | 19 +++++++--------
 modules/user/client-react/actions/register.ts | 13 ++++++-----
 .../client-react/actions/resetPassword.ts     | 13 ++++++-----
 modules/user/client-react/actions/user.ts     | 17 +++++++-------
 modules/user/client-react/actions/users.ts    | 23 ++++++++++---------
 12 files changed, 113 insertions(+), 81 deletions(-)

diff --git a/modules/user/client-react/actions/addUser.ts b/modules/user/client-react/actions/addUser.ts
index 53ce677..0913981 100644
--- a/modules/user/client-react/actions/addUser.ts
+++ b/modules/user/client-react/actions/addUser.ts
@@ -1,9 +1,10 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { User } from '..';
 
-export default function ADD_USER(user: User) {
-  return {
-    types: {},
-    APICall: () => axios.post(`${__API_URL__}/addUser`, { ...user })
-  };
-}
+const ADD_USER: ActionFunction<User> = user => ({
+  types: {},
+  APICall: () => axios.post(`${__API_URL__}/addUser`, { ...user })
+});
+
+export default ADD_USER;
diff --git a/modules/user/client-react/actions/clearUser.ts b/modules/user/client-react/actions/clearUser.ts
index 357e0d8..1d9835d 100644
--- a/modules/user/client-react/actions/clearUser.ts
+++ b/modules/user/client-react/actions/clearUser.ts
@@ -1,7 +1,8 @@
+import { ActionFunction } from '.';
 import { ActionType } from '../reducers';
 
-export default function CLEAR_USER() {
-  return {
-    type: ActionType.CLEAR_CURRENT_USER
-  };
-}
+const CLEAR_USER: ActionFunction = () => ({
+  type: ActionType.CLEAR_CURRENT_USER
+});
+
+export default CLEAR_USER;
diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
index 97aac0c..732e856 100644
--- a/modules/user/client-react/actions/currentUser.ts
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -1,13 +1,13 @@
 import axios from 'axios';
 import { ActionType } from '../reducers';
+import { ActionFunction } from '.';
 
-export default function CURRENT_USER() {
-  return {
-    types: {
-      REQUEST: ActionType.CLEAR_CURRENT_USER,
-      SUCCESS: ActionType.SET_CURRENT_USER,
-      FAIL: ActionType.CLEAR_CURRENT_USER
-    },
-    APICall: () => axios.get(`${__API_URL__}/currentUser`)
-  };
-}
+const CURRENT_USER: ActionFunction = () => ({
+  types: {
+    REQUEST: ActionType.CLEAR_CURRENT_USER,
+    SUCCESS: ActionType.SET_CURRENT_USER,
+    FAIL: ActionType.CLEAR_CURRENT_USER
+  },
+  APICall: () => axios.get(`${__API_URL__}/currentUser`)
+});
+export default CURRENT_USER;
diff --git a/modules/user/client-react/actions/deleteUser.ts b/modules/user/client-react/actions/deleteUser.ts
index ed55d61..28907df 100644
--- a/modules/user/client-react/actions/deleteUser.ts
+++ b/modules/user/client-react/actions/deleteUser.ts
@@ -1,11 +1,12 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { ActionType } from '../reducers';
 
-export default function DELETE_USER(id: number) {
-  return {
-    types: {
-      SUCCESS: ActionType.DELETE_USER
-    },
-    APICall: () => axios.delete(`${__API_URL__}/deleteUser`, { data: { id } })
-  };
-}
+const DELETE_USER: ActionFunction<number> = id => ({
+  types: {
+    SUCCESS: ActionType.DELETE_USER
+  },
+  APICall: () => axios.delete(`${__API_URL__}/deleteUser`, { data: { id } })
+});
+
+export default DELETE_USER;
diff --git a/modules/user/client-react/actions/editUser.ts b/modules/user/client-react/actions/editUser.ts
index fd4a609..2d7afc4 100644
--- a/modules/user/client-react/actions/editUser.ts
+++ b/modules/user/client-react/actions/editUser.ts
@@ -1,9 +1,10 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { User } from '..';
 
-export default function EDIT_USER(user: User) {
-  return {
-    types: {},
-    APICall: () => axios.post(`${__API_URL__}/editUser`, { ...user })
-  };
-}
+const EDIT_USER: ActionFunction<User> = user => ({
+  types: {},
+  APICall: () => axios.post(`${__API_URL__}/editUser`, { ...user })
+});
+
+export default EDIT_USER;
diff --git a/modules/user/client-react/actions/forgotPassword.ts b/modules/user/client-react/actions/forgotPassword.ts
index 7f5aaf5..0c3ef67 100644
--- a/modules/user/client-react/actions/forgotPassword.ts
+++ b/modules/user/client-react/actions/forgotPassword.ts
@@ -1,9 +1,10 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { ForgotPasswordSubmitProps } from '..';
 
-export default function FORGOT_PASSWORD(value: ForgotPasswordSubmitProps) {
-  return {
-    types: {},
-    APICall: () => axios.post(`${__API_URL__}/forgotPassword`, { value })
-  };
-}
+const FORGOT_PASSWORD: ActionFunction<ForgotPasswordSubmitProps> = value => ({
+  types: {},
+  APICall: () => axios.post(`${__API_URL__}/forgotPassword`, { value })
+});
+
+export default FORGOT_PASSWORD;
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 7e91e58..1c1e0ed 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -9,6 +9,28 @@ import EDIT_USER from './editUser';
 import ADD_USER from './addUser';
 import RESET_PASSWORD from './resetPassword';
 import FORGOT_PASSWORD from './forgotPassword';
+import { ActionType } from '../reducers';
+
+interface Types {
+  REQUEST?: ActionType;
+  SUCCESS?: ActionType;
+  FAIL?: ActionType;
+}
+interface ActionCreator {
+  type?: ActionType;
+  types?: Types;
+  APICall?: () => Promise<any>;
+  payload?: any;
+}
+
+/**
+ *
+ * Action description function that will be processed further by redux middleware.
+ * Must return an object with a @type property if the @APICall property is not in the action.
+ * If there is an @APICall property then @types property must also be returned.
+ *
+ */
+export type ActionFunction<P = null, P2 = null, P3 = null> = (param?: P, param2?: P2, param3?: P3) => ActionCreator;
 
 export {
   REGISTER,
diff --git a/modules/user/client-react/actions/login.ts b/modules/user/client-react/actions/login.ts
index 7e34347..365ef4d 100644
--- a/modules/user/client-react/actions/login.ts
+++ b/modules/user/client-react/actions/login.ts
@@ -1,13 +1,14 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { LoginSubmitProps } from '..';
 import { ActionType } from '../reducers';
 
-export default function LOGIN(value: LoginSubmitProps) {
-  return {
-    types: {
-      SUCCESS: ActionType.SET_CURRENT_USER,
-      FAIL: ActionType.CLEAR_CURRENT_USER
-    },
-    APICall: () => axios.post(`${__API_URL__}/login`, { ...value })
-  };
-}
+const LOGIN: ActionFunction<LoginSubmitProps> = value => ({
+  types: {
+    SUCCESS: ActionType.SET_CURRENT_USER,
+    FAIL: ActionType.CLEAR_CURRENT_USER
+  },
+  APICall: () => axios.post(`${__API_URL__}/login`, { ...value })
+});
+
+export default LOGIN;
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/actions/register.ts
index b976900..008a656 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/actions/register.ts
@@ -1,9 +1,10 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { RegisterSubmitProps } from '..';
 
-export default function REGISTER(value: RegisterSubmitProps) {
-  return {
-    types: {},
-    APICall: () => axios.post(`${__API_URL__}/register`, { ...value })
-  };
-}
+const REGISTER: ActionFunction<RegisterSubmitProps> = value => ({
+  types: {},
+  APICall: () => axios.post(`${__API_URL__}/register`, { ...value })
+});
+
+export default REGISTER;
diff --git a/modules/user/client-react/actions/resetPassword.ts b/modules/user/client-react/actions/resetPassword.ts
index 5546002..d7570b4 100644
--- a/modules/user/client-react/actions/resetPassword.ts
+++ b/modules/user/client-react/actions/resetPassword.ts
@@ -1,13 +1,14 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { ResetPasswordSubmitProps } from '..';
 
 interface ResetPasswordProps extends ResetPasswordSubmitProps {
   token: string;
 }
 
-export default function RESET_PASSWORD(value: ResetPasswordProps) {
-  return {
-    types: {},
-    APICall: () => axios.post(`${__API_URL__}/resetPassword`, { ...value })
-  };
-}
+const RESET_PASSWORD: ActionFunction<ResetPasswordProps> = value => ({
+  types: {},
+  APICall: () => axios.post(`${__API_URL__}/resetPassword`, { ...value })
+});
+
+export default RESET_PASSWORD;
diff --git a/modules/user/client-react/actions/user.ts b/modules/user/client-react/actions/user.ts
index 41d5ca9..24ec0ae 100644
--- a/modules/user/client-react/actions/user.ts
+++ b/modules/user/client-react/actions/user.ts
@@ -1,11 +1,12 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { ActionType } from '../reducers';
 
-export default function USER(id: number) {
-  return {
-    types: {
-      SUCCESS: ActionType.SET_USER
-    },
-    APICall: () => axios.get(`${__API_URL__}/user/${id}`)
-  };
-}
+const USER: ActionFunction<number> = id => ({
+  types: {
+    SUCCESS: ActionType.SET_USER
+  },
+  APICall: () => axios.get(`${__API_URL__}/user/${id}`)
+});
+
+export default USER;
diff --git a/modules/user/client-react/actions/users.ts b/modules/user/client-react/actions/users.ts
index 9369ba8..6edf756 100644
--- a/modules/user/client-react/actions/users.ts
+++ b/modules/user/client-react/actions/users.ts
@@ -1,15 +1,16 @@
 import axios from 'axios';
+import { ActionFunction } from '.';
 import { ActionType } from '../reducers';
 import { OrderBy, Filter } from '..';
 
-export default function USERS(orderBy: OrderBy, filter: Filter, type?: ActionType) {
-  return {
-    types: {
-      REQUEST: type ? ActionType[type] : null,
-      SUCCESS: ActionType.SET_USERS,
-      FAIL: ActionType.CLEAR_USERS
-    },
-    payload: { orderBy, filter },
-    APICall: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
-  };
-}
+const USERS: ActionFunction<OrderBy, Filter, ActionType> = (orderBy: OrderBy, filter: Filter, type: ActionType) => ({
+  types: {
+    REQUEST: type ? ActionType[type] : null,
+    SUCCESS: ActionType.SET_USERS,
+    FAIL: ActionType.CLEAR_USERS
+  },
+  payload: { orderBy, filter },
+  APICall: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
+});
+
+export default USERS;

From fb53859cd2334feb8666798c4c37485b04b3472f Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Mon, 20 May 2019 18:58:37 +0300
Subject: [PATCH 076/104] Add and Fix Profile on react-native app

---
 modules/core/client-react-native/App.tsx      |   3 +-
 modules/core/common/createReduxStore.ts       |   3 +-
 .../{CardLabel.jsx => CardLabel.tsx}          |  15 +-
 .../ui-native-base/components/CardText.jsx    |  21 --
 .../ui-native-base/components/CardText.tsx    |  20 ++
 .../ui-native-base/components/ListItem.jsx    |  19 --
 .../ui-native-base/components/ListItem.tsx    |  20 ++
 .../ui-native-base/components/SearchBar.jsx   |  25 --
 .../ui-native-base/components/SearchBar.tsx   |  17 ++
 .../ui-native-base/components/Select.jsx      |  73 ------
 .../ui-native-base/components/Select.tsx      |  85 ++++++
 .../components/{Switch.jsx => Switch.tsx}     |  19 +-
 .../ui-native-base/styles/CardLabel.js        |   9 -
 .../ui-native-base/styles/CardLabel.ts        |  15 ++
 .../ui-native-base/styles/CardText.js         |   7 -
 .../ui-native-base/styles/CardText.ts         |  13 +
 .../components/ProfileView.native.tsx         |  88 +++++++
 .../components/UserAddView.native.tsx         |  41 +++
 .../components/UserEditView.native.tsx        |  47 ++++
 .../components/UserForm.native.tsx            | 209 +++++++++++++++
 .../user/client-react/components/UserForm.tsx |   2 -
 .../components/UsersFilterView.native.tsx     | 243 ++++++++++++++++++
 .../components/UsersListView.native.tsx       | 131 ++++++++++
 .../user/client-react/containers/AuthBase.tsx |  28 +-
 .../containers/Profile.native.tsx             |  16 ++
 .../user/client-react/containers/Profile.tsx  |  10 +-
 .../user/client-react/containers/UserAdd.tsx  |   4 +-
 .../containers/UserEdit.native.tsx            |  61 +++++
 .../user/client-react/containers/UserEdit.tsx |  21 +-
 .../containers/UserScreenNavigator.native.tsx |   5 +-
 .../client-react/containers/Users.native.tsx  |  56 ++++
 modules/user/client-react/index.native.tsx    | 123 ++++++++-
 packages/mobile/.zenrc.js                     |   2 +-
 33 files changed, 1234 insertions(+), 217 deletions(-)
 rename modules/look/client-react-native/ui-native-base/components/{CardLabel.jsx => CardLabel.tsx} (50%)
 delete mode 100644 modules/look/client-react-native/ui-native-base/components/CardText.jsx
 create mode 100644 modules/look/client-react-native/ui-native-base/components/CardText.tsx
 delete mode 100644 modules/look/client-react-native/ui-native-base/components/ListItem.jsx
 create mode 100644 modules/look/client-react-native/ui-native-base/components/ListItem.tsx
 delete mode 100644 modules/look/client-react-native/ui-native-base/components/SearchBar.jsx
 create mode 100644 modules/look/client-react-native/ui-native-base/components/SearchBar.tsx
 delete mode 100644 modules/look/client-react-native/ui-native-base/components/Select.jsx
 create mode 100644 modules/look/client-react-native/ui-native-base/components/Select.tsx
 rename modules/look/client-react-native/ui-native-base/components/{Switch.jsx => Switch.tsx} (57%)
 delete mode 100644 modules/look/client-react-native/ui-native-base/styles/CardLabel.js
 create mode 100644 modules/look/client-react-native/ui-native-base/styles/CardLabel.ts
 delete mode 100644 modules/look/client-react-native/ui-native-base/styles/CardText.js
 create mode 100644 modules/look/client-react-native/ui-native-base/styles/CardText.ts
 create mode 100644 modules/user/client-react/components/ProfileView.native.tsx
 create mode 100644 modules/user/client-react/components/UserAddView.native.tsx
 create mode 100644 modules/user/client-react/components/UserEditView.native.tsx
 create mode 100644 modules/user/client-react/components/UserForm.native.tsx
 create mode 100644 modules/user/client-react/components/UsersFilterView.native.tsx
 create mode 100644 modules/user/client-react/components/UsersListView.native.tsx
 create mode 100644 modules/user/client-react/containers/Profile.native.tsx
 create mode 100644 modules/user/client-react/containers/UserEdit.native.tsx
 create mode 100644 modules/user/client-react/containers/Users.native.tsx

diff --git a/modules/core/client-react-native/App.tsx b/modules/core/client-react-native/App.tsx
index 31b35aa..5f4bb45 100644
--- a/modules/core/client-react-native/App.tsx
+++ b/modules/core/client-react-native/App.tsx
@@ -5,7 +5,6 @@ import url from 'url';
 import ClientModule from '@restapp/module-client-react-native';
 import log from '../../../packages/common/log';
 import createReduxStore from '../../../packages/common/createReduxStore';
-
 const { protocol, pathname, port } = url.parse(__API_URL__);
 
 interface MainProps {
@@ -32,7 +31,7 @@ export default class Main extends React.Component<MainProps> {
         : state => state,
       {}, // initial state
       null,
-      modules.requestMiddlewares
+      modules.reduxMiddlewares
     );
 
     log.info(`Connecting to REST backend at: ${apiUrl}`);
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index e30cc55..426105b 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -31,10 +31,11 @@ const requestMiddleware: Middleware = _state => next => action => {
         ...rest,
         payload: data
       });
+
       return data;
     } catch (e) {
       if (e.response && e.response.data && e.response.data.status === 401) {
-        return next({ ...action, status: e.response.data.status });
+        return next({ ...action, type: null, status: e.response.data.status });
       }
       const data = e.response && e.response.data;
       next({
diff --git a/modules/look/client-react-native/ui-native-base/components/CardLabel.jsx b/modules/look/client-react-native/ui-native-base/components/CardLabel.tsx
similarity index 50%
rename from modules/look/client-react-native/ui-native-base/components/CardLabel.jsx
rename to modules/look/client-react-native/ui-native-base/components/CardLabel.tsx
index eea6207..ebd8832 100644
--- a/modules/look/client-react-native/ui-native-base/components/CardLabel.jsx
+++ b/modules/look/client-react-native/ui-native-base/components/CardLabel.tsx
@@ -1,9 +1,13 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import { Text, StyleSheet } from 'react-native';
+import { Text, StyleSheet, ViewStyle, TextStyle } from 'react-native';
 import CardLabelStyles from '../styles/CardLabel';
 
-const CardLabel = ({ children, style, ...props }) => {
+interface CardLabelProps {
+  children?: string;
+  style?: ViewStyle | TextStyle;
+}
+
+const CardLabel = ({ children, style, ...props }: CardLabelProps) => {
   return (
     <Text style={[styles.text, style]} {...props}>
       {children.toUpperCase()}
@@ -11,11 +15,6 @@ const CardLabel = ({ children, style, ...props }) => {
   );
 };
 
-CardLabel.propTypes = {
-  children: PropTypes.string,
-  style: PropTypes.oneOfType([PropTypes.number, PropTypes.object])
-};
-
 const styles = StyleSheet.create(CardLabelStyles);
 
 export default CardLabel;
diff --git a/modules/look/client-react-native/ui-native-base/components/CardText.jsx b/modules/look/client-react-native/ui-native-base/components/CardText.jsx
deleted file mode 100644
index bc4d419..0000000
--- a/modules/look/client-react-native/ui-native-base/components/CardText.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Text, StyleSheet } from 'react-native';
-import CardTextStyles from '../styles/CardText';
-
-const CardText = ({ children, style, ...props }) => {
-  return (
-    <Text style={[styles.text, style]} {...props}>
-      {children}
-    </Text>
-  );
-};
-
-CardText.propTypes = {
-  children: PropTypes.string,
-  style: PropTypes.oneOfType([PropTypes.number, PropTypes.object])
-};
-
-const styles = StyleSheet.create(CardTextStyles);
-
-export default CardText;
diff --git a/modules/look/client-react-native/ui-native-base/components/CardText.tsx b/modules/look/client-react-native/ui-native-base/components/CardText.tsx
new file mode 100644
index 0000000..9e0f24c
--- /dev/null
+++ b/modules/look/client-react-native/ui-native-base/components/CardText.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { Text, StyleSheet, TextStyle, ViewStyle } from 'react-native';
+import CardTextStyles from '../styles/CardText';
+
+interface CardTextProps {
+  children?: string;
+  style?: ViewStyle | TextStyle;
+}
+
+const CardText = ({ children, style, ...props }: CardTextProps) => {
+  return (
+    <Text style={[styles.text, style]} {...props}>
+      {children}
+    </Text>
+  );
+};
+
+const styles = StyleSheet.create(CardTextStyles);
+
+export default CardText;
diff --git a/modules/look/client-react-native/ui-native-base/components/ListItem.jsx b/modules/look/client-react-native/ui-native-base/components/ListItem.jsx
deleted file mode 100644
index dbcb759..0000000
--- a/modules/look/client-react-native/ui-native-base/components/ListItem.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ListItem as NBListItem } from 'native-base';
-
-const ListItem = ({ children, onPress, onClick, ...props }) => {
-  return (
-    <NBListItem {...props} onPress={onPress || onClick}>
-      {children}
-    </NBListItem>
-  );
-};
-
-ListItem.propTypes = {
-  children: PropTypes.node,
-  onClick: PropTypes.func,
-  onPress: PropTypes.func
-};
-
-export default ListItem;
diff --git a/modules/look/client-react-native/ui-native-base/components/ListItem.tsx b/modules/look/client-react-native/ui-native-base/components/ListItem.tsx
new file mode 100644
index 0000000..5dbfbc2
--- /dev/null
+++ b/modules/look/client-react-native/ui-native-base/components/ListItem.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { ListItem as NBListItem } from 'native-base';
+import { GestureResponderEvent } from 'react-native';
+
+interface ListItemProps {
+  onClick?: (e: GestureResponderEvent) => void;
+  onPress?: (e: GestureResponderEvent) => void;
+  children?: React.ReactNode;
+  style?: any;
+}
+
+const ListItem = ({ children, onPress, onClick, ...props }: ListItemProps) => {
+  return (
+    <NBListItem {...props} onPress={onPress || onClick}>
+      {children}
+    </NBListItem>
+  );
+};
+
+export default ListItem;
diff --git a/modules/look/client-react-native/ui-native-base/components/SearchBar.jsx b/modules/look/client-react-native/ui-native-base/components/SearchBar.jsx
deleted file mode 100644
index 356c152..0000000
--- a/modules/look/client-react-native/ui-native-base/components/SearchBar.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Item, Input, Icon } from 'native-base';
-import { placeholderColor } from '../../styles';
-
-const SearchBar = ({ onChange, onChangeText, ...props }) => {
-  return (
-    <Item>
-      <Icon name="ios-search" />
-      <Input
-        placeholderTextColor={placeholderColor}
-        placeholder="Search"
-        onChangeText={onChangeText || onChange}
-        {...props}
-      />
-    </Item>
-  );
-};
-
-SearchBar.propTypes = {
-  onChange: PropTypes.func,
-  onChangeText: PropTypes.func
-};
-
-export default SearchBar;
diff --git a/modules/look/client-react-native/ui-native-base/components/SearchBar.tsx b/modules/look/client-react-native/ui-native-base/components/SearchBar.tsx
new file mode 100644
index 0000000..7c15942
--- /dev/null
+++ b/modules/look/client-react-native/ui-native-base/components/SearchBar.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import * as ReactNative from 'react-native';
+import { Item, Input, Icon } from 'native-base';
+import { placeholderColor } from '../../styles';
+
+interface SearchBarProps extends ReactNative.TextInputProps {}
+
+const SearchBar = ({ ...props }: SearchBarProps) => {
+  return (
+    <Item>
+      <Icon name="ios-search" />
+      <Input placeholderTextColor={placeholderColor} {...props} />
+    </Item>
+  );
+};
+
+export default SearchBar;
diff --git a/modules/look/client-react-native/ui-native-base/components/Select.jsx b/modules/look/client-react-native/ui-native-base/components/Select.jsx
deleted file mode 100644
index a0fae26..0000000
--- a/modules/look/client-react-native/ui-native-base/components/Select.jsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Platform, StyleSheet } from 'react-native';
-import { Picker, Item } from 'native-base';
-import { FontAwesome } from '@expo/vector-icons';
-import SelectStyles from '../styles/Select';
-
-const Select = ({
-  icon,
-  iconName,
-  iconColor,
-  iconSize,
-  data,
-  onValueChange,
-  selectedValue,
-  value,
-  onChange,
-  style,
-  itemStyle,
-  placeholder = '...',
-  ...props
-}) => {
-  return Platform.OS === 'ios' ? (
-    <Item style={{ flex: 1 }}>
-      {icon && (
-        <FontAwesome name={iconName || 'filter'} size={iconSize || 20} style={{ color: `${iconColor || '#000'}` }} />
-      )}
-      <Picker
-        placeholder={placeholder}
-        style={style}
-        onValueChange={onValueChange || onChange}
-        selectedValue={selectedValue || value}
-        {...props}
-      >
-        {data.map((option, idx) => (
-          <Picker.Item style={itemStyle} key={idx} label={option.label} value={option.value} />
-        ))}
-      </Picker>
-    </Item>
-  ) : (
-    <Item>
-      <Picker
-        style={[styles.androidPickerWrapper, style]}
-        onValueChange={onValueChange || onChange}
-        selectedValue={selectedValue || value}
-        {...props}
-      >
-        {data.map((option, idx) => (
-          <Picker.Item style={itemStyle} key={idx} label={option.label} value={option.value} />
-        ))}
-      </Picker>
-    </Item>
-  );
-};
-
-Select.propTypes = {
-  data: PropTypes.array.isRequired,
-  onValueChange: PropTypes.func,
-  onChange: PropTypes.func,
-  value: PropTypes.string,
-  selectedValue: PropTypes.string,
-  placeholder: PropTypes.string,
-  icon: PropTypes.bool,
-  iconName: PropTypes.string,
-  iconColor: PropTypes.string,
-  iconSize: PropTypes.number,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
-  itemStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number])
-};
-
-const styles = StyleSheet.create(SelectStyles);
-
-export default Select;
diff --git a/modules/look/client-react-native/ui-native-base/components/Select.tsx b/modules/look/client-react-native/ui-native-base/components/Select.tsx
new file mode 100644
index 0000000..070e806
--- /dev/null
+++ b/modules/look/client-react-native/ui-native-base/components/Select.tsx
@@ -0,0 +1,85 @@
+import * as React from 'react';
+import * as ReactNative from 'react-native';
+import { Platform, StyleSheet, ViewStyle, TextStyle } from 'react-native';
+import { Picker, Item } from 'native-base';
+import { FontAwesome } from '@expo/vector-icons';
+import { omit } from 'lodash';
+import SelectStyles from '../styles/Select';
+
+interface Option {
+  value: string;
+  label: string;
+}
+interface AntProps {
+  okText: string;
+  dismissText: string;
+  cols: number;
+  extra: string;
+}
+
+interface SelectProps extends ReactNative.PickerProps, AntProps {
+  data: Option[];
+  onValueChange?: (value: string) => void;
+  onChange?: (value: string) => void;
+  value?: string;
+  selectedValue?: string;
+  placeholder?: string;
+  icon?: boolean;
+  iconName?: string;
+  iconColor?: string;
+  iconSize?: number;
+  style?: ViewStyle | TextStyle;
+}
+
+const Select: React.FunctionComponent<SelectProps> = selectProps => {
+  const {
+    icon,
+    iconName,
+    iconColor,
+    iconSize,
+    data,
+    onValueChange,
+    selectedValue,
+    value,
+    onChange,
+    style,
+    itemStyle,
+    placeholder = '...',
+    ...props
+  } = omit(selectProps, ['okText', 'dismissText', 'cols', 'extra']);
+  return Platform.OS === 'ios' ? (
+    <Item style={{ flex: 1 }}>
+      {icon && (
+        <FontAwesome name={iconName || 'filter'} size={iconSize || 20} style={{ color: `${iconColor || '#000'}` }} />
+      )}
+      <Picker
+        placeholder={placeholder}
+        style={style}
+        onValueChange={onValueChange || onChange}
+        selectedValue={selectedValue || value}
+        {...props}
+      >
+        {data.map((option, idx) => (
+          <Picker.Item key={idx} label={option.label} value={option.value} />
+        ))}
+      </Picker>
+    </Item>
+  ) : (
+    <Item>
+      <Picker
+        style={[styles.androidPickerWrapper, style]}
+        onValueChange={onValueChange || onChange}
+        selectedValue={selectedValue || value}
+        {...props}
+      >
+        {data.map((option, idx) => (
+          <Picker.Item key={idx} label={option.label} value={option.value} />
+        ))}
+      </Picker>
+    </Item>
+  );
+};
+
+const styles = StyleSheet.create(SelectStyles);
+
+export default Select;
diff --git a/modules/look/client-react-native/ui-native-base/components/Switch.jsx b/modules/look/client-react-native/ui-native-base/components/Switch.tsx
similarity index 57%
rename from modules/look/client-react-native/ui-native-base/components/Switch.jsx
rename to modules/look/client-react-native/ui-native-base/components/Switch.tsx
index e136f8c..3e12b08 100644
--- a/modules/look/client-react-native/ui-native-base/components/Switch.jsx
+++ b/modules/look/client-react-native/ui-native-base/components/Switch.tsx
@@ -1,17 +1,16 @@
 import React from 'react';
 import { Switch as NBSwitch } from 'native-base';
-import PropTypes from 'prop-types';
 
-const Switch = ({ color, checked, value, onValueChange, onChange, ...props }) => {
-  return <NBSwitch onTintColor={color} value={value || checked} onValueChange={onValueChange || onChange} {...props} />;
-};
+interface SwitchProps {
+  checked?: boolean;
+  value: boolean;
+  color?: string;
+  onValueChange?: (value: boolean) => void;
+  onChange?: (value: boolean) => void;
+}
 
-Switch.propTypes = {
-  checked: PropTypes.bool,
-  value: PropTypes.bool,
-  color: PropTypes.string,
-  onValueChange: PropTypes.func,
-  onChange: PropTypes.func
+const Switch = ({ color, checked, value, onValueChange, onChange, ...props }: SwitchProps) => {
+  return <NBSwitch onTintColor={color} value={value || checked} onValueChange={onValueChange || onChange} {...props} />;
 };
 
 export default Switch;
diff --git a/modules/look/client-react-native/ui-native-base/styles/CardLabel.js b/modules/look/client-react-native/ui-native-base/styles/CardLabel.js
deleted file mode 100644
index 2fca6ea..0000000
--- a/modules/look/client-react-native/ui-native-base/styles/CardLabel.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const CardLabelStyles = {
-  text: {
-    fontSize: 12,
-    fontWeight: '600',
-    color: '#686b70'
-  }
-};
-
-export default CardLabelStyles;
diff --git a/modules/look/client-react-native/ui-native-base/styles/CardLabel.ts b/modules/look/client-react-native/ui-native-base/styles/CardLabel.ts
new file mode 100644
index 0000000..947753b
--- /dev/null
+++ b/modules/look/client-react-native/ui-native-base/styles/CardLabel.ts
@@ -0,0 +1,15 @@
+import { ViewStyle, TextStyle } from 'react-native';
+
+interface Styles {
+  [key: string]: ViewStyle | TextStyle;
+}
+
+const CardLabelStyles: Styles = {
+  text: {
+    fontSize: 12,
+    fontWeight: '600',
+    color: '#686b70'
+  }
+};
+
+export default CardLabelStyles;
diff --git a/modules/look/client-react-native/ui-native-base/styles/CardText.js b/modules/look/client-react-native/ui-native-base/styles/CardText.js
deleted file mode 100644
index b911ca8..0000000
--- a/modules/look/client-react-native/ui-native-base/styles/CardText.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const CardTextStyles = {
-  text: {
-    fontSize: 14
-  }
-};
-
-export default CardTextStyles;
diff --git a/modules/look/client-react-native/ui-native-base/styles/CardText.ts b/modules/look/client-react-native/ui-native-base/styles/CardText.ts
new file mode 100644
index 0000000..eb2db55
--- /dev/null
+++ b/modules/look/client-react-native/ui-native-base/styles/CardText.ts
@@ -0,0 +1,13 @@
+import { ViewStyle, TextStyle } from 'react-native';
+
+interface Styles {
+  [key: string]: ViewStyle | TextStyle;
+}
+
+const CardTextStyles: Styles = {
+  text: {
+    fontSize: 14
+  }
+};
+
+export default CardTextStyles;
diff --git a/modules/user/client-react/components/ProfileView.native.tsx b/modules/user/client-react/components/ProfileView.native.tsx
new file mode 100644
index 0000000..502291a
--- /dev/null
+++ b/modules/user/client-react/components/ProfileView.native.tsx
@@ -0,0 +1,88 @@
+import * as React from 'react';
+import { StyleSheet, Text, View, ScrollView, TouchableOpacity } from 'react-native';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { Card, CardItem, CardText, CardHeader, CardLabel, Loading } from '@restapp/look-client-react-native';
+import { linkText } from '@restapp/look-client-react-native/styles';
+
+import { NavigationOptionsProps, User } from '../index.native';
+
+interface ProfileViewProps extends NavigationOptionsProps {
+  currentUserLoading: boolean;
+  currentUser: User;
+  t: TranslateFunction;
+}
+
+type ProfileItemProps = (title: string, value: string, idx: number) => JSX.Element;
+
+const renderProfileItem: ProfileItemProps = (title, value, idx) => (
+  <CardItem key={idx}>
+    <CardLabel>{`${title}: `}</CardLabel>
+    <CardText>{value}</CardText>
+  </CardItem>
+);
+
+const ProfileView: React.FunctionComponent<ProfileViewProps> = ({ currentUserLoading, currentUser, navigation, t }) => {
+  const profileItems = currentUser
+    ? [
+        {
+          label: `${t('profile.card.group.name')}`,
+          value: currentUser.username
+        },
+        {
+          label: `${t('profile.card.group.email')}`,
+          value: currentUser.email
+        },
+        {
+          label: `${t('profile.card.group.role')}`,
+          value: currentUser.role
+        }
+      ]
+    : [];
+
+  if (currentUser && currentUser.fullName) {
+    profileItems.push({ label: `${t('profile.card.group.full')}`, value: currentUser.fullName });
+  }
+
+  return (
+    <View style={styles.container}>
+      {currentUserLoading ? (
+        <Loading text={t('profile.loadMsg')} />
+      ) : (
+        <ScrollView contentContainerStyle={styles.scrollContainer}>
+          <View style={styles.cardWrapper}>
+            <Card>
+              <CardHeader title={t('profile.headerText')} />
+              {profileItems.map((item, idx) => renderProfileItem(item.label, item.value, idx))}
+            </Card>
+          </View>
+          <TouchableOpacity
+            style={styles.linkWrapper}
+            onPress={() => navigation.navigate('ProfileEdit', { id: currentUser.id })}
+          >
+            <Text style={styles.linkText}>{t('profile.editProfileText')}</Text>
+          </TouchableOpacity>
+        </ScrollView>
+      )}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  scrollContainer: {
+    paddingTop: 10,
+    paddingHorizontal: 20
+  },
+  container: {
+    flex: 1
+  },
+  cardWrapper: {
+    marginBottom: 15
+  },
+  linkWrapper: {
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  linkText
+});
+
+export default translate('user')(ProfileView);
diff --git a/modules/user/client-react/components/UserAddView.native.tsx b/modules/user/client-react/components/UserAddView.native.tsx
new file mode 100644
index 0000000..18457e8
--- /dev/null
+++ b/modules/user/client-react/components/UserAddView.native.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { StyleSheet, View } from 'react-native';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+
+import UserForm from './UserForm';
+
+import { User } from '../index.native';
+
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
+
+interface UserAddViewProps {
+  t: TranslateFunction;
+  onSubmit: (values: FormValues) => Promise<void>;
+}
+
+class UserAddView extends React.PureComponent<UserAddViewProps> {
+  public render() {
+    return (
+      <View style={styles.container}>
+        <UserForm
+          onSubmit={this.props.onSubmit}
+          initialValues={{}}
+          shouldDisplayRole={true}
+          shouldDisplayActive={true}
+        />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center'
+  }
+});
+
+export default translate('user')(UserAddView);
diff --git a/modules/user/client-react/components/UserEditView.native.tsx b/modules/user/client-react/components/UserEditView.native.tsx
new file mode 100644
index 0000000..f8d81ca
--- /dev/null
+++ b/modules/user/client-react/components/UserEditView.native.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react';
+import { StyleSheet, View } from 'react-native';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { Loading } from '@restapp/look-client-react-native';
+
+import UserForm from './UserForm';
+import { User, ResetPasswordSubmitProps } from '../index.native';
+
+interface FormValues extends User, ResetPasswordSubmitProps {}
+
+interface UserEditViewProps {
+  loading: boolean;
+  user: User;
+  currentUser: User;
+  t: TranslateFunction;
+  onSubmit: (values: FormValues) => Promise<void>;
+}
+
+class UserEditView extends React.PureComponent<UserEditViewProps> {
+  public render() {
+    const { loading, user, t, currentUser } = this.props;
+    if (loading && !user) {
+      return <Loading text={t('userEdit.loadMsg')} />;
+    } else {
+      const isNotSelf = !user || (user && user.id !== currentUser.id);
+      return (
+        <View style={styles.container}>
+          <UserForm
+            onSubmit={this.props.onSubmit}
+            shouldDisplayRole={isNotSelf}
+            shouldDisplayActive={isNotSelf}
+            initialValues={user || {}}
+          />
+        </View>
+      );
+    }
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center'
+  }
+});
+
+export default translate('user')(UserEditView);
diff --git a/modules/user/client-react/components/UserForm.native.tsx b/modules/user/client-react/components/UserForm.native.tsx
new file mode 100644
index 0000000..ab52c05
--- /dev/null
+++ b/modules/user/client-react/components/UserForm.native.tsx
@@ -0,0 +1,209 @@
+import * as React from 'react';
+import { withFormik, FormikProps } from 'formik';
+import { View, StyleSheet } from 'react-native';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+
+import { RenderField, Button, RenderSelect, RenderSwitch, FormView, primary } from '@restapp/look-client-react-native';
+import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
+import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
+
+import { FormProps, User, UserRole } from '../index.native';
+
+import settings from '../../../../settings';
+
+interface FormikFormProps extends FormProps<FormValues> {
+  initialValues: FormValues;
+}
+
+interface UserFormProps extends FormikProps<FormValues> {
+  handleSubmit: () => void;
+  t: TranslateFunction;
+  handleChange: () => void;
+  setFieldValue: (type: string, value: any) => void;
+  onSubmit: (values: FormValues) => Promise<void>;
+  setTouched: () => void;
+  isValid: boolean;
+  error: string;
+  shouldDisplayRole: boolean;
+  shouldDisplayActive: boolean;
+  values: any;
+  errors: any;
+  initialValues: FormValues;
+  touched: any;
+}
+
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
+
+type RoleChangeFunc = (
+  type: string,
+  value: string | string[],
+  setFieldValue: (type: string, value: string) => void
+) => void;
+
+const userFormSchema = {
+  username: [required, minLength(3)],
+  email: [required, emailRule],
+  password: [required, minLength(settings.auth.password.minLength)],
+  passwordConfirmation: [match('password'), required, minLength(settings.auth.password.minLength)]
+};
+
+const handleRoleChange: RoleChangeFunc = (type, value, setFieldValue) => {
+  const preparedValue = Array.isArray(value) ? value[0] : value;
+  setFieldValue(type, preparedValue);
+};
+
+const UserForm: React.FunctionComponent<UserFormProps> = ({
+  values,
+  handleSubmit,
+  setFieldValue,
+  t,
+  shouldDisplayRole,
+  shouldDisplayActive
+}) => {
+  const options = [
+    {
+      value: 'user',
+      label: t('userEdit.form.field.role.user')
+    },
+    {
+      value: 'admin',
+      label: t('userEdit.form.field.role.admin')
+    }
+  ];
+  const { username, email, role, isActive, firstName, lastName, password, passwordConfirmation } = values;
+  return (
+    <FormView contentContainerStyle={{ flexGrow: 1 }} style={styles.formView}>
+      <View style={styles.formContainer}>
+        <Field
+          placeholder={t('userEdit.form.field.name')}
+          name="username"
+          component={RenderField}
+          type="text"
+          value={username}
+          placeholderTextColor={placeholderColor}
+        />
+        <Field
+          name="email"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.email')}
+          value={email}
+          keyboardType="email-address"
+          placeholderTextColor={placeholderColor}
+        />
+        {shouldDisplayRole && (
+          <Field
+            name="role"
+            component={RenderSelect}
+            label={t('userEdit.form.field.role.label')}
+            okText={t('userEdit.select.okText')}
+            dismissText={t('userEdit.select.dismissText')}
+            placeholderTextColor={placeholderColor}
+            selectedValue={role}
+            onChange={(value: string) => handleRoleChange('role', value, setFieldValue)}
+            cols={1}
+            data={options}
+          />
+        )}
+        {shouldDisplayActive && (
+          <Field
+            name="isActive"
+            label={t('userEdit.form.field.active')}
+            onChange={() => setFieldValue('isActive', !isActive)}
+            component={RenderSwitch}
+            placeholder={t('userEdit.form.field.active')}
+            checked={isActive}
+            placeholderTextColor={placeholderColor}
+          />
+        )}
+        <Field
+          name="firstName"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.firstName')}
+          placeholderTextColor={placeholderColor}
+          label={t('userEdit.form.field.firstName')}
+          value={firstName}
+        />
+
+        <Field
+          name="lastName"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.lastName')}
+          placeholderTextColor={placeholderColor}
+          value={lastName}
+        />
+        <Field
+          name="password"
+          secureTextEntry={true}
+          component={RenderField}
+          type="password"
+          placeholder={t('userEdit.form.field.pass')}
+          placeholderTextColor={placeholderColor}
+          value={password}
+        />
+        <Field
+          name="passwordConfirmation"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.passConf')}
+          placeholderTextColor={placeholderColor}
+          value={passwordConfirmation}
+          type="password"
+          secureTextEntry={true}
+        />
+        <View style={styles.submit}>
+          <Button type={primary} onPress={handleSubmit}>
+            {t('userEdit.form.btnSubmit')}
+          </Button>
+        </View>
+      </View>
+      <KeyboardSpacer />
+    </FormView>
+  );
+};
+
+const UserFormWithFormik = withFormik<FormikFormProps, FormValues>({
+  mapPropsToValues: values => {
+    const { username, email, role, isActive, firstName, lastName, ...rest } = values.initialValues;
+    return {
+      username,
+      email,
+      role: role || UserRole.user,
+      isActive,
+      password: '',
+      passwordConfirmation: '',
+      firstName,
+      lastName,
+      ...rest
+    };
+  },
+  handleSubmit(values, { setErrors, props: { onSubmit } }) {
+    onSubmit(values).catch((e: any) => {
+      if (e && e.errors) {
+        setErrors(e.errors);
+      } else {
+        throw e;
+      }
+    });
+  },
+  displayName: 'SignUpForm ', // helps with React DevTools
+  validate: values => validate(values, userFormSchema)
+});
+
+const styles = StyleSheet.create({
+  formContainer: {
+    paddingHorizontal: 20,
+    justifyContent: 'center',
+    flex: 1
+  },
+  submit,
+  formView: {
+    flex: 1,
+    alignSelf: 'stretch'
+  }
+});
+
+export default translate('user')(UserFormWithFormik(UserForm));
diff --git a/modules/user/client-react/components/UserForm.tsx b/modules/user/client-react/components/UserForm.tsx
index b6cd7fa..79e3dcc 100644
--- a/modules/user/client-react/components/UserForm.tsx
+++ b/modules/user/client-react/components/UserForm.tsx
@@ -51,8 +51,6 @@ const UserForm: React.FunctionComponent<UserFormProps> = ({
   values,
   handleSubmit,
   errors,
-  setFieldValue,
-
   t,
   shouldDisplayRole,
   shouldDisplayActive
diff --git a/modules/user/client-react/components/UsersFilterView.native.tsx b/modules/user/client-react/components/UsersFilterView.native.tsx
new file mode 100644
index 0000000..20b90d8
--- /dev/null
+++ b/modules/user/client-react/components/UsersFilterView.native.tsx
@@ -0,0 +1,243 @@
+import * as React from 'react';
+import { View, StyleSheet, Text, TouchableOpacity } from 'react-native';
+import { debounce } from 'lodash';
+import { FontAwesome } from '@expo/vector-icons';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import {
+  Select,
+  SearchBar,
+  Switch,
+  List,
+  ListItem,
+  success,
+  danger,
+  Modal,
+  Button
+} from '@restapp/look-client-react-native';
+import { itemAction, itemContainer, itemTitle } from '@restapp/look-client-react-native/styles';
+import { OrderBy } from '../index.native';
+
+interface UsersFilterViewProps {
+  searchText: string;
+  role: string;
+  isActive: boolean;
+  onSearchTextChange: (value: string) => void;
+  onRoleChange: (value: string) => void;
+  onIsActiveChange: (isActive: boolean) => void;
+  orderBy: OrderBy;
+  onOrderBy: (order: OrderBy) => void;
+  t: TranslateFunction;
+  filter: any;
+}
+
+interface UsersFilterViewState {
+  showModal: boolean;
+  orderBy: OrderBy;
+}
+
+type ListItemProps = (label: string, value: string, idx: number) => JSX.Element;
+
+class UsersFilterView extends React.PureComponent<UsersFilterViewProps, UsersFilterViewState> {
+  private onChangeTextDelayed: (value: string) => void = null;
+  constructor(props: UsersFilterViewProps) {
+    super(props);
+    this.state = {
+      showModal: false,
+      orderBy: {
+        column: '',
+        order: ''
+      }
+    };
+    this.onChangeTextDelayed = debounce(this.handleSearch, 500);
+  }
+
+  public renderOrderByArrow = (name: string) => {
+    const { orderBy } = this.state;
+
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'desc') {
+        return <FontAwesome name="long-arrow-up" size={16} style={styles.iconStyle} />;
+      } else {
+        return <FontAwesome name="long-arrow-down" size={16} style={styles.iconStyle} />;
+      }
+    } else {
+      return <FontAwesome name="arrows-v" size={16} style={styles.iconStyle} />;
+    }
+  };
+
+  public orderBy = (name: string) => {
+    const { orderBy } = this.state;
+
+    let order = 'asc';
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'asc') {
+        order = 'desc';
+      } else if (orderBy.order === 'desc') {
+        return this.setState({
+          orderBy: {
+            column: '',
+            order: ''
+          }
+        });
+      }
+    }
+    return this.setState({ orderBy: { column: name, order } });
+  };
+
+  public renderListItem: ListItemProps = (label, value, idx) => {
+    return (
+      <ListItem key={idx} onPress={() => this.orderBy(value)}>
+        <View style={styles.itemContainer}>
+          <View style={styles.itemTitle}>
+            <Text>{label}</Text>
+          </View>
+          <View style={styles.itemAction}>{this.renderOrderByArrow(value)}</View>
+        </View>
+      </ListItem>
+    );
+  };
+
+  public renderModalChildren = () => {
+    const { orderBy, t } = this.props;
+
+    const orderByParams = [
+      {
+        label: t('users.column.name'),
+        value: 'username'
+      },
+      {
+        label: t('users.column.email'),
+        value: 'email'
+      },
+      {
+        label: t('users.column.role'),
+        value: 'role'
+      },
+      {
+        label: t('users.column.active'),
+        value: 'isActive'
+      }
+    ];
+    return (
+      <View>
+        <View style={styles.listWrapper}>
+          <List>{orderByParams.map((item, idx) => this.renderListItem(item.label, item.value, idx))}</List>
+        </View>
+        <View style={styles.buttonWrapper}>
+          <Button type={success} onPress={this.onOrderBy}>
+            {t('users.btnModalSubmit')}
+          </Button>
+        </View>
+        <View style={styles.buttonWrapper}>
+          <Button type={danger} onPress={() => this.setState({ showModal: !this.state.showModal, orderBy })}>
+            {t('users.btnModalClose')}
+          </Button>
+        </View>
+      </View>
+    );
+  };
+
+  public onOrderBy = () => {
+    this.props.onOrderBy(this.state.orderBy);
+    this.setState({ showModal: false });
+  };
+
+  public handleSearch = (text: string) => {
+    const { onSearchTextChange } = this.props;
+    onSearchTextChange(text);
+  };
+
+  public handleRole = (value: string) => {
+    const { onRoleChange } = this.props;
+    onRoleChange(value);
+  };
+
+  public handleIsActive = () => {
+    const {
+      onIsActiveChange,
+      filter: { isActive }
+    } = this.props;
+    onIsActiveChange(!isActive);
+  };
+
+  public render() {
+    const {
+      filter: { role, isActive },
+      t
+    } = this.props;
+    const options = [
+      { value: '', label: t('users.list.item.role.all') },
+      { value: 'user', label: t('users.list.item.role.user') },
+      { value: 'admin', label: t('users.list.item.role.admin') }
+    ];
+    return (
+      <View style={styles.container}>
+        <View style={{ flex: 1 }}>
+          <SearchBar placeholder={t('users.list.item.search')} onChangeText={this.onChangeTextDelayed} />
+        </View>
+        <View style={styles.itemContainer}>
+          <Text style={styles.itemTitle}>{t('users.list.item.role.label')}</Text>
+          <View style={[styles.itemAction, styles.itemSelect]}>
+            <Select
+              icon
+              iconName="caret-down"
+              placeholder={t('users.list.item.role.all')}
+              mode="dropdown"
+              data={options}
+              selectedValue={role}
+              onChange={value => this.handleRole(value)}
+              okText={t('users.select.okText')}
+              dismissText={t('users.select.dismissText')}
+              cols={1}
+              extra={t('users.list.item.role.all')}
+            />
+          </View>
+        </View>
+        <View style={styles.itemContainer}>
+          <Text style={styles.itemTitle}>{t('users.column.active')}</Text>
+          <View style={styles.itemAction}>
+            <Switch onChange={this.handleIsActive} value={isActive} />
+          </View>
+        </View>
+        <TouchableOpacity style={styles.itemContainer} onPress={() => this.setState({ showModal: true })}>
+          <Text style={styles.itemTitle}>{t('users.orderByText')}</Text>
+          <View style={styles.itemAction}>
+            <FontAwesome name="sort" size={25} style={styles.iconStyle} />
+          </View>
+        </TouchableOpacity>
+        <Modal
+          isVisible={this.state.showModal}
+          onSwipe={() => this.setState({ showModal: false })}
+          onBackdropPress={() => this.setState({ showModal: false })}
+          swipeDirection="left"
+        >
+          {this.renderModalChildren()}
+        </Modal>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    paddingHorizontal: 15
+  },
+  itemAction,
+  itemContainer,
+  itemTitle,
+  itemSelect: {
+    flex: 2
+  },
+  iconStyle: {
+    color: '#000'
+  },
+  buttonWrapper: {
+    marginTop: 10
+  },
+  listWrapper: {
+    backgroundColor: '#fff'
+  }
+});
+
+export default translate('user')(UsersFilterView);
diff --git a/modules/user/client-react/components/UsersListView.native.tsx b/modules/user/client-react/components/UsersListView.native.tsx
new file mode 100644
index 0000000..4e6a56b
--- /dev/null
+++ b/modules/user/client-react/components/UsersListView.native.tsx
@@ -0,0 +1,131 @@
+import React from 'react';
+import { ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { FontAwesome } from '@expo/vector-icons';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import {
+  Button,
+  Card,
+  CardItem,
+  CardLabel,
+  CardText,
+  List,
+  ListItem,
+  Loading,
+  primary
+} from '@restapp/look-client-react-native';
+
+import { NavigationOptionsProps, User } from '../index.native';
+
+interface UsersListViewProps extends NavigationOptionsProps {
+  users: User[];
+  deleteUser: (id: number | string) => void;
+  loading: boolean;
+  t: TranslateFunction;
+}
+
+const UsersListView = ({ users, loading, navigation, deleteUser, t }: UsersListViewProps) => {
+  return (
+    <View style={styles.container}>
+      {loading ? (
+        <Loading text={t('users.loadMsg')} />
+      ) : (
+        <ScrollView>
+          <View>
+            <View style={styles.buttonWrapper}>
+              <Button type={primary} onPress={() => navigation.navigate('UserAdd')}>
+                {t('users.btn.add')}
+              </Button>
+            </View>
+            {(users && users.length && (
+              <List>
+                {users.map(({ username, email, isActive, role, id }, idx) => (
+                  <ListItem style={styles.listItem} key={idx} onPress={() => navigation.navigate('UserEdit', { id })}>
+                    <Card style={styles.cardItem}>
+                      <CardItem>
+                        <View style={styles.cardItem}>
+                          <CardItem style={styles.cardItemWrapper}>
+                            <CardLabel>{`${t('users.column.name')}: `}</CardLabel>
+                            <CardText>{username}</CardText>
+                          </CardItem>
+                          <CardItem style={styles.cardItemWrapper}>
+                            <CardLabel>{`${t('users.column.email')}: `}</CardLabel>
+                            <CardText>{email}</CardText>
+                          </CardItem>
+                          <CardItem style={styles.cardItemWrapper}>
+                            <CardLabel>{`${t('users.column.role')}: `}</CardLabel>
+                            <CardText>{role}</CardText>
+                          </CardItem>
+                          <CardItem style={styles.cardItemWrapper}>
+                            <CardLabel>{`${t('users.column.active')}: `}</CardLabel>
+                            <CardText>{String(isActive)}</CardText>
+                          </CardItem>
+                        </View>
+                        <View style={styles.buttonContainer}>
+                          <TouchableOpacity style={styles.iconWrapper} onPress={() => deleteUser(id)}>
+                            <FontAwesome name="trash" size={25} style={{ color: '#de5251' }} />
+                          </TouchableOpacity>
+                        </View>
+                      </CardItem>
+                    </Card>
+                  </ListItem>
+                ))}
+              </List>
+            )) || (
+              <View style={styles.notificationContainer}>
+                <Text style={styles.notificationText}>Users not found</Text>
+              </View>
+            )}
+          </View>
+        </ScrollView>
+      )}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'stretch'
+  },
+  iconWrapper: {
+    backgroundColor: 'transparent',
+    width: 50,
+    height: 50,
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'row'
+  },
+  buttonWrapper: {
+    paddingHorizontal: 15,
+    marginBottom: 15
+  },
+  buttonContainer: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  listItem: {
+    marginRight: 15,
+    paddingRight: 0
+  },
+  cardItem: {
+    flex: 9
+  },
+  cardItemWrapper: {
+    paddingTop: 5,
+    paddingBottom: 5,
+    flexDirection: 'column',
+    alignItems: 'flex-start'
+  },
+  notificationContainer: {
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  notificationText: {
+    fontSize: 24,
+    fontWeight: '600'
+  }
+});
+
+export default translate('user')(UsersListView);
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index 7c6786e..e32d199 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { RouteProps } from 'react-router';
 import { History } from 'history';
 import { connect } from 'react-redux';
@@ -33,19 +33,21 @@ export interface WithLogoutProps extends WithUserProps {
 }
 
 const withUser = (Component: React.ComponentType<any>) => {
-  const WithUser = ({ currentUser, getCurrentUser, currentUserLoading, ...rest }: WithUserProps) => {
-    useEffect(() => {
-      (async () => {
-        if (currentUser === undefined && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
-          try {
-            await getCurrentUser();
-          } catch (e) {}
-        }
-      })();
-    }, []);
+  class WithUser extends React.Component<WithUserProps> {
+    public async componentDidMount() {
+      const { currentUser, getCurrentUser } = this.props;
+      if (currentUser === undefined && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
+        try {
+          await getCurrentUser();
+        } catch (e) {}
+      }
+    }
 
-    return currentUserLoading ? null : <Component currentUser={currentUser} currentUserLoading {...rest} />;
-  };
+    public render() {
+      const { currentUserLoading, currentUser, getCurrentUser, ...rest } = this.props;
+      return currentUserLoading ? null : <Component currentUser={currentUser} currentUserLoading {...rest} />;
+    }
+  }
   return connect(
     ({ currentUser: { loading, currentUser } }: any) => ({
       currentUserLoading: loading,
diff --git a/modules/user/client-react/containers/Profile.native.tsx b/modules/user/client-react/containers/Profile.native.tsx
new file mode 100644
index 0000000..adbcce0
--- /dev/null
+++ b/modules/user/client-react/containers/Profile.native.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import ProfileView from '../components/ProfileView.native';
+import { CommonProps, User } from '../index.native';
+
+interface ProfileProps extends CommonProps {
+  currentUser?: User;
+  currentUserLoading?: boolean;
+  error?: any;
+}
+
+const Profile: React.FunctionComponent<ProfileProps> = props => <ProfileView {...props} />;
+export default connect<{}, {}, ProfileProps>(({ currentUser: { currentUser, loading } }: any) => ({
+  currentUser,
+  currentUserLoading: loading
+}))(Profile);
diff --git a/modules/user/client-react/containers/Profile.tsx b/modules/user/client-react/containers/Profile.tsx
index 8d5558f..11c1002 100644
--- a/modules/user/client-react/containers/Profile.tsx
+++ b/modules/user/client-react/containers/Profile.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView';
-import { User } from '..';
+import { User, CommonProps } from '..';
 
-interface ProfileProps {
-  currentUser: User;
-  currentUserLoading: boolean;
-  getCurrentUser: () => void;
+interface ProfileProps extends CommonProps {
+  currentUser?: User;
+  currentUserLoading?: boolean;
+  getCurrentUser?: () => void;
 }
 
 const Profile: React.FunctionComponent<ProfileProps> = ({ ...props }) => {
diff --git a/modules/user/client-react/containers/UserAdd.tsx b/modules/user/client-react/containers/UserAdd.tsx
index d682bc1..93e71d8 100644
--- a/modules/user/client-react/containers/UserAdd.tsx
+++ b/modules/user/client-react/containers/UserAdd.tsx
@@ -11,7 +11,7 @@ import { User, CommonProps } from '..';
 import { ADD_USER } from '../actions';
 
 interface UserAddProps extends CommonProps, RNCommonProps {
-  addUser: (values: User) => any;
+  addUser?: (values: User) => any;
 }
 
 const UserAdd: React.FunctionComponent<UserAddProps> = props => {
@@ -40,7 +40,7 @@ const UserAdd: React.FunctionComponent<UserAddProps> = props => {
   return <UserAddView onSubmit={onSubmit} {...props} />;
 };
 
-export default connect(
+export default connect<{}, {}, UserAddProps>(
   null,
   { addUser: ADD_USER }
 )(translate('user')(UserAdd));
diff --git a/modules/user/client-react/containers/UserEdit.native.tsx b/modules/user/client-react/containers/UserEdit.native.tsx
new file mode 100644
index 0000000..8dcf909
--- /dev/null
+++ b/modules/user/client-react/containers/UserEdit.native.tsx
@@ -0,0 +1,61 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { pick } from 'lodash';
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+import UserEditView from '../components/UserEditView.native';
+
+import UserFormatter from '../helpers/UserFormatter';
+import { CommonProps, User } from '../index.native';
+import { USER, EDIT_USER } from '../actions';
+
+interface UserEditProps extends CommonProps {
+  user?: User;
+  currentUser?: User;
+  loading?: boolean;
+  editUser?: (value: User) => any;
+  getUser?: (id: number) => void;
+}
+
+class UserEdit extends React.Component<UserEditProps> {
+  public state = { ready: false };
+  public async componentDidMount() {
+    let id = 0;
+    if (this.props.navigation) {
+      id = this.props.navigation.state.params.id;
+    }
+    await this.props.getUser(Number(id));
+    this.setState({ ready: true });
+  }
+  public onSubmit = async (values: User) => {
+    const { user, editUser, t, navigation } = this.props;
+
+    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
+
+    userValues = UserFormatter.trimExtraSpaces(userValues);
+
+    try {
+      await editUser({ id: user.id, ...userValues } as any);
+    } catch (e) {
+      const data = e.response && e.response.data;
+      throw new FormError(t('userEdit.errorMsg'), data);
+    }
+
+    if (navigation) {
+      return navigation.goBack();
+    }
+  };
+
+  public render() {
+    return this.state.ready ? <UserEditView onSubmit={this.onSubmit} {...this.props} /> : null;
+  }
+}
+
+export default connect<{}, {}, UserEditProps>(
+  ({ users: { user }, currentUser: { currentUser, loading } }: any) => ({
+    user,
+    currentUser,
+    loading
+  }),
+  { getUser: USER, editUser: EDIT_USER }
+)(translate('user')(UserEdit));
diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/containers/UserEdit.tsx
index ac1d00e..5d34f3d 100644
--- a/modules/user/client-react/containers/UserEdit.tsx
+++ b/modules/user/client-react/containers/UserEdit.tsx
@@ -7,14 +7,13 @@ import UserEditView from '../components/UserEditView';
 
 import UserFormatter from '../helpers/UserFormatter';
 import { User, CommonProps } from '..';
-import { CommonProps as RNCommonProps } from '../index.native';
 import { USER, EDIT_USER } from '../actions';
 
-interface UserEditProps extends CommonProps, RNCommonProps {
-  user: User;
-  editUser: (value: User) => any;
-  location: any;
-  match: any;
+interface UserEditProps extends CommonProps {
+  user?: User;
+  editUser?: (value: User) => any;
+  location?: any;
+  match?: any;
   getUser?: (id: number) => void;
 }
 
@@ -24,14 +23,12 @@ class UserEdit extends React.Component<UserEditProps> {
     let id = 0;
     if (this.props.match) {
       id = this.props.match.params.id;
-    } else if (this.props.navigation) {
-      id = this.props.navigation.state.params.id;
     }
     await this.props.getUser(Number(id));
     this.setState({ ready: true });
   }
   public onSubmit = async (values: User) => {
-    const { user, editUser, t, navigation, history } = this.props;
+    const { user, editUser, t, history } = this.props;
 
     let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
 
@@ -47,10 +44,6 @@ class UserEdit extends React.Component<UserEditProps> {
     if (history) {
       return history.goBack();
     }
-
-    if (navigation) {
-      return navigation.goBack();
-    }
   };
 
   public render() {
@@ -58,7 +51,7 @@ class UserEdit extends React.Component<UserEditProps> {
   }
 }
 
-export default connect(
+export default connect<{}, {}, UserEditProps>(
   ({ users: { user } }: any) => ({
     user
   }),
diff --git a/modules/user/client-react/containers/UserScreenNavigator.native.tsx b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
index 2c23e73..9d2735f 100644
--- a/modules/user/client-react/containers/UserScreenNavigator.native.tsx
+++ b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
@@ -38,8 +38,7 @@ class UserScreenNavigator extends React.Component<UserScreenNavigator> {
   }
 
   public navItemsFilter = () => {
-    const { currentUser, currentUserLoading, routeConfigs } = this.props;
-
+    const { currentUser, routeConfigs } = this.props;
     const userFilter = (value: any) => {
       if (!value.userInfo) {
         return true;
@@ -50,7 +49,7 @@ class UserScreenNavigator extends React.Component<UserScreenNavigator> {
 
     const guestFilter = (value: any) => !value.userInfo || (value.userInfo && !value.userInfo.showOnLogin);
 
-    return pickBy(routeConfigs, currentUser && !currentUserLoading ? userFilter : guestFilter);
+    return pickBy(routeConfigs, currentUser ? userFilter : guestFilter);
   };
   public getInitialRoute = () => {
     const { currentUser } = this.props;
diff --git a/modules/user/client-react/containers/Users.native.tsx b/modules/user/client-react/containers/Users.native.tsx
new file mode 100644
index 0000000..cebf0d5
--- /dev/null
+++ b/modules/user/client-react/containers/Users.native.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { StyleSheet, View } from 'react-native';
+import { compose } from 'redux';
+import UsersList from '../components/UsersListView.native';
+import UsersFilter from '../components/UsersFilterView.native';
+import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
+
+import { NavigationOptionsProps } from '../index.native';
+
+interface UsersProps extends NavigationOptionsProps {
+  loading: boolean;
+}
+
+class Users extends React.Component<UsersProps> {
+  public render() {
+    const isOpenFilter = !!this.props.navigation.getParam('isOpenFilter');
+    return (
+      <View style={styles.container}>
+        {isOpenFilter && (
+          <View style={styles.filterContainer}>
+            <UsersFilter {...this.props} />
+          </View>
+        )}
+        <View style={styles.usersListContainer}>
+          <UsersList {...this.props} />
+        </View>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'stretch',
+    justifyContent: 'center'
+  },
+  filterContainer: {
+    flex: 5,
+    borderWidth: 1,
+    borderColor: '#e3e3e3',
+    marginBottom: 15,
+    justifyContent: 'center'
+  },
+  usersListContainer: {
+    flex: 8,
+    marginTop: 15
+  }
+});
+
+export default compose(
+  withUsersDeleting,
+  withSortAndFilter,
+  withUsers
+)(Users);
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index 6868f76..caecd9d 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -16,6 +16,10 @@ import UserScreenNavigator from './containers/UserScreenNavigator.native';
 import Login from './containers/Login.native';
 import Logout from './containers/Logout.native';
 import Register from './containers/Register.native';
+import Users from './containers/Users.native';
+import Profile from './containers/Profile.native';
+import UserEdit from './containers/UserEdit.native';
+import UserAdd from './containers/UserAdd';
 import ForgotPassword from './containers/ForgotPassword.native';
 import ResetPassword from './containers/ResetPassword.native';
 
@@ -50,9 +54,8 @@ export interface User extends UserProfile, Auth {
   isActive: boolean;
   email: string;
 }
-
 export interface NavigationOptionsProps {
-  navigation: NavigationScreenProp<NavigationRoute<NavigationParams>, NavigationParams>;
+  navigation?: NavigationScreenProp<NavigationRoute<NavigationParams>, NavigationParams>;
 }
 
 export interface CommonProps extends NavigationOptionsProps {
@@ -170,6 +173,48 @@ const AuthScreen = createStackNavigator(
   }
 );
 
+class UsersListScreen extends React.Component<NavigationOptionsProps> {
+  public render() {
+    return <Users navigation={this.props.navigation} />;
+  }
+}
+
+class UserEditScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Edit user'
+  });
+  public render() {
+    return <UserEdit navigation={this.props.navigation} />;
+  }
+}
+
+class ProfileScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Profile'
+  });
+  public render() {
+    return <Profile navigation={this.props.navigation} />;
+  }
+}
+
+class ProfilerEditScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Edit profile'
+  });
+  public render() {
+    return <UserEdit navigation={this.props.navigation} />;
+  }
+}
+
+class UserAddScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Create user'
+  });
+  public render() {
+    return <UserAdd navigation={this.props.navigation} />;
+  }
+}
+
 export * from './containers/Auth.native';
 
 const HeaderTitleWithI18n = translate('user')(HeaderTitle);
@@ -186,6 +231,34 @@ const MainScreenNavigator = () => {
 export default new ClientModule({
   drawerItem: [
     {
+      Profile: {
+        screen: createStackNavigator({
+          Profile: {
+            screen: ProfileScreen,
+            navigationOptions: ({ navigation }: NavigationOptionsProps) => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.profile" style="subTitle" />,
+              headerLeft: (
+                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+              ),
+              headerForceInset: {}
+            })
+          },
+          ProfileEdit: {
+            screen: ProfilerEditScreen,
+            navigationOptions: () => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editProfile" style="subTitle" />,
+              headerForceInset: {}
+            })
+          }
+        }),
+        userInfo: {
+          showOnLogin: true,
+          role: [UserRole.user, UserRole.admin]
+        },
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.profile" />
+        }
+      },
       Login: {
         screen: AuthScreen,
         userInfo: {
@@ -195,6 +268,52 @@ export default new ClientModule({
           drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.signIn" />
         }
       },
+      Users: {
+        screen: createStackNavigator({
+          Users: {
+            screen: UsersListScreen,
+            navigationOptions: ({ navigation }: NavigationOptionsProps) => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.users" style="subTitle" />,
+              headerLeft: (
+                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+              ),
+              headerRight: (
+                <IconButton
+                  iconName="filter"
+                  iconSize={32}
+                  iconColor="#0275d8"
+                  onPress={() => {
+                    const isOpenFilter = navigation.getParam('isOpenFilter');
+                    navigation.setParams({ isOpenFilter: !isOpenFilter });
+                  }}
+                />
+              ),
+              headerForceInset: {}
+            })
+          },
+          UserEdit: {
+            screen: UserEditScreen,
+            navigationOptions: () => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editUser" style="subTitle" />,
+              headerForceInset: {}
+            })
+          },
+          UserAdd: {
+            screen: UserAddScreen,
+            navigationOptions: () => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editUser" style="subTitle" />,
+              headerForceInset: {}
+            })
+          }
+        }),
+        userInfo: {
+          showOnLogin: true,
+          role: 'admin'
+        },
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.users" />
+        }
+      },
       Logout: {
         screen: (): null => null,
         userInfo: {
diff --git a/packages/mobile/.zenrc.js b/packages/mobile/.zenrc.js
index ffcfb00..c932df6 100644
--- a/packages/mobile/.zenrc.js
+++ b/packages/mobile/.zenrc.js
@@ -24,7 +24,7 @@ const config = {
     webpackDll: true,
     defines: {
       __DEV__: process.env.NODE_ENV !== 'production',
-      __API_URL__: '"http://localhost:8080/api"',
+      __API_URL__: '"http://192.168.0.89:8080/api"',
       __WEBSITE_URL__: '"http://localhost:8080"'
     }
   }

From 6850d2588aea6ecd00bf7e405be791c3f47ffb8a Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 21 May 2019 13:43:59 +0300
Subject: [PATCH 077/104] Fix login valiadtion errors in Login component

---
 config/auth.js                                |  4 ++--
 .../client-react/helpers/index.ts             |  2 +-
 .../look/client-react-native/RenderField.jsx  |  4 +---
 modules/user/client-react/actions/login.ts    |  3 +--
 .../components/LoginForm.native.tsx           | 21 ++++++++++++++++---
 .../components/RegisterForm.native.tsx        | 14 ++++++++-----
 modules/user/client-react/helpers/index.ts    |  2 +-
 modules/user/client-react/index.native.tsx    |  2 +-
 modules/user/client-react/index.tsx           |  2 +-
 9 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index ce14dc8..d562fc2 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -1,7 +1,7 @@
 export default {
   secret: process.env.NODE_ENV === 'test' ? 'secret for tests' : process.env.AUTH_SECRET,
   session: {
-    enabled: true,
+    enabled: false,
     secret: 'secret',
     store: null,
     cookie: { maxAge: 60000 },
@@ -9,7 +9,7 @@ export default {
     saveUninitialized: false
   },
   jwt: {
-    enabled: false,
+    enabled: true,
     tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
diff --git a/modules/authentication/client-react/helpers/index.ts b/modules/authentication/client-react/helpers/index.ts
index 3788dba..207db80 100644
--- a/modules/authentication/client-react/helpers/index.ts
+++ b/modules/authentication/client-react/helpers/index.ts
@@ -6,7 +6,7 @@ export default function buildRedirectUrlForMobile(authType: string) {
   const expoHostname = `${url.parse(Constants.linkingUri).hostname}.nip.io`;
   const urlHostname = process.env.NODE_ENV === 'production' ? hostname : expoHostname;
 
-  return `${protocol}//${urlHostname}${port ? ':' + port : ''}/auth/${authType}?expoUrl=${encodeURIComponent(
+  return `${protocol}//${urlHostname}${port ? ':' + port : ''}/api/auth/${authType}?expoUrl=${encodeURIComponent(
     Constants.linkingUri
   )}`;
 }
diff --git a/modules/look/client-react-native/RenderField.jsx b/modules/look/client-react-native/RenderField.jsx
index d702d44..d000fe5 100644
--- a/modules/look/client-react-native/RenderField.jsx
+++ b/modules/look/client-react-native/RenderField.jsx
@@ -13,9 +13,7 @@ const RenderField = ({ input, label, meta: { touched, error }, ...inputProps })
       onFocus={input.onFocus}
       {...inputProps}
       error={touched && error ? error : ''}
-    >
-      {label}
-    </InputItem>
+    />
   );
 };
 
diff --git a/modules/user/client-react/actions/login.ts b/modules/user/client-react/actions/login.ts
index 365ef4d..005764f 100644
--- a/modules/user/client-react/actions/login.ts
+++ b/modules/user/client-react/actions/login.ts
@@ -5,8 +5,7 @@ import { ActionType } from '../reducers';
 
 const LOGIN: ActionFunction<LoginSubmitProps> = value => ({
   types: {
-    SUCCESS: ActionType.SET_CURRENT_USER,
-    FAIL: ActionType.CLEAR_CURRENT_USER
+    SUCCESS: ActionType.SET_CURRENT_USER
   },
   APICall: () => axios.post(`${__API_URL__}/login`, { ...value })
 });
diff --git a/modules/user/client-react/components/LoginForm.native.tsx b/modules/user/client-react/components/LoginForm.native.tsx
index f27886f..a74e9ba 100644
--- a/modules/user/client-react/components/LoginForm.native.tsx
+++ b/modules/user/client-react/components/LoginForm.native.tsx
@@ -42,9 +42,10 @@ const renderSocialButtons = ({ buttonsLength, t }: SocialButtons) => {
   ) : null;
 };
 
-const LoginForm = <P extends LoginForm & NavigationOptionsProps>({ handleSubmit, valid, values, navigation, t }: P) => {
+const LoginForm = ({ handleSubmit, valid, values, errors, navigation, t }: LoginForm & NavigationOptionsProps) => {
   const buttonsLength = [facebook.enabled, linkedin.enabled, google.enabled, github.enabled].filter(button => button)
     .length;
+
   return (
     <FormView contentContainerStyle={{ flexGrow: 1 }} style={styles.formView}>
       <View style={styles.formContainer}>
@@ -74,6 +75,11 @@ const LoginForm = <P extends LoginForm & NavigationOptionsProps>({ handleSubmit,
                 value={values.password}
               />
             </View>
+            {errors && errors.message && (
+              <View style={styles.alert}>
+                <Text style={styles.alertText}>{errors.message}</Text>
+              </View>
+            )}
             <View style={styles.submit}>
               <Button type={primary} onPress={handleSubmit} disabled={valid}>
                 {t('login.form.btnSubmit')}
@@ -134,13 +140,21 @@ const styles = StyleSheet.create({
     fontWeight: '600',
     textDecorationLine: 'underline',
     textAlign: 'center'
+  },
+  alert: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'red',
+    marginTop: 10
+  },
+  alertText: {
+    padding: 10
   }
 });
 
 const LoginFormWithFormik = withFormik<LoginForm & NavigationOptionsProps, LoginSubmitProps>({
-  enableReinitialize: true,
   mapPropsToValues: () => ({ usernameOrEmail: '', password: '' }),
-
   handleSubmit(values, { setErrors, props: { onSubmit } }) {
     onSubmit(values).catch((e: any) => {
       if (e && e.errors) {
@@ -151,6 +165,7 @@ const LoginFormWithFormik = withFormik<LoginForm & NavigationOptionsProps, Login
     });
   },
   validate: values => validate(values, loginFormSchema),
+  enableReinitialize: true,
   displayName: 'LoginForm' // helps with React DevTools
 });
 
diff --git a/modules/user/client-react/components/RegisterForm.native.tsx b/modules/user/client-react/components/RegisterForm.native.tsx
index 14404d3..d2bd140 100644
--- a/modules/user/client-react/components/RegisterForm.native.tsx
+++ b/modules/user/client-react/components/RegisterForm.native.tsx
@@ -13,6 +13,10 @@ import settings from '../../../../settings';
 
 import { FormProps, RegisterSubmitProps } from '../index.native';
 
+interface RegisterProps extends FormProps<RegisterSubmitProps> {
+  valid: string;
+}
+
 const registerFormSchema = {
   username: [required, minLength(3)],
   email: [required, email],
@@ -20,7 +24,7 @@ const registerFormSchema = {
   passwordConfirmation: [match('password'), required, minLength(settings.auth.password.minLength)]
 };
 
-const RegisterForm = ({ values, handleSubmit, t }: FormProps<RegisterSubmitProps>) => {
+const RegisterForm = ({ values, handleSubmit, t, valid }: RegisterProps) => {
   return (
     <FormView contentContainerStyle={{ flexGrow: 1 }} style={styles.formView}>
       <View style={styles.formContainer}>
@@ -60,7 +64,7 @@ const RegisterForm = ({ values, handleSubmit, t }: FormProps<RegisterSubmitProps
           placeholderTextColor={placeholderColor}
         />
         <View style={styles.submit}>
-          <Button type={primary} onPress={handleSubmit}>
+          <Button type={primary} onPress={handleSubmit} disable={valid}>
             {t('reg.form.btnSubmit')}
           </Button>
         </View>
@@ -70,12 +74,12 @@ const RegisterForm = ({ values, handleSubmit, t }: FormProps<RegisterSubmitProps
   );
 };
 
-const RegisterFormWithFormik = withFormik<FormProps<RegisterSubmitProps>, RegisterSubmitProps>({
+const RegisterFormWithFormik = withFormik<RegisterProps, RegisterSubmitProps>({
   mapPropsToValues: () => ({ username: '', email: '', password: '', passwordConfirmation: '' }),
   validate: values => validate(values, registerFormSchema),
-  async handleSubmit(values, { setErrors, props: { onSubmit } }) {
+  handleSubmit(values, { setErrors, props: { onSubmit } }) {
     onSubmit(values).catch((e: any) => {
-      if (e) {
+      if (e && e.errors) {
         setErrors(e.errors);
       } else {
         throw e;
diff --git a/modules/user/client-react/helpers/index.ts b/modules/user/client-react/helpers/index.ts
index 3578675..ea832e1 100644
--- a/modules/user/client-react/helpers/index.ts
+++ b/modules/user/client-react/helpers/index.ts
@@ -7,7 +7,7 @@ export default function buildRedirectUrlForMobile(authType: string) {
   const expoHostname = Platform.OS === 'android' ? 'localhost' : `${url.parse(Constants.linkingUri).hostname}.nip.io`;
   const urlHostname = process.env.NODE_ENV === 'production' ? hostname : expoHostname;
 
-  return `${protocol}//${urlHostname}${port ? ':' + port : ''}/auth/${authType}?expoUrl=${encodeURIComponent(
+  return `${protocol}//${urlHostname}${port ? ':' + port : ''}/api/auth/${authType}?expoUrl=${encodeURIComponent(
     Constants.linkingUri
   )}`;
 }
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index caecd9d..963fe36 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -90,7 +90,7 @@ interface HandleSubmitProps<P> {
 }
 
 interface Errors {
-  errorMsg?: string;
+  message?: string;
 }
 
 export interface FormProps<V> {
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index f5c0a1a..0d437a2 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -85,7 +85,7 @@ interface Errors {
 }
 export interface FormProps<V> {
   handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;
-  onSubmit: (values: V) => Promise<void> | void | any;
+  onSubmit: (values: V) => Promise<any>;
   submitting?: boolean;
   errors: Errors;
   values: V;

From 3cf8827a6da8439a107b7d9d22f40ff7381a9df8 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 21 May 2019 13:45:54 +0300
Subject: [PATCH 078/104] Change api url

---
 packages/mobile/.zenrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mobile/.zenrc.js b/packages/mobile/.zenrc.js
index c932df6..ffcfb00 100644
--- a/packages/mobile/.zenrc.js
+++ b/packages/mobile/.zenrc.js
@@ -24,7 +24,7 @@ const config = {
     webpackDll: true,
     defines: {
       __DEV__: process.env.NODE_ENV !== 'production',
-      __API_URL__: '"http://192.168.0.89:8080/api"',
+      __API_URL__: '"http://localhost:8080/api"',
       __WEBSITE_URL__: '"http://localhost:8080"'
     }
   }

From 7bea2fc0a661ceef117d0ce204ced5cf59898d24 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 21 May 2019 16:43:09 +0300
Subject: [PATCH 079/104] Fix Set redux store data after 401 response

---
 config/auth.js                                 | 2 +-
 modules/core/common/createReduxStore.ts        | 5 ++---
 modules/user/client-react/containers/Login.tsx | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index d562fc2..fca2f97 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -10,7 +10,7 @@ export default {
   },
   jwt: {
     enabled: true,
-    tokenExpiresIn: '1m',
+    tokenExpiresIn: '10s',
     refreshTokenExpiresIn: '7d'
   },
   password: {
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index 426105b..f3dbb03 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -10,7 +10,6 @@ export const getStoreReducer = (reducers: any) =>
 
 const requestMiddleware: Middleware = _state => next => action => {
   const { types, APICall, ...rest } = action;
-
   if (!types) {
     return next(action);
   }
@@ -27,8 +26,8 @@ const requestMiddleware: Middleware = _state => next => action => {
         throw { response: result };
       }
       next({
-        type: SUCCESS || null,
         ...rest,
+        type: SUCCESS || null,
         payload: data
       });
 
@@ -39,8 +38,8 @@ const requestMiddleware: Middleware = _state => next => action => {
       }
       const data = e.response && e.response.data;
       next({
-        type: FAIL || null,
         ...rest,
+        type: FAIL || null,
         payload: data
       });
       throw e;
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/containers/Login.tsx
index 9355e77..b7643ac 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/containers/Login.tsx
@@ -24,7 +24,7 @@ const Login: React.FunctionComponent<LoginProps> = props => {
   const [isReady, setIsReady] = React.useState(false);
 
   useEffect(() => {
-    if (search && search.includes('data')) {
+    if (search.includes('data')) {
       checkAndSaveTokens();
     }
   }, []);
@@ -67,6 +67,7 @@ const Login: React.FunctionComponent<LoginProps> = props => {
     }
 
     await authentication.doLogin();
+    history.push('/profile');
   };
 
   return isReady && <LoginView {...props} isRegistered={isRegistered} hideModal={hideModal} onSubmit={onSubmit} />;

From b4549c3e23a1fc95eb194491004b36bb8c047e54 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 22 May 2019 11:45:34 +0300
Subject: [PATCH 080/104] Fix reset pass when editing user

---
 config/auth.js                        | 2 +-
 modules/user/server-ts/controllers.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/auth.js b/config/auth.js
index fca2f97..d562fc2 100644
--- a/config/auth.js
+++ b/config/auth.js
@@ -10,7 +10,7 @@ export default {
   },
   jwt: {
     enabled: true,
-    tokenExpiresIn: '10s',
+    tokenExpiresIn: '1m',
     refreshTokenExpiresIn: '7d'
   },
   password: {
diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index 7e9a03a..047f70b 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -10,6 +10,7 @@ import settings from '../../../settings';
 import { ValidationErrors } from '.';
 import { createPasswordHash } from './password';
 import emailTemplate from './emailTemplate';
+import { InputItem } from '@restapp/look-client-react-native';
 
 const {
   auth: { password, secret },
@@ -152,7 +153,7 @@ export const editUser = async ({ user: identity, body, t }: any, res: any) => {
 
   const userInfo = !isSelf() && isAdmin() ? body : pick(body, ['id', 'username', 'email', 'password']);
 
-  const passwordHash = await createPasswordHash(body.password);
+  const passwordHash = !!body.password && (await createPasswordHash(body.password));
 
   const trx = await createTransaction();
   try {

From 5235f6c829262076912a2a1f7050a299c08a1547 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 22 May 2019 11:47:32 +0300
Subject: [PATCH 081/104] Remove InputItem from server module

---
 modules/user/server-ts/controllers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index 047f70b..55a80af 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -10,7 +10,6 @@ import settings from '../../../settings';
 import { ValidationErrors } from '.';
 import { createPasswordHash } from './password';
 import emailTemplate from './emailTemplate';
-import { InputItem } from '@restapp/look-client-react-native';
 
 const {
   auth: { password, secret },

From 585d3b3701a79972c4b1cf9a0f3b67f81b367990 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 22 May 2019 18:06:59 +0300
Subject: [PATCH 082/104] Fix check on empty tokens

---
 modules/user/client-react/reducers/currentUser.ts | 6 ------
 modules/user/server-ts/social/shared.ts           | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/user/client-react/reducers/currentUser.ts b/modules/user/client-react/reducers/currentUser.ts
index afe8862..b0e526d 100644
--- a/modules/user/client-react/reducers/currentUser.ts
+++ b/modules/user/client-react/reducers/currentUser.ts
@@ -1,12 +1,6 @@
 import { User } from '..';
 import { UserModuleActionProps, ActionType } from '.';
 
-export enum CurrentUserActionType {
-  SET_CURRENT_USER = 'SET_CURRENT_USER',
-  CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
-  SET_LOADING = 'SET_LOADING'
-}
-
 export interface CurrentUserState {
   currentUser: User;
   loading: boolean;
diff --git a/modules/user/server-ts/social/shared.ts b/modules/user/server-ts/social/shared.ts
index 1eb0877..bbd34e7 100644
--- a/modules/user/server-ts/social/shared.ts
+++ b/modules/user/server-ts/social/shared.ts
@@ -14,9 +14,9 @@ export async function onAuthenticationSuccess(req: any, res: any) {
   const redirectUrl = req.query.state;
   const tokens = await access.grantAccess(user, req, user.passwordHash);
   if (redirectUrl) {
-    res.redirect(redirectUrl + (isEmpty(tokens) ? '?data=' + JSON.stringify({ tokens }) : ''));
+    res.redirect(redirectUrl + (!isEmpty(tokens) ? '?data=' + JSON.stringify({ tokens }) : ''));
   } else {
-    res.redirect(`/login${isEmpty(tokens) ? '?data=' + JSON.stringify({ tokens }) : ''}`);
+    res.redirect(`/login${!isEmpty(tokens) ? '?data=' + JSON.stringify({ tokens }) : ''}`);
   }
 }
 

From 32eab840145acfc5db4cd648907e15adb6cfc32d Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 22 May 2019 18:10:58 +0300
Subject: [PATCH 083/104] Fix UserShapePassword interface

---
 modules/user/server-ts/index.ts                | 7 +++----
 modules/user/server-ts/password/controllers.ts | 6 +++---
 modules/user/server-ts/social/shared.ts        | 4 ++--
 modules/user/server-ts/sql.ts                  | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index 47d38c4..c9b3c35 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -6,7 +6,7 @@ import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 import { user, users, currentUser, addUser, editUser, deleteUser } from './controllers';
 import password from './password';
 import social from './social';
-import UserDAO, { UserShape, UserShapePassword } from './sql';
+import UserDAO, { UserShapePassword } from './sql';
 import settings from '../../../settings';
 import resources from './locales';
 
@@ -20,11 +20,10 @@ const getIdentity = (id: number) => {
   return UserDAO.getUser(id);
 };
 
-const getHash = async (id: number) =>
-  ((await UserDAO.getUserWithPassword(id)) as UserShape & UserShapePassword).passwordHash || '';
+const getHash = async (id: number) => ((await UserDAO.getUserWithPassword(id)) as UserShapePassword).passwordHash || '';
 
 const validateLogin = async (usernameOrEmail: string, pswd: string) => {
-  const identity = (await UserDAO.getUserByUsernameOrEmail(usernameOrEmail)) as UserShape & UserShapePassword;
+  const identity = (await UserDAO.getUserByUsernameOrEmail(usernameOrEmail)) as UserShapePassword;
 
   if (!identity || !identity.passwordHash) {
     return { message: i18n.t('user:auth.password.validPasswordEmail') };
diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index d0bd1eb..74f475e 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -82,7 +82,7 @@ export const register = async ({ body, t }: any, res: any) => {
 export const forgotPassword = async ({ body, t }: any, res: any) => {
   try {
     const localAuth = pick(body, 'email');
-    const identity = (await userDAO.getUserByEmail(localAuth.email)) as UserShape & UserShapePassword;
+    const identity = (await userDAO.getUserByEmail(localAuth.email)) as UserShapePassword;
 
     if (identity && mailer) {
       // async email
@@ -130,8 +130,8 @@ export const resetPassword = async ({ body, t }: any, res: any) => {
   }
 
   const token = Buffer.from(reset.token, 'base64').toString();
-  const { email, passwordHash } = jwt.verify(token, secret) as UserShape & UserShapePassword;
-  const identity = (await userDAO.getUserByEmail(email)) as UserShape & UserShapePassword;
+  const { email, passwordHash } = jwt.verify(token, secret) as UserShapePassword;
+  const identity = (await userDAO.getUserByEmail(email)) as UserShapePassword;
 
   if (identity.passwordHash !== passwordHash) {
     throw res.status(401).send(t('user:auth.password.invalidToken'));
diff --git a/modules/user/server-ts/social/shared.ts b/modules/user/server-ts/social/shared.ts
index bbd34e7..ce5df5a 100644
--- a/modules/user/server-ts/social/shared.ts
+++ b/modules/user/server-ts/social/shared.ts
@@ -1,6 +1,6 @@
 import { isEmpty } from 'lodash';
 import { access } from '@restapp/authentication-server-ts';
-import UserDAO, { UserShape, UserShapePassword } from '../sql';
+import UserDAO, { UserShapePassword } from '../sql';
 
 export interface UserSocial {
   id: number;
@@ -10,7 +10,7 @@ export interface UserSocial {
 }
 
 export async function onAuthenticationSuccess(req: any, res: any) {
-  const user = (await UserDAO.getUserWithPassword(req.user.id)) as UserShape & UserShapePassword;
+  const user = (await UserDAO.getUserWithPassword(req.user.id)) as UserShapePassword;
   const redirectUrl = req.query.state;
   const tokens = await access.grantAccess(user, req, user.passwordHash);
   if (redirectUrl) {
diff --git a/modules/user/server-ts/sql.ts b/modules/user/server-ts/sql.ts
index 3247659..a8e0dc1 100644
--- a/modules/user/server-ts/sql.ts
+++ b/modules/user/server-ts/sql.ts
@@ -18,7 +18,7 @@ export interface Profile {
   lastName?: string;
 }
 
-export interface UserShapePassword {
+export interface UserShapePassword extends UserShape {
   passwordHash?: string;
 }
 

From f2cbfb09d5f012c74ba2cded0c0601603569ba27 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 23 May 2019 08:08:31 +0300
Subject: [PATCH 084/104] Clear unnecessary try catch

---
 modules/user/client-react/containers/AuthBase.tsx          | 4 +---
 modules/user/client-react/containers/DataRootComponent.tsx | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index e32d199..fb51f3e 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -37,9 +37,7 @@ const withUser = (Component: React.ComponentType<any>) => {
     public async componentDidMount() {
       const { currentUser, getCurrentUser } = this.props;
       if (currentUser === undefined && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
-        try {
-          await getCurrentUser();
-        } catch (e) {}
+        await getCurrentUser();
       }
     }
 
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index 9a4078b..eaf04c9 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -19,9 +19,7 @@ const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({ current
   React.useEffect(() => {
     (async () => {
       if (!ready && !currentUser && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
-        try {
-          await getCurrentUser();
-        } catch (e) {}
+        await getCurrentUser();
       }
       setReady(true);
     })();

From 3d0d1d3860bb73f81e67ae647255f7e94beb1a2c Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 23 May 2019 08:24:16 +0300
Subject: [PATCH 085/104] Re-write UserEdit component on functional component

---
 .../user/client-react/containers/UserEdit.tsx | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/containers/UserEdit.tsx
index 5d34f3d..f549993 100644
--- a/modules/user/client-react/containers/UserEdit.tsx
+++ b/modules/user/client-react/containers/UserEdit.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 import { pick } from 'lodash';
 import { translate } from '@restapp/i18n-client-react';
@@ -17,19 +17,21 @@ interface UserEditProps extends CommonProps {
   getUser?: (id: number) => void;
 }
 
-class UserEdit extends React.Component<UserEditProps> {
-  public state = { ready: false };
-  public async componentDidMount() {
-    let id = 0;
-    if (this.props.match) {
-      id = this.props.match.params.id;
-    }
-    await this.props.getUser(Number(id));
-    this.setState({ ready: true });
-  }
-  public onSubmit = async (values: User) => {
-    const { user, editUser, t, history } = this.props;
-
+const UserEdit: React.FunctionComponent<UserEditProps> = props => {
+  const { user, editUser, t, history, match, getUser } = props;
+  const [ready, setReady] = useState(false);
+  useEffect(() => {
+    (async () => {
+      let id = 0;
+      if (match) {
+        id = match.params.id;
+      }
+      await getUser(Number(id));
+      setReady(true);
+    })();
+  }, []);
+
+  const onSubmit = async (values: User) => {
     let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
 
     userValues = UserFormatter.trimExtraSpaces(userValues);
@@ -46,12 +48,10 @@ class UserEdit extends React.Component<UserEditProps> {
     }
   };
 
-  public render() {
-    return this.state.ready ? <UserEditView onSubmit={this.onSubmit} {...this.props} /> : null;
-  }
-}
+  return ready ? <UserEditView onSubmit={onSubmit} {...props} /> : null;
+};
 
-export default connect<{}, {}, UserEditProps>(
+export default connect(
   ({ users: { user } }: any) => ({
     user
   }),

From 0e70bfe8e7586ac580816103a9b85c3d6a930e41 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Tue, 28 May 2019 16:34:21 +0300
Subject: [PATCH 086/104] Fix sending 401 status

---
 modules/authentication/server-ts/access/jwt/index.ts   |  3 +--
 .../authentication/server-ts/access/session/index.ts   |  3 +--
 modules/core/common/createReduxStore.ts                | 10 ++++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/authentication/server-ts/access/jwt/index.ts b/modules/authentication/server-ts/access/jwt/index.ts
index df6918a..0c8eba6 100644
--- a/modules/authentication/server-ts/access/jwt/index.ts
+++ b/modules/authentication/server-ts/access/jwt/index.ts
@@ -31,8 +31,7 @@ const checkAuthentication = (req: Request, res: Response, next: NextFunction) =>
   if (req.user) {
     return next();
   }
-  return res.send({
-    status: 401,
+  return res.status(401).send({
     errors: {
       message: res.locals.error ? res.locals.error.message : 'unauthorized'
     }
diff --git a/modules/authentication/server-ts/access/session/index.ts b/modules/authentication/server-ts/access/session/index.ts
index c839a27..401ce4a 100644
--- a/modules/authentication/server-ts/access/session/index.ts
+++ b/modules/authentication/server-ts/access/session/index.ts
@@ -32,8 +32,7 @@ const beforeware = (app: Express) => {
 const accessMiddleware = (req: Request, res: Response, next: any) =>
   req.isAuthenticated()
     ? next()
-    : res.send({
-        status: 401,
+    : res.status(401).send({
         errors: {
           message: 'unauthorized'
         }
diff --git a/modules/core/common/createReduxStore.ts b/modules/core/common/createReduxStore.ts
index f3dbb03..2f98ff0 100644
--- a/modules/core/common/createReduxStore.ts
+++ b/modules/core/common/createReduxStore.ts
@@ -22,9 +22,6 @@ const requestMiddleware: Middleware = _state => next => action => {
     try {
       const result = await APICall();
       const data = result && result.data;
-      if (data.errors) {
-        throw { response: result };
-      }
       next({
         ...rest,
         type: SUCCESS || null,
@@ -33,10 +30,11 @@ const requestMiddleware: Middleware = _state => next => action => {
 
       return data;
     } catch (e) {
-      if (e.response && e.response.data && e.response.data.status === 401) {
-        return next({ ...action, type: null, status: e.response.data.status });
-      }
       const data = e.response && e.response.data;
+      if (data && e.response.status === 401) {
+        return next({ ...action, type: null, status: e.response.status });
+      }
+
       next({
         ...rest,
         type: FAIL || null,

From e0028d049d9c1e8b080005361c69dfd11230092c Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Wed, 29 May 2019 17:17:06 +0300
Subject: [PATCH 087/104] Fix redirect from auth routes

---
 modules/user/client-react/containers/Auth.tsx     | 10 +++++++++-
 modules/user/client-react/containers/AuthBase.tsx |  4 +++-
 modules/user/client-react/reducers/currentUser.ts |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
index c239ead..30ffb51 100644
--- a/modules/user/client-react/containers/Auth.tsx
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -13,7 +13,15 @@ interface AuthRouteProps extends WithUserProps {
 }
 
 const AuthRoute: ComponentType<AuthRouteProps> = withUser(
-  ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, ...rest }) => {
+  ({
+    currentUser,
+    role,
+    redirect = '/login',
+    redirectOnLoggedIn,
+    component: Component,
+    currentUserLoading,
+    ...rest
+  }) => {
     const RenderComponent: FunctionComponent<any> = props => {
       // The users is not logged in
       if (redirectOnLoggedIn && currentUser) {
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index fb51f3e..1741e95 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -43,7 +43,9 @@ const withUser = (Component: React.ComponentType<any>) => {
 
     public render() {
       const { currentUserLoading, currentUser, getCurrentUser, ...rest } = this.props;
-      return currentUserLoading ? null : <Component currentUser={currentUser} currentUserLoading {...rest} />;
+      return currentUserLoading ? null : (
+        <Component currentUser={currentUser} currentUserLoading={currentUserLoading} {...rest} />
+      );
     }
   }
   return connect(
diff --git a/modules/user/client-react/reducers/currentUser.ts b/modules/user/client-react/reducers/currentUser.ts
index b0e526d..e038a12 100644
--- a/modules/user/client-react/reducers/currentUser.ts
+++ b/modules/user/client-react/reducers/currentUser.ts
@@ -23,7 +23,7 @@ export default function(state = defaultState, action: UserModuleActionProps) {
       return {
         ...state,
         currentUser: null,
-        loading: false
+        loading: !state.loading
       };
 
     case ActionType.SET_CURRENT_USER:

From 8c6c0d96c26c003ea2c23e5b39130947b19a0f12 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 30 May 2019 17:58:33 +0300
Subject: [PATCH 088/104] Separation of a user module into signUp, profile and
 users modules

---
 modules/user/client-react/actions/addUser.ts  |  10 -
 .../user/client-react/actions/clearUser.ts    |   8 -
 .../user/client-react/actions/currentUser.ts  |   6 +-
 modules/user/client-react/actions/editUser.ts |  10 -
 modules/user/client-react/actions/index.ts    |  46 +--
 modules/user/client-react/containers/Auth.tsx |  10 +-
 .../user/client-react/containers/AuthBase.tsx |   7 +-
 .../containers/DataRootComponent.native.tsx   |   5 +-
 .../containers/DataRootComponent.tsx          |   5 +-
 modules/user/client-react/index.native.tsx    | 271 +-----------------
 modules/user/client-react/index.tsx           | 126 +-------
 .../client-react/locales/en/translations.json | 191 +-----------
 .../client-react/locales/ru/translations.json | 190 +-----------
 .../client-react/profile/actions/index.ts     |   3 +
 .../components/ProfileEditForm.native.tsx     | 208 ++++++++++++++
 .../components/ProfileEditView.native.tsx     |  50 ++++
 .../components/ProfileView.native.tsx         |   7 +-
 .../{ => profile}/components/ProfileView.tsx  |  10 +-
 .../containers/Profile.native.tsx             |   4 +-
 .../{ => profile}/containers/Profile.tsx      |   4 +-
 .../profile/containers/ProfileEdit.native.tsx |  56 ++++
 .../client-react/profile/index.native.tsx     | 124 ++++++++
 modules/user/client-react/profile/index.tsx   |  34 +++
 .../profile/locales/en/translations.json      |  25 ++
 .../client-react/profile/locales/index.ts     |   1 +
 .../profile/locales/ru/translations.json      |  23 ++
 modules/user/client-react/reducers/index.ts   |  22 +-
 .../client-react/signUp/actions/clearUser.ts  |   7 +
 .../{ => signUp}/actions/forgotPassword.ts    |   4 +-
 .../user/client-react/signUp/actions/index.ts |   8 +
 .../{ => signUp}/actions/login.ts             |   5 +-
 .../{ => signUp}/actions/register.ts          |   4 +-
 .../{ => signUp}/actions/resetPassword.ts     |   4 +-
 .../components/ForgotPasswordForm.native.tsx  |  11 +-
 .../components/ForgotPasswordForm.tsx         |   8 +-
 .../components/ForgotPasswordView.native.tsx  |   3 +-
 .../components/ForgotPasswordView.tsx         |  10 +-
 .../components/LoginForm.native.tsx           |  10 +-
 .../{ => signUp}/components/LoginForm.tsx     |  10 +-
 .../components/LoginView.native.tsx           |   5 +-
 .../{ => signUp}/components/LoginView.tsx     |   6 +-
 .../components/RegisterForm.native.tsx        |  11 +-
 .../{ => signUp}/components/RegisterForm.tsx  |  11 +-
 .../components/RegisterView.native.tsx        |  10 +-
 .../{ => signUp}/components/RegisterView.tsx  |  11 +-
 .../components/ResetPasswordForm.native.tsx   |  10 +-
 .../components/ResetPasswordForm.tsx          |   9 +-
 .../components/ResetPasswordView.native.tsx   |   2 +-
 .../components/ResetPasswordView.tsx          |   9 +-
 .../containers/ForgotPassword.native.tsx      |   7 +-
 .../containers/ForgotPassword.tsx             |   9 +-
 .../{ => signUp}/containers/Login.native.tsx  |   9 +-
 .../{ => signUp}/containers/Login.tsx         |   7 +-
 .../{ => signUp}/containers/Logout.native.tsx |   8 +-
 .../containers/Register.native.tsx            |  10 +-
 .../{ => signUp}/containers/Register.tsx      |  11 +-
 .../containers/ResetPassword.native.tsx       |   9 +-
 .../{ => signUp}/containers/ResetPassword.tsx |  10 +-
 .../user/client-react/signUp/index.native.tsx | 126 ++++++++
 modules/user/client-react/signUp/index.tsx    |  80 ++++++
 .../signUp/locales/en/translations.json       |  91 ++++++
 .../user/client-react/signUp/locales/index.ts |   1 +
 .../signUp/locales/ru/translations.json       |  91 ++++++
 .../reducers/index.ts}                        |  23 +-
 .../client-react/users/actions/addUser.ts     |  10 +
 .../{ => users}/actions/deleteUser.ts         |   5 +-
 .../client-react/users/actions/editUser.ts    |  10 +
 .../user/client-react/users/actions/index.ts  |   8 +
 .../client-react/{ => users}/actions/user.ts  |   5 +-
 .../client-react/{ => users}/actions/users.ts |   9 +-
 .../components/UserAddView.native.tsx         |   6 +-
 .../{ => users}/components/UserAddView.tsx    |  12 +-
 .../components/UserEditView.native.tsx        |   9 +-
 .../{ => users}/components/UserEditView.tsx   |  14 +-
 .../components/UserForm.native.tsx            |  11 +-
 .../{ => users}/components/UserForm.tsx       |  15 +-
 .../components/UsersFilterView.native.tsx     |   6 +-
 .../components/UsersFilterView.tsx            |   6 +-
 .../components/UsersListView.native.tsx       |   5 +-
 .../{ => users}/components/UsersListView.tsx  |  10 +-
 .../{ => users}/containers/UserAdd.tsx        |   9 +-
 .../containers/UserEdit.native.tsx            |  13 +-
 .../{ => users}/containers/UserEdit.tsx       |  11 +-
 .../{ => users}/containers/UserOperations.tsx |  12 +-
 .../{ => users}/containers/Users.native.tsx   |   3 +-
 .../{ => users}/containers/Users.tsx          |   6 +-
 .../user/client-react/users/index.native.tsx  | 105 +++++++
 modules/user/client-react/users/index.tsx     |  54 ++++
 .../users/locales/en/translations.json        |  78 +++++
 .../user/client-react/users/locales/index.ts  |   1 +
 .../users/locales/ru/translations.json        |  78 +++++
 .../users.ts => users/reducers/index.ts}      |  38 ++-
 92 files changed, 1614 insertions(+), 1051 deletions(-)
 delete mode 100644 modules/user/client-react/actions/addUser.ts
 delete mode 100644 modules/user/client-react/actions/clearUser.ts
 delete mode 100644 modules/user/client-react/actions/editUser.ts
 create mode 100644 modules/user/client-react/profile/actions/index.ts
 create mode 100644 modules/user/client-react/profile/components/ProfileEditForm.native.tsx
 create mode 100644 modules/user/client-react/profile/components/ProfileEditView.native.tsx
 rename modules/user/client-react/{ => profile}/components/ProfileView.native.tsx (94%)
 rename modules/user/client-react/{ => profile}/components/ProfileView.tsx (93%)
 rename modules/user/client-react/{ => profile}/containers/Profile.native.tsx (71%)
 rename modules/user/client-react/{ => profile}/containers/Profile.tsx (77%)
 create mode 100644 modules/user/client-react/profile/containers/ProfileEdit.native.tsx
 create mode 100644 modules/user/client-react/profile/index.native.tsx
 create mode 100644 modules/user/client-react/profile/index.tsx
 create mode 100644 modules/user/client-react/profile/locales/en/translations.json
 create mode 100644 modules/user/client-react/profile/locales/index.ts
 create mode 100644 modules/user/client-react/profile/locales/ru/translations.json
 create mode 100644 modules/user/client-react/signUp/actions/clearUser.ts
 rename modules/user/client-react/{ => signUp}/actions/forgotPassword.ts (58%)
 create mode 100644 modules/user/client-react/signUp/actions/index.ts
 rename modules/user/client-react/{ => signUp}/actions/login.ts (61%)
 rename modules/user/client-react/{ => signUp}/actions/register.ts (59%)
 rename modules/user/client-react/{ => signUp}/actions/resetPassword.ts (68%)
 rename modules/user/client-react/{ => signUp}/components/ForgotPasswordForm.native.tsx (93%)
 rename modules/user/client-react/{ => signUp}/components/ForgotPasswordForm.tsx (89%)
 rename modules/user/client-react/{ => signUp}/components/ForgotPasswordView.native.tsx (95%)
 rename modules/user/client-react/{ => signUp}/components/ForgotPasswordView.tsx (80%)
 rename modules/user/client-react/{ => signUp}/components/LoginForm.native.tsx (95%)
 rename modules/user/client-react/{ => signUp}/components/LoginForm.tsx (94%)
 rename modules/user/client-react/{ => signUp}/components/LoginView.native.tsx (97%)
 rename modules/user/client-react/{ => signUp}/components/LoginView.tsx (93%)
 rename modules/user/client-react/{ => signUp}/components/RegisterForm.native.tsx (92%)
 rename modules/user/client-react/{ => signUp}/components/RegisterForm.tsx (90%)
 rename modules/user/client-react/{ => signUp}/components/RegisterView.native.tsx (91%)
 rename modules/user/client-react/{ => signUp}/components/RegisterView.tsx (88%)
 rename modules/user/client-react/{ => signUp}/components/ResetPasswordForm.native.tsx (90%)
 rename modules/user/client-react/{ => signUp}/components/ResetPasswordForm.tsx (89%)
 rename modules/user/client-react/{ => signUp}/components/ResetPasswordView.native.tsx (89%)
 rename modules/user/client-react/{ => signUp}/components/ResetPasswordView.tsx (81%)
 rename modules/user/client-react/{ => signUp}/containers/ForgotPassword.native.tsx (86%)
 rename modules/user/client-react/{ => signUp}/containers/ForgotPassword.tsx (88%)
 rename modules/user/client-react/{ => signUp}/containers/Login.native.tsx (87%)
 rename modules/user/client-react/{ => signUp}/containers/Login.tsx (94%)
 rename modules/user/client-react/{ => signUp}/containers/Logout.native.tsx (76%)
 rename modules/user/client-react/{ => signUp}/containers/Register.native.tsx (88%)
 rename modules/user/client-react/{ => signUp}/containers/Register.tsx (84%)
 rename modules/user/client-react/{ => signUp}/containers/ResetPassword.native.tsx (84%)
 rename modules/user/client-react/{ => signUp}/containers/ResetPassword.tsx (86%)
 create mode 100644 modules/user/client-react/signUp/index.native.tsx
 create mode 100644 modules/user/client-react/signUp/index.tsx
 create mode 100644 modules/user/client-react/signUp/locales/en/translations.json
 create mode 100644 modules/user/client-react/signUp/locales/index.ts
 create mode 100644 modules/user/client-react/signUp/locales/ru/translations.json
 rename modules/user/client-react/{reducers/currentUser.ts => signUp/reducers/index.ts} (55%)
 create mode 100644 modules/user/client-react/users/actions/addUser.ts
 rename modules/user/client-react/{ => users}/actions/deleteUser.ts (59%)
 create mode 100644 modules/user/client-react/users/actions/editUser.ts
 create mode 100644 modules/user/client-react/users/actions/index.ts
 rename modules/user/client-react/{ => users}/actions/user.ts (56%)
 rename modules/user/client-react/{ => users}/actions/users.ts (62%)
 rename modules/user/client-react/{ => users}/components/UserAddView.native.tsx (89%)
 rename modules/user/client-react/{ => users}/components/UserAddView.tsx (82%)
 rename modules/user/client-react/{ => users}/components/UserEditView.native.tsx (85%)
 rename modules/user/client-react/{ => users}/components/UserEditView.tsx (85%)
 rename modules/user/client-react/{ => users}/components/UserForm.native.tsx (96%)
 rename modules/user/client-react/{ => users}/components/UserForm.tsx (93%)
 rename modules/user/client-react/{ => users}/components/UsersFilterView.native.tsx (98%)
 rename modules/user/client-react/{ => users}/components/UsersFilterView.tsx (95%)
 rename modules/user/client-react/{ => users}/components/UsersListView.native.tsx (97%)
 rename modules/user/client-react/{ => users}/components/UsersListView.tsx (95%)
 rename modules/user/client-react/{ => users}/containers/UserAdd.tsx (85%)
 rename modules/user/client-react/{ => users}/containers/UserEdit.native.tsx (85%)
 rename modules/user/client-react/{ => users}/containers/UserEdit.tsx (89%)
 rename modules/user/client-react/{ => users}/containers/UserOperations.tsx (88%)
 rename modules/user/client-react/{ => users}/containers/Users.native.tsx (95%)
 rename modules/user/client-react/{ => users}/containers/Users.tsx (94%)
 create mode 100644 modules/user/client-react/users/index.native.tsx
 create mode 100644 modules/user/client-react/users/index.tsx
 create mode 100644 modules/user/client-react/users/locales/en/translations.json
 create mode 100644 modules/user/client-react/users/locales/index.ts
 create mode 100644 modules/user/client-react/users/locales/ru/translations.json
 rename modules/user/client-react/{reducers/users.ts => users/reducers/index.ts} (58%)

diff --git a/modules/user/client-react/actions/addUser.ts b/modules/user/client-react/actions/addUser.ts
deleted file mode 100644
index 0913981..0000000
--- a/modules/user/client-react/actions/addUser.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import axios from 'axios';
-import { ActionFunction } from '.';
-import { User } from '..';
-
-const ADD_USER: ActionFunction<User> = user => ({
-  types: {},
-  APICall: () => axios.post(`${__API_URL__}/addUser`, { ...user })
-});
-
-export default ADD_USER;
diff --git a/modules/user/client-react/actions/clearUser.ts b/modules/user/client-react/actions/clearUser.ts
deleted file mode 100644
index 1d9835d..0000000
--- a/modules/user/client-react/actions/clearUser.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ActionFunction } from '.';
-import { ActionType } from '../reducers';
-
-const CLEAR_USER: ActionFunction = () => ({
-  type: ActionType.CLEAR_CURRENT_USER
-});
-
-export default CLEAR_USER;
diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
index 732e856..6d0ce37 100644
--- a/modules/user/client-react/actions/currentUser.ts
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -1,10 +1,10 @@
 import axios from 'axios';
-import { ActionType } from '../reducers';
+import { ActionType } from '../signUp/reducers';
 import { ActionFunction } from '.';
 
-const CURRENT_USER: ActionFunction = () => ({
+const CURRENT_USER: ActionFunction<ActionType> = () => ({
   types: {
-    REQUEST: ActionType.CLEAR_CURRENT_USER,
+    REQUEST: ActionType.SET_LOADING_AND_CLEAR_USER,
     SUCCESS: ActionType.SET_CURRENT_USER,
     FAIL: ActionType.CLEAR_CURRENT_USER
   },
diff --git a/modules/user/client-react/actions/editUser.ts b/modules/user/client-react/actions/editUser.ts
deleted file mode 100644
index 2d7afc4..0000000
--- a/modules/user/client-react/actions/editUser.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import axios from 'axios';
-import { ActionFunction } from '.';
-import { User } from '..';
-
-const EDIT_USER: ActionFunction<User> = user => ({
-  types: {},
-  APICall: () => axios.post(`${__API_URL__}/editUser`, { ...user })
-});
-
-export default EDIT_USER;
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 1c1e0ed..8c92f22 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -1,24 +1,14 @@
-import REGISTER from './register';
-import LOGIN from './login';
-import CURRENT_USER from './currentUser';
-import CLEAR_USER from './clearUser';
-import USERS from './users';
-import USER from './user';
-import DELETE_USER from './deleteUser';
-import EDIT_USER from './editUser';
-import ADD_USER from './addUser';
-import RESET_PASSWORD from './resetPassword';
-import FORGOT_PASSWORD from './forgotPassword';
+export { default as CURRENT_USER } from './currentUser';
 import { ActionType } from '../reducers';
 
-interface Types {
-  REQUEST?: ActionType;
-  SUCCESS?: ActionType;
-  FAIL?: ActionType;
+interface Types<AT> {
+  REQUEST?: AT;
+  SUCCESS?: AT;
+  FAIL?: AT;
 }
-interface ActionCreator {
-  type?: ActionType;
-  types?: Types;
+interface ActionCreator<AT = ActionType> {
+  type?: AT;
+  types?: Types<AT>;
   APICall?: () => Promise<any>;
   payload?: any;
 }
@@ -30,18 +20,8 @@ interface ActionCreator {
  * If there is an @APICall property then @types property must also be returned.
  *
  */
-export type ActionFunction<P = null, P2 = null, P3 = null> = (param?: P, param2?: P2, param3?: P3) => ActionCreator;
-
-export {
-  REGISTER,
-  LOGIN,
-  CURRENT_USER,
-  CLEAR_USER,
-  USERS,
-  USER,
-  DELETE_USER,
-  EDIT_USER,
-  ADD_USER,
-  RESET_PASSWORD,
-  FORGOT_PASSWORD
-};
+export type ActionFunction<AT, P = null, P2 = null, P3 = null> = (
+  param?: P,
+  param2?: P2,
+  param3?: P3
+) => ActionCreator<AT>;
diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
index 30ffb51..c239ead 100644
--- a/modules/user/client-react/containers/Auth.tsx
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -13,15 +13,7 @@ interface AuthRouteProps extends WithUserProps {
 }
 
 const AuthRoute: ComponentType<AuthRouteProps> = withUser(
-  ({
-    currentUser,
-    role,
-    redirect = '/login',
-    redirectOnLoggedIn,
-    component: Component,
-    currentUserLoading,
-    ...rest
-  }) => {
+  ({ currentUser, role, redirect = '/login', redirectOnLoggedIn, component: Component, ...rest }) => {
     const RenderComponent: FunctionComponent<any> = props => {
       // The users is not logged in
       if (redirectOnLoggedIn && currentUser) {
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index 1741e95..c463883 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -2,12 +2,13 @@ import React from 'react';
 import { RouteProps } from 'react-router';
 import { History } from 'history';
 import { connect } from 'react-redux';
+
 import authentication from '@restapp/authentication-client-react';
 import { getItem } from '@restapp/core-common/clientStorage';
+
 import { User, UserRole } from '..';
-import CLEAR_USER from '../actions/clearUser';
+import CLEAR_USER from '../signUp/actions/clearUser';
 import { CURRENT_USER } from '../actions';
-
 import setting from '../../../../settings';
 
 export interface WithUserProps extends RouteProps {
@@ -49,7 +50,7 @@ const withUser = (Component: React.ComponentType<any>) => {
     }
   }
   return connect(
-    ({ currentUser: { loading, currentUser } }: any) => ({
+    ({ signUpReducer: { loading, currentUser } }: any) => ({
       currentUserLoading: loading,
       currentUser
     }),
diff --git a/modules/user/client-react/containers/DataRootComponent.native.tsx b/modules/user/client-react/containers/DataRootComponent.native.tsx
index 0b65fc1..60c0b46 100644
--- a/modules/user/client-react/containers/DataRootComponent.native.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.native.tsx
@@ -1,5 +1,6 @@
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
+
 import { getItem } from '@restapp/core-common/clientStorage';
 
 import Loading from '../components/Loading.native';
@@ -31,7 +32,7 @@ class DataRootComponent extends React.Component<DataRootComponent> {
 }
 
 export default connect(
-  ({ currentUser: { currentUser } }: any) => ({
+  ({ signUpReducer: { currentUser } }: any) => ({
     currentUser
   }),
   { getCurrentUser: CURRENT_USER }
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index eaf04c9..92dc110 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -1,5 +1,6 @@
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
+
 import { getItem } from '@restapp/core-common/clientStorage';
 
 import Loading from '../components/Loading';
@@ -28,7 +29,7 @@ const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({ current
 };
 
 export default connect(
-  ({ currentUser: { currentUser } }: any) => ({
+  ({ signUpReducer: { currentUser } }: any) => ({
     currentUser
   }),
   { getCurrentUser: CURRENT_USER }
diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index 963fe36..5824d70 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -1,29 +1,16 @@
-import * as React from 'react';
-import {
-  createStackNavigator,
-  NavigationContainer,
-  NavigationScreenProp,
-  NavigationRoute,
-  NavigationParams
-} from 'react-navigation';
-import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
-import ClientModule from '@restapp/module-client-react-native';
+import React from 'react';
+import { NavigationContainer, NavigationScreenProp, NavigationRoute, NavigationParams } from 'react-navigation';
 import { FormikErrors } from 'formik';
+
+import { TranslateFunction } from '@restapp/i18n-client-react';
+import ClientModule from '@restapp/module-client-react-native';
+
+import signUp from './signUp/index.native';
+import users from './users/index.native';
+import profile from './profile/index.native';
 import resources from './locales';
 import DataRootComponent from './containers/DataRootComponent.native';
 import UserScreenNavigator from './containers/UserScreenNavigator.native';
-import Login from './containers/Login.native';
-import Logout from './containers/Logout.native';
-import Register from './containers/Register.native';
-import Users from './containers/Users.native';
-import Profile from './containers/Profile.native';
-import UserEdit from './containers/UserEdit.native';
-import UserAdd from './containers/UserAdd';
-import ForgotPassword from './containers/ForgotPassword.native';
-import ResetPassword from './containers/ResetPassword.native';
-
-import { currentUserReducer, usersReducer } from './reducers';
 
 export enum UserRole {
   admin = 'admin',
@@ -59,31 +46,9 @@ export interface NavigationOptionsProps {
 }
 
 export interface CommonProps extends NavigationOptionsProps {
-  error?: string;
   t?: TranslateFunction;
 }
 
-export interface LoginSubmitProps {
-  usernameOrEmail: string;
-  password: string;
-}
-
-export interface ResetPasswordSubmitProps {
-  password: string;
-  passwordConfirmation: string;
-}
-
-export interface ForgotPasswordSubmitProps {
-  email: string;
-}
-
-export interface RegisterSubmitProps {
-  username: string;
-  email: string;
-  password: string;
-  passwordConfirmation: string;
-}
-
 interface HandleSubmitProps<P> {
   setErrors: (errors: FormikErrors<P>) => void;
   props: P;
@@ -102,123 +67,6 @@ export interface FormProps<V> {
   t?: TranslateFunction;
 }
 
-export interface OrderBy {
-  column: string;
-  order: string;
-}
-
-export interface Filter {
-  searchText: string;
-  role: string;
-  isActive: boolean;
-}
-
-class LoginScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = ({ navigation }: NavigationOptionsProps) => ({
-    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.signIn" style="subTitle" />,
-    headerLeft: (
-      <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
-    ),
-    headerForceInset: {}
-  });
-
-  public render() {
-    return <Login navigation={this.props.navigation} />;
-  }
-}
-class RegisterScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = () => ({
-    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.register" style="subTitle" />,
-    headerForceInset: {}
-  });
-  public render() {
-    return <Register navigation={this.props.navigation} />;
-  }
-}
-
-class ForgotPasswordScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = () => ({
-    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.forgotPassword" style="subTitle" />,
-    headerForceInset: {}
-  });
-  public render() {
-    return <ForgotPassword navigation={this.props.navigation} />;
-  }
-}
-
-class ResetPasswordScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = () => ({
-    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.resetPassword" style="subTitle" />,
-    headerForceInset: {}
-  });
-  public render() {
-    return <ResetPassword navigation={this.props.navigation} />;
-  }
-}
-
-const AuthScreen = createStackNavigator(
-  {
-    Login: { screen: LoginScreen },
-    ForgotPassword: { screen: ForgotPasswordScreen },
-    ResetPassword: { screen: ResetPasswordScreen },
-    Register: { screen: RegisterScreen }
-  },
-  {
-    cardStyle: {
-      backgroundColor: '#fff'
-    },
-    navigationOptions: {
-      headerStyle: { backgroundColor: '#fff' }
-    }
-  }
-);
-
-class UsersListScreen extends React.Component<NavigationOptionsProps> {
-  public render() {
-    return <Users navigation={this.props.navigation} />;
-  }
-}
-
-class UserEditScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = () => ({
-    title: 'Edit user'
-  });
-  public render() {
-    return <UserEdit navigation={this.props.navigation} />;
-  }
-}
-
-class ProfileScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = () => ({
-    title: 'Profile'
-  });
-  public render() {
-    return <Profile navigation={this.props.navigation} />;
-  }
-}
-
-class ProfilerEditScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = () => ({
-    title: 'Edit profile'
-  });
-  public render() {
-    return <UserEdit navigation={this.props.navigation} />;
-  }
-}
-
-class UserAddScreen extends React.Component<NavigationOptionsProps> {
-  public static navigationOptions = () => ({
-    title: 'Create user'
-  });
-  public render() {
-    return <UserAdd navigation={this.props.navigation} />;
-  }
-}
-
-export * from './containers/Auth.native';
-
-const HeaderTitleWithI18n = translate('user')(HeaderTitle);
-
 export const ref: { navigator: NavigationContainer } = {
   navigator: null
 };
@@ -228,108 +76,9 @@ const MainScreenNavigator = () => {
   return <Navigator />;
 };
 
-export default new ClientModule({
-  drawerItem: [
-    {
-      Profile: {
-        screen: createStackNavigator({
-          Profile: {
-            screen: ProfileScreen,
-            navigationOptions: ({ navigation }: NavigationOptionsProps) => ({
-              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.profile" style="subTitle" />,
-              headerLeft: (
-                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
-              ),
-              headerForceInset: {}
-            })
-          },
-          ProfileEdit: {
-            screen: ProfilerEditScreen,
-            navigationOptions: () => ({
-              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editProfile" style="subTitle" />,
-              headerForceInset: {}
-            })
-          }
-        }),
-        userInfo: {
-          showOnLogin: true,
-          role: [UserRole.user, UserRole.admin]
-        },
-        navigationOptions: {
-          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.profile" />
-        }
-      },
-      Login: {
-        screen: AuthScreen,
-        userInfo: {
-          showOnLogin: false
-        },
-        navigationOptions: {
-          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.signIn" />
-        }
-      },
-      Users: {
-        screen: createStackNavigator({
-          Users: {
-            screen: UsersListScreen,
-            navigationOptions: ({ navigation }: NavigationOptionsProps) => ({
-              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.users" style="subTitle" />,
-              headerLeft: (
-                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
-              ),
-              headerRight: (
-                <IconButton
-                  iconName="filter"
-                  iconSize={32}
-                  iconColor="#0275d8"
-                  onPress={() => {
-                    const isOpenFilter = navigation.getParam('isOpenFilter');
-                    navigation.setParams({ isOpenFilter: !isOpenFilter });
-                  }}
-                />
-              ),
-              headerForceInset: {}
-            })
-          },
-          UserEdit: {
-            screen: UserEditScreen,
-            navigationOptions: () => ({
-              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editUser" style="subTitle" />,
-              headerForceInset: {}
-            })
-          },
-          UserAdd: {
-            screen: UserAddScreen,
-            navigationOptions: () => ({
-              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editUser" style="subTitle" />,
-              headerForceInset: {}
-            })
-          }
-        }),
-        userInfo: {
-          showOnLogin: true,
-          role: 'admin'
-        },
-        navigationOptions: {
-          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.users" />
-        }
-      },
-      Logout: {
-        screen: (): null => null,
-        userInfo: {
-          showOnLogin: true
-        },
-        navigationOptions: ({ navigation }: NavigationOptionsProps) => {
-          return {
-            drawerLabel: <Logout navigation={navigation} />
-          };
-        }
-      }
-    }
-  ],
+export default new ClientModule(signUp, profile, users, {
   localization: [{ ns: 'user', resources }],
   router: <MainScreenNavigator />,
-  reducer: [{ currentUser: currentUserReducer, users: usersReducer }],
   dataRootComponent: [DataRootComponent],
   onAppCreate: [(module: ClientModule) => (ref.navigator = UserScreenNavigator(module.drawerItems))]
 });
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index 0d437a2..1a6db5a 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -1,25 +1,16 @@
-import * as React from 'react';
+import React from 'react';
 import * as H from 'history';
 import { CookiesProvider } from 'react-cookie';
-import { NavLink, withRouter } from 'react-router-dom';
-import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { MenuItem } from '@restapp/look-client-react';
-import ClientModule from '@restapp/module-client-react';
 import { FormikErrors } from 'formik';
 
+import { TranslateFunction } from '@restapp/i18n-client-react';
+import ClientModule from '@restapp/module-client-react';
+
+import signUp from './signUp';
+import profile from './profile';
+import users from './users';
 import resources from './locales';
 import DataRootComponent from './containers/DataRootComponent';
-import Login from './containers/Login';
-import Register from './containers/Register';
-import Users from './containers/Users';
-import UserEdit from './containers/UserEdit';
-import UserAdd from './containers/UserAdd';
-import Profile from './containers/Profile';
-import ForgotPassword from './containers/ForgotPassword';
-import ResetPassword from './containers/ResetPassword';
-import { currentUserReducer, usersReducer } from './reducers';
-
-import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLogout, WithLogoutProps, withUser } from './containers/Auth';
 
 export enum UserRole {
   admin = 'admin',
@@ -51,25 +42,6 @@ export interface User extends UserProfile, Auth {
   email: string;
 }
 
-export interface LoginSubmitProps {
-  usernameOrEmail: string;
-  password: string;
-}
-export interface ResetPasswordSubmitProps {
-  password: string;
-  passwordConfirmation: string;
-}
-export interface ForgotPasswordSubmitProps {
-  email: string;
-}
-
-export interface RegisterSubmitProps {
-  username: string;
-  email: string;
-  password: string;
-  passwordConfirmation: string;
-}
-
 export interface CommonProps {
   t?: TranslateFunction;
   history?: H.History;
@@ -92,90 +64,8 @@ export interface FormProps<V> {
   t?: TranslateFunction;
 }
 
-export interface OrderBy {
-  column: string;
-  order: string;
-}
-
-export interface Filter {
-  searchText: string;
-  role: string;
-  isActive: boolean;
-}
-
-const ProfileName = withUser(({ currentUser }) => (
-  <>{currentUser ? currentUser.fullName || currentUser.username : null}</>
-));
-
-const LogoutLink = withRouter(withLogout(({ logout, history }: WithLogoutProps) => (
-  <a
-    href="javascript:void(0)"
-    onClick={e => {
-      e.preventDefault();
-      (async () => {
-        await logout();
-        history.push('/');
-      })();
-    }}
-    className="nav-link"
-  >
-    Logout
-  </a>
-)) as any);
-
-export * from './containers/Auth';
-
-const NavLinkUsersWithI18n = translate('user')(({ t }: any) => (
-  <NavLink to="/users" className="nav-link" activeClassName="active">
-    {t('navLink.users')}
-  </NavLink>
-));
-
-const NavLinkLoginWithI18n = translate('user')(({ t }: any) => (
-  <NavLink to="/login" className="nav-link" activeClassName="active">
-    {t('navLink.signIn')}
-  </NavLink>
-));
-
-export default new ClientModule({
-  route: [
-    <AuthRoute exact path="/profile" role={[UserRole.user, UserRole.admin]} redirect="/login" component={Profile} />,
-    <AuthRoute exact path="/users" redirect="/profile" role={UserRole.admin} component={Users} />,
-    <AuthRoute exact path="/users/new" role={[UserRole.admin]} component={UserAdd} />,
-    <AuthRoute path="/users/:id" redirect="/profile" role={[UserRole.user, UserRole.admin]} component={UserEdit} />,
-    <AuthRoute exact path="/login" redirectOnLoggedIn redirect="/" component={Login} />,
-    <AuthRoute exact path="/register" redirectOnLoggedIn redirect="/profile" component={Register} />,
-    <AuthRoute exact path="/forgot-password" redirectOnLoggedIn redirect="/profile" component={ForgotPassword} />,
-    <AuthRoute exact path="/reset-password/:token" redirectOnLoggedIn redirect="/profile" component={ResetPassword} />
-  ],
-  navItem: [
-    <IfLoggedIn key="/users" role={UserRole.admin}>
-      <MenuItem>
-        <NavLinkUsersWithI18n />
-      </MenuItem>
-    </IfLoggedIn>
-  ],
-  navItemRight: [
-    <IfLoggedIn key="/profile">
-      <MenuItem>
-        <NavLink to="/profile" className="nav-link" activeClassName="active">
-          <ProfileName />
-        </NavLink>
-      </MenuItem>
-    </IfLoggedIn>,
-    <IfLoggedIn key="/logout">
-      <MenuItem>
-        <LogoutLink />
-      </MenuItem>
-    </IfLoggedIn>,
-    <IfNotLoggedIn key="/login">
-      <MenuItem>
-        <NavLinkLoginWithI18n />
-      </MenuItem>
-    </IfNotLoggedIn>
-  ],
+export default new ClientModule(signUp, profile, users, {
   localization: [{ ns: 'user', resources }],
-  reducer: [{ currentUser: currentUserReducer, users: usersReducer }],
   dataRootComponent: [DataRootComponent],
   rootComponentFactory: [req => (req ? <CookiesProvider cookies={req.universalCookies} /> : <CookiesProvider />)]
 });
diff --git a/modules/user/client-react/locales/en/translations.json b/modules/user/client-react/locales/en/translations.json
index 76234b7..bd0bd3c 100644
--- a/modules/user/client-react/locales/en/translations.json
+++ b/modules/user/client-react/locales/en/translations.json
@@ -1,193 +1,4 @@
 {
   "loading": "App is loading...",
-  "navLink": {
-    "users": "Users",
-    "signIn": "Sign In",
-    "logout": "Log out",
-    "profile": "Profile",
-    "editProfile": "Edit profile",
-    "editUser": "Edit user",
-    "forgotPassword": "Forgot password",
-    "register": "Register",
-    "resetPassword": "Reset password"
-  },
-  "forgotPass": {
-    "title": "Forgot password",
-    "meta": "A Forgot Password page example",
-    "errorMsg": "Reset password failed!",
-    "form": {
-      "title": "Password Reset",
-      "submitMsg": "Instructions for resetting your password were emailed to you.",
-      "fldEmail": "Email",
-      "btnSubmit": "Send instructions"
-    }
-  },
-
-  "login": {
-    "title": "Login",
-    "meta": "A Login page example",
-    "errorMsg": "Login failed!",
-    "cardTitle": "Available logins",
-    "notRegText": "Not registered yet?",
-    "fbBtn": "Log in with Facebook",
-    "googleBtn": "Log in with Google",
-    "githubBtn": "Log in with GitHub",
-    "linkedinBtn": "Log in with LinkedIn",
-    "form": {
-      "title": "Sign In",
-      "field": {
-        "usernameOrEmail": "Username or Email",
-        "pass": "Password"
-      },
-      "btnSubmit": "Login"
-    },
-    "btn": {
-      "forgotPass": "Forgot your password?",
-      "notReg": "Not registered yet?",
-      "sign": "Sign Up"
-    }
-  },
-
-  "profile": {
-    "title": "Profile",
-    "headerText": "Profile info",
-    "meta": "A Profile page example",
-    "loadMsg": "Loading...",
-    "errorMsg": "No current user is logged in",
-    "editProfileText": "Edit Profile",
-    "card": {
-      "title": "Profile",
-      "group": {
-        "name": "User Name",
-        "email": "Email",
-        "role": "Role",
-        "full": "Full Name"
-      },
-      "fldEmail": "Email",
-      "btnSubmit": "Send instructions"
-    }
-  },
-
-  "reg": {
-    "title": "Register",
-    "meta": "A Registration page example",
-    "errorMsg": "Registration failed!",
-    "form": {
-      "title": "Sign Up",
-      "field": {
-        "name": "Username",
-        "email": "Email",
-        "pass": "Password",
-        "passConf": "Password Confirmation"
-      },
-      "btnSubmit": "Register"
-    },
-    "confirmationMsgTitle": "Verify Your Email Address",
-    "confirmationMsgBody": "We now need to verify your email address. We've sent you the email. Please click the link in that email to continue. ",
-    "confirmationBtn": "Go back to Login page",
-    "successRegTitle": "Email Has Been Verified Successfully",
-    "successRegBody": "Your email has been verified successfully. You can sign in using your login and password."
-  },
-
-  "resetPass": {
-    "title": "Reset password",
-    "meta": "A Reset Password page example",
-    "errorMsg": "Password reset failed!",
-    "form": {
-      "title": "Reset Password",
-      "field": {
-        "pass": "Password",
-        "passConf": "Password Confirmation"
-      },
-      "btnSubmit": "Reset password"
-    }
-  },
-
-  "userEdit": {
-    "title": "Edit User",
-    "meta": "An Edit User page example",
-    "errorMsg": "User editing failed!",
-    "loadMsg": "Loading...",
-    "form": {
-      "title": "User",
-      "titleEdit": "Edit",
-      "titleCreate": "Create",
-      "field": {
-        "name": "Username",
-        "email": "Email",
-        "role": {
-          "label": "Role",
-          "user": "user",
-          "admin": "admin"
-        },
-        "active": "Is Active",
-        "firstName": "First Name",
-        "lastName": "Last Name",
-        "pass": "Password",
-        "passConf": "Password Confirmation"
-      },
-      "btnSubmit": "Save"
-    },
-    "select": {
-      "okText": "Done",
-      "dismissText": "Cancel"
-    },
-    "btnBack": "Back"
-  },
-  "userAdd": {
-    "errorMsg": "Add user failed!"
-  },
-
-  "users": {
-    "title": "Users",
-    "meta": "A User List page example",
-    "loadMsg": "Loading...",
-    "list": {
-      "title": "Users",
-      "item": {
-        "filter": "Filter",
-        "search": "Search ...",
-        "role": {
-          "label": "Role",
-          "all": "All",
-          "user": "user",
-          "admin": "admin"
-        },
-        "active": "Is Active"
-      }
-    },
-    "select": {
-      "okText": "Done",
-      "dismissText": "Cancel"
-    },
-    "btnModalSubmit": "Submit",
-    "btnModalClose": "Close",
-    "orderByText": "Order by",
-    "column": {
-      "name": "Username",
-      "email": "Email",
-      "role": "Role",
-      "active": "Is Active",
-      "actions": "Actions"
-    },
-    "btn": {
-      "add": "Add user",
-      "delete": "Delete"
-    }
-  },
-
-  "nativeMock": "Hello, ",
-  "mobile": {
-    "login": {
-      "usernameOrEmail": {
-        "label": "Username or Email",
-        "placeholder": "Enter Your Username or Email"
-      },
-      "pass": {
-        "label": "Password",
-        "placeholder": "Enter Your Password"
-      }
-    },
-    "logout": "Log out"
-  }
+  "nativeMock": "Hello, "
 }
\ No newline at end of file
diff --git a/modules/user/client-react/locales/ru/translations.json b/modules/user/client-react/locales/ru/translations.json
index 80f778d..24f4d94 100644
--- a/modules/user/client-react/locales/ru/translations.json
+++ b/modules/user/client-react/locales/ru/translations.json
@@ -1,191 +1,5 @@
 {
   "loading": "Приложение загружается...",
-  "navLink": {
-    "users": "Пользователи",
-    "sign": "Вход в систему",
-    "logout": "Выход",
-    "profile": "Профиль",
-    "editProfile": "Редактирование профиля",
-    "editUser": "Редактирование пользователя",
-    "forgotPassword": "Забыли пароль",
-    "register": "Регистрация",
-    "resetPassword": "Сброс пароля"
-  },
-  "forgotPass": {
-    "title": "Забыли пароль",
-    "meta": "Пример страницы Забыли пароль?",
-    "errorMsg": "Сброс пароля не выполнен!",
-    "form": {
-      "title": "Сброс пароля",
-      "submitMsg": "Инструкции по сбросу пароля были отправлены вам на электронную почту.",
-      "fldEmail": "Электронная почта",
-      "btnSubmit": "Отправить инструкции"
-    }
-  },
-
-  "login": {
-    "title": "Вход",
-    "meta": "Пример страницы с входом",
-    "errorMsg": "Ошибка входа!",
-    "cardTitle": "Доступные учетные записи",
-    "notRegText": "Ещё не зарегистрированы?",
-    "fbBtn": "Войти через Facebook",
-    "googleBtn": "Войти через Google",
-    "githubBtn": "Войти через GitHub",
-    "linkedinBtn": "Войти через LinkedIn",
-    "form": {
-      "title": "Вход в систему",
-      "field": {
-        "usernameOrEmail": "Имя пользователя или эл.почта",
-        "pass": "Пароль"
-      },
-      "btnSubmit": "Войти"
-    },
-    "btn": {
-      "forgotPass": "Забыли пароль?",
-      "notReg": "Ещё не зарегистрированы?",
-      "sign": "Зарегистрироваться"
-    }
-  },
-
-  "profile": {
-    "title": "Профиль",
-    "headerText": "Информация о профиле",
-    "meta": "Пример страницы с профилем",
-    "loadMsg": "Загрузка...",
-    "errorMsg": "Нет текущего пользователя",
-    "editProfileText": "Редактировать профиль",
-    "card": {
-      "title": "Профиль",
-      "group": {
-        "name": "Имя пользователя",
-        "email": "Электронная почта",
-        "role": "Роль",
-        "full": "Полное имя"
-      }
-    }
-  },
-
-  "reg": {
-    "title": "Регистрация",
-    "meta": "Пример страницы с регистрацией",
-    "errorMsg": "Ошибка регистрации!",
-    "form": {
-      "title": "Регистрация",
-      "field": {
-        "name": "Имя пользователя",
-        "email": "Электронная почта",
-        "pass": "Пароль",
-        "passConf": "Подтверждение пароля"
-      },
-      "btnSubmit": "Зарегистрироваться"
-    },
-    "confirmationMsgTitle": "Подтвердите свой адрес электронной почты",
-    "confirmationMsgBody": "Теперь нам нужно подтвердить ваш адрес электронной почты. Мы отправили вам электронное письмо. Пожалуйста, нажмите на ссылку в этом письме, чтобы продолжить.",
-    "confirmationBtn": "Вернуться на страница регистрации",
-    "successRegTitle": "Адрес электронной почты был успешно подтвержден",
-    "successRegBody": "Ваш адрес электронной почты был успешно подтвержден. Вы можете войти в приложение, используя свой логин и пароль."
-  },
-
-  "resetPass": {
-    "title": "Сброс пароля",
-    "meta": "Пример страницы со сбросом пароля",
-    "errorMsg": "Сброс пароля не выполнен!",
-    "form": {
-      "title": "Сброс пароля",
-      "field": {
-        "pass": "Пароля",
-        "passConf": "Подтверждение пароля"
-      },
-      "btnSubmit": "Сбросить пароль"
-    }
-  },
-
-  "userEdit": {
-    "title": "Редактирование пользователя",
-    "meta": "Пример страницы с редактированием пользователя",
-    "errorMsg": "Не удалось изменить пользователя!",
-    "loadMsg": "Загрузка...",
-    "form": {
-      "title": "пользователя",
-      "titleEdit": "Редактировать",
-      "titleCreate": "Создать",
-      "field": {
-        "name": "Имя пользователя",
-        "email": "Электронная почта",
-        "role": {
-          "label": "Роль",
-          "user": "пользователь",
-          "admin": "админ"
-        },
-        "active": "Активен",
-        "firstName": "Имя",
-        "lastName": "Фамилия",
-        "pass": "Пароль",
-        "passConf": "Подтверждение пароля"
-      },
-      "btnSubmit": "Сохранить"
-    },
-    "select": {
-      "okText": "Подтвердить",
-      "dismissText": "Отмена"
-    },
-    "btnBack": "Назад"
-  },
-  "userAdd": {
-    "errorMsg": "Не удалось добавить пользователя!"
-  },
-
-  "users": {
-    "title": "Список пользователей",
-    "meta": "Пример страницы со списком пользователей",
-    "loadMsg": "Загрузка...",
-    "list": {
-      "title": "Список пользователей",
-      "item": {
-        "filter": "Фильтр",
-        "search": "Поиск ...",
-        "role": {
-          "label": "Роль",
-          "all": "Все",
-          "user": "пользователь",
-          "admin": "админ"
-        },
-        "active": "Активен"
-      }
-    },
-    "select": {
-      "okText": "Подтвердить",
-      "dismissText": "Отмена"
-    },
-    "btnModalSubmit": "Сохранить",
-    "btnModalClose": "Закрыть",
-    "orderByText": "Сортировать",
-    "column": {
-      "name": "Имя пользователя",
-      "email": "Электронная почта",
-      "role": "Роль",
-      "active": "Активен",
-      "actions": "Действия"
-    },
-    "btn": {
-      "add": "Добавить пользователя",
-      "delete": "Удалить"
-    }
-  },
-
-  "nativeMock": "Привет, ",
-  "mobile": {
-    "login": {
-      "usernameOrEmail": {
-        "label": "Имя пользователя или email",
-        "placeholder": "Введите имя пользователя или эл.почту"
-      },
-      "pass": {
-        "label": "Пароль",
-        "placeholder": "Введите пароль"
-      }
-    },
-    "logout": "Выйти"
-  }
+  "nativeMock": "Привет, "
+  
 }
\ No newline at end of file
diff --git a/modules/user/client-react/profile/actions/index.ts b/modules/user/client-react/profile/actions/index.ts
new file mode 100644
index 0000000..fd9d31a
--- /dev/null
+++ b/modules/user/client-react/profile/actions/index.ts
@@ -0,0 +1,3 @@
+export * from '../../users/actions';
+
+export * from '../../actions';
diff --git a/modules/user/client-react/profile/components/ProfileEditForm.native.tsx b/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
new file mode 100644
index 0000000..361ba11
--- /dev/null
+++ b/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
@@ -0,0 +1,208 @@
+import React from 'react';
+import { withFormik, FormikProps } from 'formik';
+import { View, StyleSheet } from 'react-native';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
+
+import { FieldAdapter as Field } from '@restapp/forms-client-react';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { RenderField, Button, RenderSelect, RenderSwitch, FormView, primary } from '@restapp/look-client-react-native';
+import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
+import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
+
+import { FormProps, User, UserRole } from '../../index.native';
+import settings from '../../../../../settings';
+
+interface FormikFormProps extends FormProps<FormValues> {
+  initialValues: FormValues;
+}
+
+interface UserFormProps extends FormikProps<FormValues> {
+  handleSubmit: () => void;
+  t: TranslateFunction;
+  handleChange: () => void;
+  setFieldValue: (type: string, value: any) => void;
+  onSubmit: (values: FormValues) => Promise<void>;
+  setTouched: () => void;
+  isValid: boolean;
+  error: string;
+  shouldDisplayRole: boolean;
+  shouldDisplayActive: boolean;
+  values: any;
+  errors: any;
+  initialValues: FormValues;
+  touched: any;
+}
+
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
+
+type RoleChangeFunc = (
+  type: string,
+  value: string | string[],
+  setFieldValue: (type: string, value: string) => void
+) => void;
+
+const userFormSchema = {
+  username: [required, minLength(3)],
+  email: [required, emailRule],
+  password: [required, minLength(settings.auth.password.minLength)],
+  passwordConfirmation: [match('password'), required, minLength(settings.auth.password.minLength)]
+};
+
+const handleRoleChange: RoleChangeFunc = (type, value, setFieldValue) => {
+  const preparedValue = Array.isArray(value) ? value[0] : value;
+  setFieldValue(type, preparedValue);
+};
+
+const UserForm: React.FunctionComponent<UserFormProps> = ({
+  values,
+  handleSubmit,
+  setFieldValue,
+  t,
+  shouldDisplayRole,
+  shouldDisplayActive
+}) => {
+  const options = [
+    {
+      value: 'user',
+      label: t('userEdit.form.field.role.user')
+    },
+    {
+      value: 'admin',
+      label: t('userEdit.form.field.role.admin')
+    }
+  ];
+  const { username, email, role, isActive, firstName, lastName, password, passwordConfirmation } = values;
+  return (
+    <FormView contentContainerStyle={{ flexGrow: 1 }} style={styles.formView}>
+      <View style={styles.formContainer}>
+        <Field
+          placeholder={t('userEdit.form.field.name')}
+          name="username"
+          component={RenderField}
+          type="text"
+          value={username}
+          placeholderTextColor={placeholderColor}
+        />
+        <Field
+          name="email"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.email')}
+          value={email}
+          keyboardType="email-address"
+          placeholderTextColor={placeholderColor}
+        />
+        {shouldDisplayRole && (
+          <Field
+            name="role"
+            component={RenderSelect}
+            label={t('userEdit.form.field.role.label')}
+            okText={t('userEdit.select.okText')}
+            dismissText={t('userEdit.select.dismissText')}
+            placeholderTextColor={placeholderColor}
+            selectedValue={role}
+            onChange={(value: string) => handleRoleChange('role', value, setFieldValue)}
+            cols={1}
+            data={options}
+          />
+        )}
+        {shouldDisplayActive && (
+          <Field
+            name="isActive"
+            label={t('userEdit.form.field.active')}
+            onChange={() => setFieldValue('isActive', !isActive)}
+            component={RenderSwitch}
+            placeholder={t('userEdit.form.field.active')}
+            checked={isActive}
+            placeholderTextColor={placeholderColor}
+          />
+        )}
+        <Field
+          name="firstName"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.firstName')}
+          placeholderTextColor={placeholderColor}
+          label={t('userEdit.form.field.firstName')}
+          value={firstName}
+        />
+
+        <Field
+          name="lastName"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.lastName')}
+          placeholderTextColor={placeholderColor}
+          value={lastName}
+        />
+        <Field
+          name="password"
+          secureTextEntry={true}
+          component={RenderField}
+          type="password"
+          placeholder={t('userEdit.form.field.pass')}
+          placeholderTextColor={placeholderColor}
+          value={password}
+        />
+        <Field
+          name="passwordConfirmation"
+          component={RenderField}
+          placeholder={t('userEdit.form.field.passConf')}
+          placeholderTextColor={placeholderColor}
+          value={passwordConfirmation}
+          type="password"
+          secureTextEntry={true}
+        />
+        <View style={styles.submit}>
+          <Button type={primary} onPress={handleSubmit}>
+            {t('userEdit.form.btnSubmit')}
+          </Button>
+        </View>
+      </View>
+      <KeyboardSpacer />
+    </FormView>
+  );
+};
+
+const UserFormWithFormik = withFormik<FormikFormProps, FormValues>({
+  mapPropsToValues: values => {
+    const { username, email, role, isActive, firstName, lastName, ...rest } = values.initialValues;
+    return {
+      username,
+      email,
+      role: role || UserRole.user,
+      isActive,
+      password: '',
+      passwordConfirmation: '',
+      firstName,
+      lastName,
+      ...rest
+    };
+  },
+  handleSubmit(values, { setErrors, props: { onSubmit } }) {
+    onSubmit(values).catch((e: any) => {
+      if (e && e.errors) {
+        setErrors(e.errors);
+      } else {
+        throw e;
+      }
+    });
+  },
+  displayName: 'SignUpForm ', // helps with React DevTools
+  validate: values => validate(values, userFormSchema)
+});
+
+const styles = StyleSheet.create({
+  formContainer: {
+    paddingHorizontal: 20,
+    justifyContent: 'center',
+    flex: 1
+  },
+  submit,
+  formView: {
+    flex: 1,
+    alignSelf: 'stretch'
+  }
+});
+
+export default translate('userUsers')(UserFormWithFormik(UserForm));
diff --git a/modules/user/client-react/profile/components/ProfileEditView.native.tsx b/modules/user/client-react/profile/components/ProfileEditView.native.tsx
new file mode 100644
index 0000000..b3bffda
--- /dev/null
+++ b/modules/user/client-react/profile/components/ProfileEditView.native.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react';
+import { StyleSheet, View } from 'react-native';
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { Loading } from '@restapp/look-client-react-native';
+
+import UserForm from './ProfileEditForm.native';
+import { User } from '../../index.native';
+
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
+
+interface UserEditViewProps {
+  loading: boolean;
+  user: User;
+  currentUser: User;
+  t: TranslateFunction;
+  onSubmit: (values: FormValues) => Promise<void>;
+}
+
+class UserEditView extends React.PureComponent<UserEditViewProps> {
+  public render() {
+    const { loading, user, t, currentUser } = this.props;
+    if (loading && !user) {
+      return <Loading text={t('userEdit.loadMsg')} />;
+    } else {
+      const isNotSelf = !user || (user && user.id !== currentUser.id);
+      return (
+        <View style={styles.container}>
+          <UserForm
+            onSubmit={this.props.onSubmit}
+            shouldDisplayRole={isNotSelf}
+            shouldDisplayActive={isNotSelf}
+            initialValues={user || {}}
+          />
+        </View>
+      );
+    }
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center'
+  }
+});
+
+export default translate('userUsers')(UserEditView);
diff --git a/modules/user/client-react/components/ProfileView.native.tsx b/modules/user/client-react/profile/components/ProfileView.native.tsx
similarity index 94%
rename from modules/user/client-react/components/ProfileView.native.tsx
rename to modules/user/client-react/profile/components/ProfileView.native.tsx
index 502291a..c2d9fad 100644
--- a/modules/user/client-react/components/ProfileView.native.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.native.tsx
@@ -1,10 +1,11 @@
-import * as React from 'react';
+import React from 'react';
 import { StyleSheet, Text, View, ScrollView, TouchableOpacity } from 'react-native';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Card, CardItem, CardText, CardHeader, CardLabel, Loading } from '@restapp/look-client-react-native';
 import { linkText } from '@restapp/look-client-react-native/styles';
 
-import { NavigationOptionsProps, User } from '../index.native';
+import { NavigationOptionsProps, User } from '../../index.native';
 
 interface ProfileViewProps extends NavigationOptionsProps {
   currentUserLoading: boolean;
@@ -85,4 +86,4 @@ const styles = StyleSheet.create({
   linkText
 });
 
-export default translate('user')(ProfileView);
+export default translate('userProfile')(ProfileView);
diff --git a/modules/user/client-react/components/ProfileView.tsx b/modules/user/client-react/profile/components/ProfileView.tsx
similarity index 93%
rename from modules/user/client-react/components/ProfileView.tsx
rename to modules/user/client-react/profile/components/ProfileView.tsx
index 89b1a21..913f08a 100644
--- a/modules/user/client-react/components/ProfileView.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.tsx
@@ -1,12 +1,12 @@
-import * as React from 'react';
+import React from 'react';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { LayoutCenter, Card, CardGroup, CardTitle, CardText, PageLayout } from '@restapp/look-client-react';
 
-import { User } from '..';
-
-import settings from '../../../../settings';
+import { User } from '../..';
+import settings from '../../../../../settings';
 
 interface ProfileViewProps {
   currentUserLoading: boolean;
@@ -77,4 +77,4 @@ const ProfileView: React.FunctionComponent<ProfileViewProps> = ({ currentUserLoa
   }
 };
 
-export default translate('user')(ProfileView);
+export default translate('userProfile')(ProfileView);
diff --git a/modules/user/client-react/containers/Profile.native.tsx b/modules/user/client-react/profile/containers/Profile.native.tsx
similarity index 71%
rename from modules/user/client-react/containers/Profile.native.tsx
rename to modules/user/client-react/profile/containers/Profile.native.tsx
index adbcce0..4b2183d 100644
--- a/modules/user/client-react/containers/Profile.native.tsx
+++ b/modules/user/client-react/profile/containers/Profile.native.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView.native';
-import { CommonProps, User } from '../index.native';
+import { CommonProps, User } from '../../index.native';
 
 interface ProfileProps extends CommonProps {
   currentUser?: User;
@@ -10,7 +10,7 @@ interface ProfileProps extends CommonProps {
 }
 
 const Profile: React.FunctionComponent<ProfileProps> = props => <ProfileView {...props} />;
-export default connect<{}, {}, ProfileProps>(({ currentUser: { currentUser, loading } }: any) => ({
+export default connect<{}, {}, ProfileProps>(({ signUpReducer: { currentUser, loading } }: any) => ({
   currentUser,
   currentUserLoading: loading
 }))(Profile);
diff --git a/modules/user/client-react/containers/Profile.tsx b/modules/user/client-react/profile/containers/Profile.tsx
similarity index 77%
rename from modules/user/client-react/containers/Profile.tsx
rename to modules/user/client-react/profile/containers/Profile.tsx
index 11c1002..e731c82 100644
--- a/modules/user/client-react/containers/Profile.tsx
+++ b/modules/user/client-react/profile/containers/Profile.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView';
-import { User, CommonProps } from '..';
+import { User, CommonProps } from '../..';
 
 interface ProfileProps extends CommonProps {
   currentUser?: User;
@@ -13,6 +13,6 @@ const Profile: React.FunctionComponent<ProfileProps> = ({ ...props }) => {
   return <ProfileView {...props} />;
 };
 
-export default connect(({ currentUser: { currentUser } }: any) => ({
+export default connect(({ signUpReducer: { currentUser } }: any) => ({
   currentUser
 }))(Profile);
diff --git a/modules/user/client-react/profile/containers/ProfileEdit.native.tsx b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
new file mode 100644
index 0000000..a815a98
--- /dev/null
+++ b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
@@ -0,0 +1,56 @@
+import React, { useEffect, useState } from 'react';
+import { connect } from 'react-redux';
+import { pick } from 'lodash';
+
+import { translate } from '@restapp/i18n-client-react';
+import { FormError } from '@restapp/forms-client-react';
+
+import ProfileEditView from '../components/ProfileEditView.native';
+import UserFormatter from '../../helpers/UserFormatter';
+import { User, CommonProps } from '../../index.native';
+import { USER, EDIT_USER } from '../actions';
+
+interface ProfileEditProps extends CommonProps {
+  user?: User;
+  editUser?: (value: User) => any;
+  location?: any;
+  match?: any;
+  getUser?: (id: number) => void;
+}
+
+const UserEdit: React.FunctionComponent<ProfileEditProps> = props => {
+  const { user, editUser, t, match, getUser } = props;
+  const [ready, setReady] = useState(false);
+  useEffect(() => {
+    (async () => {
+      let id = 0;
+      if (match) {
+        id = match.params.id;
+      }
+      await getUser(Number(id));
+      setReady(true);
+    })();
+  }, []);
+
+  const onSubmit = async (values: User) => {
+    let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
+
+    userValues = UserFormatter.trimExtraSpaces(userValues);
+
+    try {
+      await editUser({ id: user.id, ...userValues } as any);
+    } catch (e) {
+      const data = e.response && e.response.data;
+      throw new FormError(t('userEdit.errorMsg'), data);
+    }
+  };
+
+  return ready ? <ProfileEditView onSubmit={onSubmit} {...props} /> : null;
+};
+
+export default connect<{}, {}, ProfileEditProps>(
+  ({ usersReducer: { user } }: any) => ({
+    user
+  }),
+  { getUser: USER, editUser: EDIT_USER }
+)(translate('userUsers')(UserEdit));
diff --git a/modules/user/client-react/profile/index.native.tsx b/modules/user/client-react/profile/index.native.tsx
new file mode 100644
index 0000000..0e04ead
--- /dev/null
+++ b/modules/user/client-react/profile/index.native.tsx
@@ -0,0 +1,124 @@
+import React from 'react';
+import { createStackNavigator, NavigationScreenProp, NavigationRoute, NavigationParams } from 'react-navigation';
+import { FormikErrors } from 'formik';
+
+import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
+import ClientModule from '@restapp/module-client-react-native';
+
+import resources from './locales';
+
+import Profile from './containers/Profile.native';
+import ProfileEdit from './containers/ProfileEdit.native';
+
+export enum UserRole {
+  admin = 'admin',
+  user = 'user'
+}
+
+interface Auth {
+  lnDisplayName: string;
+  lnId: string;
+  googleDisplayName: string;
+  googleId: string;
+  ghDisplayName: string;
+  ghId: string;
+  fbId: string;
+  fbDisplayName: string;
+}
+
+interface UserProfile {
+  fullName?: string;
+  firstName?: string;
+  lastName?: string;
+}
+
+export interface User extends UserProfile, Auth {
+  id?: number | string;
+  username: string;
+  role: UserRole;
+  isActive: boolean;
+  email: string;
+}
+export interface NavigationOptionsProps {
+  navigation?: NavigationScreenProp<NavigationRoute<NavigationParams>, NavigationParams>;
+}
+
+export interface CommonProps extends NavigationOptionsProps {
+  error?: string;
+  t?: TranslateFunction;
+}
+
+interface HandleSubmitProps<P> {
+  setErrors: (errors: FormikErrors<P>) => void;
+  props: P;
+}
+
+interface Errors {
+  message?: string;
+}
+
+export interface FormProps<V> {
+  handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;
+  onSubmit: (values: V) => Promise<void> | void | any;
+  submitting?: boolean;
+  errors: Errors;
+  values: V;
+  t?: TranslateFunction;
+}
+
+class ProfileScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Profile'
+  });
+  public render() {
+    return <Profile navigation={this.props.navigation} />;
+  }
+}
+
+class ProfilerEditScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Edit profile'
+  });
+  public render() {
+    return <ProfileEdit navigation={this.props.navigation} />;
+  }
+}
+
+const HeaderTitleWithI18n = translate('userProfile')(HeaderTitle);
+
+export default new ClientModule({
+  drawerItem: [
+    {
+      Profile: {
+        screen: createStackNavigator({
+          Profile: {
+            screen: ProfileScreen,
+            navigationOptions: ({ navigation }: NavigationOptionsProps) => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.profile" style="subTitle" />,
+              headerLeft: (
+                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+              ),
+              headerForceInset: {}
+            })
+          },
+          ProfileEdit: {
+            screen: ProfilerEditScreen,
+            navigationOptions: () => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editProfile" style="subTitle" />,
+              headerForceInset: {}
+            })
+          }
+        }),
+        userInfo: {
+          showOnLogin: true,
+          role: [UserRole.user, UserRole.admin]
+        },
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.profile" />
+        }
+      }
+    }
+  ],
+  localization: [{ ns: 'userProfile', resources }]
+});
diff --git a/modules/user/client-react/profile/index.tsx b/modules/user/client-react/profile/index.tsx
new file mode 100644
index 0000000..a01210f
--- /dev/null
+++ b/modules/user/client-react/profile/index.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+import { MenuItem } from '@restapp/look-client-react';
+import ClientModule from '@restapp/module-client-react';
+
+import resources from './locales';
+import Profile from './containers/Profile';
+import { AuthRoute, IfLoggedIn, withUser } from '../containers/Auth';
+
+export enum UserRole {
+  admin = 'admin',
+  user = 'user'
+}
+
+const ProfileName = withUser(({ currentUser }) => (
+  <>{currentUser ? currentUser.fullName || currentUser.username : null}</>
+));
+
+export default new ClientModule({
+  route: [
+    <AuthRoute exact path="/profile" role={[UserRole.user, UserRole.admin]} redirect="/login" component={Profile} />
+  ],
+  navItemRight: [
+    <IfLoggedIn key="/profile">
+      <MenuItem>
+        <NavLink to="/profile" className="nav-link" activeClassName="active">
+          <ProfileName />
+        </NavLink>
+      </MenuItem>
+    </IfLoggedIn>
+  ],
+  localization: [{ ns: 'userProfile', resources }]
+});
diff --git a/modules/user/client-react/profile/locales/en/translations.json b/modules/user/client-react/profile/locales/en/translations.json
new file mode 100644
index 0000000..6f35f8b
--- /dev/null
+++ b/modules/user/client-react/profile/locales/en/translations.json
@@ -0,0 +1,25 @@
+{
+  "navLink": {
+    "profile": "Profile",
+    "editProfile": "Edit profile"
+  },
+  "profile": {
+    "title": "Profile",
+    "headerText": "Profile info",
+    "meta": "A Profile page example",
+    "loadMsg": "Loading...",
+    "errorMsg": "No current user is logged in",
+    "editProfileText": "Edit Profile",
+    "card": {
+      "title": "Profile",
+      "group": {
+        "name": "User Name",
+        "email": "Email",
+        "role": "Role",
+        "full": "Full Name"
+      },
+      "fldEmail": "Email",
+      "btnSubmit": "Send instructions"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/profile/locales/index.ts b/modules/user/client-react/profile/locales/index.ts
new file mode 100644
index 0000000..ff8b4c5
--- /dev/null
+++ b/modules/user/client-react/profile/locales/index.ts
@@ -0,0 +1 @@
+export default {};
diff --git a/modules/user/client-react/profile/locales/ru/translations.json b/modules/user/client-react/profile/locales/ru/translations.json
new file mode 100644
index 0000000..07295a3
--- /dev/null
+++ b/modules/user/client-react/profile/locales/ru/translations.json
@@ -0,0 +1,23 @@
+{
+  "navLink": {
+    "profile": "Профиль",
+    "editProfile": "Редактирование профиля"
+  },
+  "profile": {
+    "title": "Профиль",
+    "headerText": "Информация о профиле",
+    "meta": "Пример страницы с профилем",
+    "loadMsg": "Загрузка...",
+    "errorMsg": "Нет текущего пользователя",
+    "editProfileText": "Редактировать профиль",
+    "card": {
+      "title": "Профиль",
+      "group": {
+        "name": "Имя пользователя",
+        "email": "Электронная почта",
+        "role": "Роль",
+        "full": "Полное имя"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/reducers/index.ts b/modules/user/client-react/reducers/index.ts
index d41fd99..72325b2 100644
--- a/modules/user/client-react/reducers/index.ts
+++ b/modules/user/client-react/reducers/index.ts
@@ -1,21 +1 @@
-export { default as currentUserReducer } from './currentUser';
-export { default as usersReducer } from './users';
-
-export enum ActionType {
-  SET_CURRENT_USER = 'SET_CURRENT_USER',
-  CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
-  SET_LOADING = 'SET_LOADING',
-  SET_USER = 'SET_USER',
-  SET_USERS = 'SET_USERS',
-  CLEAR_USERS = 'CLEAR_USERS',
-  SET_ORDER_BY = 'SET_ORDER_BY',
-  SET_FILTER = 'SET_FILTER',
-  DELETE_USER = 'DELETE_USER'
-}
-
-export interface UserModuleActionProps {
-  type: ActionType | ActionType[];
-  payload?: any;
-  request?: () => Promise<any>;
-  [key: string]: any;
-}
+export enum ActionType {}
diff --git a/modules/user/client-react/signUp/actions/clearUser.ts b/modules/user/client-react/signUp/actions/clearUser.ts
new file mode 100644
index 0000000..da5484f
--- /dev/null
+++ b/modules/user/client-react/signUp/actions/clearUser.ts
@@ -0,0 +1,7 @@
+import { ActionFunction, ActionType } from '.';
+
+const CLEAR_USER: ActionFunction<ActionType> = () => ({
+  type: ActionType.CLEAR_CURRENT_USER
+});
+
+export default CLEAR_USER;
diff --git a/modules/user/client-react/actions/forgotPassword.ts b/modules/user/client-react/signUp/actions/forgotPassword.ts
similarity index 58%
rename from modules/user/client-react/actions/forgotPassword.ts
rename to modules/user/client-react/signUp/actions/forgotPassword.ts
index 0c3ef67..4e3fe1a 100644
--- a/modules/user/client-react/actions/forgotPassword.ts
+++ b/modules/user/client-react/signUp/actions/forgotPassword.ts
@@ -1,8 +1,8 @@
 import axios from 'axios';
-import { ActionFunction } from '.';
+import { ActionFunction, ActionType } from '.';
 import { ForgotPasswordSubmitProps } from '..';
 
-const FORGOT_PASSWORD: ActionFunction<ForgotPasswordSubmitProps> = value => ({
+const FORGOT_PASSWORD: ActionFunction<ActionType, ForgotPasswordSubmitProps> = value => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/forgotPassword`, { value })
 });
diff --git a/modules/user/client-react/signUp/actions/index.ts b/modules/user/client-react/signUp/actions/index.ts
new file mode 100644
index 0000000..c02af42
--- /dev/null
+++ b/modules/user/client-react/signUp/actions/index.ts
@@ -0,0 +1,8 @@
+export { default as REGISTER } from './register';
+export { default as LOGIN } from './login';
+export { default as CLEAR_USER } from './clearUser';
+export { default as RESET_PASSWORD } from './resetPassword';
+export { default as FORGOT_PASSWORD } from './forgotPassword';
+
+export * from '../../actions';
+export { ActionType } from '../reducers';
diff --git a/modules/user/client-react/actions/login.ts b/modules/user/client-react/signUp/actions/login.ts
similarity index 61%
rename from modules/user/client-react/actions/login.ts
rename to modules/user/client-react/signUp/actions/login.ts
index 005764f..858e5b3 100644
--- a/modules/user/client-react/actions/login.ts
+++ b/modules/user/client-react/signUp/actions/login.ts
@@ -1,9 +1,8 @@
 import axios from 'axios';
-import { ActionFunction } from '.';
+import { ActionFunction, ActionType } from '.';
 import { LoginSubmitProps } from '..';
-import { ActionType } from '../reducers';
 
-const LOGIN: ActionFunction<LoginSubmitProps> = value => ({
+const LOGIN: ActionFunction<ActionType, LoginSubmitProps> = value => ({
   types: {
     SUCCESS: ActionType.SET_CURRENT_USER
   },
diff --git a/modules/user/client-react/actions/register.ts b/modules/user/client-react/signUp/actions/register.ts
similarity index 59%
rename from modules/user/client-react/actions/register.ts
rename to modules/user/client-react/signUp/actions/register.ts
index 008a656..ec096c5 100644
--- a/modules/user/client-react/actions/register.ts
+++ b/modules/user/client-react/signUp/actions/register.ts
@@ -1,8 +1,8 @@
 import axios from 'axios';
-import { ActionFunction } from '.';
+import { ActionFunction, ActionType } from '.';
 import { RegisterSubmitProps } from '..';
 
-const REGISTER: ActionFunction<RegisterSubmitProps> = value => ({
+const REGISTER: ActionFunction<ActionType, RegisterSubmitProps> = value => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/register`, { ...value })
 });
diff --git a/modules/user/client-react/actions/resetPassword.ts b/modules/user/client-react/signUp/actions/resetPassword.ts
similarity index 68%
rename from modules/user/client-react/actions/resetPassword.ts
rename to modules/user/client-react/signUp/actions/resetPassword.ts
index d7570b4..4c82901 100644
--- a/modules/user/client-react/actions/resetPassword.ts
+++ b/modules/user/client-react/signUp/actions/resetPassword.ts
@@ -1,12 +1,12 @@
 import axios from 'axios';
-import { ActionFunction } from '.';
+import { ActionFunction, ActionType } from '.';
 import { ResetPasswordSubmitProps } from '..';
 
 interface ResetPasswordProps extends ResetPasswordSubmitProps {
   token: string;
 }
 
-const RESET_PASSWORD: ActionFunction<ResetPasswordProps> = value => ({
+const RESET_PASSWORD: ActionFunction<ActionType, ResetPasswordProps> = value => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/resetPassword`, { ...value })
 });
diff --git a/modules/user/client-react/components/ForgotPasswordForm.native.tsx b/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
similarity index 93%
rename from modules/user/client-react/components/ForgotPasswordForm.native.tsx
rename to modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
index 5ba5502..15ca6cb 100644
--- a/modules/user/client-react/components/ForgotPasswordForm.native.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
@@ -1,14 +1,17 @@
-import * as React from 'react';
+import React from 'react';
 import { withFormik, FormikProps } from 'formik';
-import { FontAwesome } from '@expo/vector-icons';
 import { View, StyleSheet, Text, Keyboard } from 'react-native';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
+import { FontAwesome } from '@expo/vector-icons';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { RenderField, Button, primary } from '@restapp/look-client-react-native';
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { required, email, validate } from '@restapp/validation-common-react';
 import { translate } from '@restapp/i18n-client-react';
-import { CommonProps, FormProps, ForgotPasswordSubmitProps } from '../index.native';
+
+import { CommonProps, FormProps } from '../../index.native';
+import { ForgotPasswordSubmitProps } from '../index.native';
 
 interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
   sent: boolean;
@@ -126,4 +129,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(ForgotPasswordFormWithFormik(ForgotPasswordForm));
+export default translate('userSignUp')(ForgotPasswordFormWithFormik(ForgotPasswordForm));
diff --git a/modules/user/client-react/components/ForgotPasswordForm.tsx b/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
similarity index 89%
rename from modules/user/client-react/components/ForgotPasswordForm.tsx
rename to modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
index ef7cabb..c370e34 100644
--- a/modules/user/client-react/components/ForgotPasswordForm.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
@@ -1,11 +1,13 @@
-import * as React from 'react';
+import React from 'react';
 import { withFormik, FormikProps } from 'formik';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 import { required, email, validate } from '@restapp/validation-common-react';
 
-import { CommonProps, FormProps, ForgotPasswordSubmitProps } from '..';
+import { CommonProps, FormProps } from '../..';
+import { ForgotPasswordSubmitProps } from '..';
 
 interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
   sent: boolean;
@@ -60,4 +62,4 @@ const ForgotPasswordFormWithFormik = withFormik<ForgotPasswordFormProps, ForgotP
   displayName: 'ForgotPasswordForm' // helps with React DevTools
 });
 
-export default translate('user')(ForgotPasswordFormWithFormik(ForgotPasswordForm));
+export default translate('userSignUp')(ForgotPasswordFormWithFormik(ForgotPasswordForm));
diff --git a/modules/user/client-react/components/ForgotPasswordView.native.tsx b/modules/user/client-react/signUp/components/ForgotPasswordView.native.tsx
similarity index 95%
rename from modules/user/client-react/components/ForgotPasswordView.native.tsx
rename to modules/user/client-react/signUp/components/ForgotPasswordView.native.tsx
index 8e180ac..de1b59c 100644
--- a/modules/user/client-react/components/ForgotPasswordView.native.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordView.native.tsx
@@ -1,5 +1,6 @@
-import * as React from 'react';
+import React from 'react';
 import { StyleSheet, View } from 'react-native';
+
 import ForgotPasswordForm from './ForgotPasswordForm.native';
 import { ForgotPasswordSubmitProps } from '../index.native';
 
diff --git a/modules/user/client-react/components/ForgotPasswordView.tsx b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
similarity index 80%
rename from modules/user/client-react/components/ForgotPasswordView.tsx
rename to modules/user/client-react/signUp/components/ForgotPasswordView.tsx
index dff5d02..e3a0e5b 100644
--- a/modules/user/client-react/components/ForgotPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
@@ -1,10 +1,12 @@
-import * as React from 'react';
+import React from 'react';
 import Helmet from 'react-helmet';
+
 import { LayoutCenter, PageLayout } from '@restapp/look-client-react';
 
-import ForgotPasswordForm from '../components/ForgotPasswordForm';
-import settings from '../../../../settings';
-import { CommonProps, ForgotPasswordSubmitProps } from '..';
+import ForgotPasswordForm from './ForgotPasswordForm';
+import settings from '../../../../../settings';
+import { CommonProps } from '../..';
+import { ForgotPasswordSubmitProps } from '..';
 
 interface ForgotPasswordViewProps extends CommonProps {
   onSubmit: (values: ForgotPasswordSubmitProps) => void;
diff --git a/modules/user/client-react/components/LoginForm.native.tsx b/modules/user/client-react/signUp/components/LoginForm.native.tsx
similarity index 95%
rename from modules/user/client-react/components/LoginForm.native.tsx
rename to modules/user/client-react/signUp/components/LoginForm.native.tsx
index a74e9ba..1764adc 100644
--- a/modules/user/client-react/components/LoginForm.native.tsx
+++ b/modules/user/client-react/signUp/components/LoginForm.native.tsx
@@ -1,7 +1,8 @@
-import * as React from 'react';
+import React from 'react';
 import { StyleSheet, View, Text, TouchableOpacity, ViewStyle } from 'react-native';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
 import { withFormik } from 'formik';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { RenderField, Button, primary, FormView } from '@restapp/look-client-react-native';
@@ -9,8 +10,9 @@ import { placeholderColor, submit } from '@restapp/look-client-react-native/styl
 import { required, minLength, validate } from '@restapp/validation-common-react';
 import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@restapp/authentication-client-react';
 
-import { FormProps, LoginSubmitProps, NavigationOptionsProps } from '../index.native';
-import settings from '../../../../settings';
+import { FormProps, NavigationOptionsProps } from '../../index.native';
+import { LoginSubmitProps } from '../index.native';
+import settings from '../../../../../settings';
 
 interface SocialButtons {
   buttonsLength: number;
@@ -169,4 +171,4 @@ const LoginFormWithFormik = withFormik<LoginForm & NavigationOptionsProps, Login
   displayName: 'LoginForm' // helps with React DevTools
 });
 
-export default translate('user')(LoginFormWithFormik(LoginForm));
+export default translate('userSignUp')(LoginFormWithFormik(LoginForm));
diff --git a/modules/user/client-react/components/LoginForm.tsx b/modules/user/client-react/signUp/components/LoginForm.tsx
similarity index 94%
rename from modules/user/client-react/components/LoginForm.tsx
rename to modules/user/client-react/signUp/components/LoginForm.tsx
index d7845bc..1fb3a0d 100644
--- a/modules/user/client-react/components/LoginForm.tsx
+++ b/modules/user/client-react/signUp/components/LoginForm.tsx
@@ -1,14 +1,16 @@
-import * as React from 'react';
+import React from 'react';
 import { withFormik } from 'formik';
 import { NavLink, Link } from 'react-router-dom';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { required, minLength, validate } from '@restapp/validation-common-react';
 import { Form, RenderField, Alert, Button } from '@restapp/look-client-react';
 import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@restapp/authentication-client-react';
 
-import settings from '../../../../settings';
-import { FormProps, LoginSubmitProps } from '..';
+import settings from '../../../../../settings';
+import { LoginSubmitProps } from '..';
+import { FormProps } from '../..';
 
 interface SocialButtons {
   buttonsLength: number;
@@ -112,4 +114,4 @@ const LoginFormWithFormik = withFormik<FormProps<LoginSubmitProps>, LoginSubmitP
   displayName: 'LoginForm' // helps with React DevTools
 });
 
-export default translate('user')(LoginFormWithFormik(LoginForm));
+export default translate('userSignUp')(LoginFormWithFormik(LoginForm));
diff --git a/modules/user/client-react/components/LoginView.native.tsx b/modules/user/client-react/signUp/components/LoginView.native.tsx
similarity index 97%
rename from modules/user/client-react/components/LoginView.native.tsx
rename to modules/user/client-react/signUp/components/LoginView.native.tsx
index 980e821..09bb995 100644
--- a/modules/user/client-react/components/LoginView.native.tsx
+++ b/modules/user/client-react/signUp/components/LoginView.native.tsx
@@ -1,6 +1,7 @@
-import * as React from 'react';
+import React from 'react';
 import { StyleSheet, View, Text, Linking, Platform } from 'react-native';
 import { WebBrowser } from 'expo';
+
 import { translate } from '@restapp/i18n-client-react';
 import { placeholderColor } from '@restapp/look-client-react-native/styles';
 import { setItem } from '@restapp/core-common/clientStorage';
@@ -107,4 +108,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(LoginView);
+export default translate('userSignUp')(LoginView);
diff --git a/modules/user/client-react/components/LoginView.tsx b/modules/user/client-react/signUp/components/LoginView.tsx
similarity index 93%
rename from modules/user/client-react/components/LoginView.tsx
rename to modules/user/client-react/signUp/components/LoginView.tsx
index 43798b0..d8ad227 100644
--- a/modules/user/client-react/components/LoginView.tsx
+++ b/modules/user/client-react/signUp/components/LoginView.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import Helmet from 'react-helmet';
 
 import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText, Button } from '@restapp/look-client-react';
@@ -8,7 +8,7 @@ import LoginForm from './LoginForm';
 import { LoginSubmitProps } from '..';
 import { LoginProps } from '../containers/Login';
 
-import settings from '../../../../settings';
+import settings from '../../../../../settings';
 
 interface LoginViewProps extends LoginProps {
   onSubmit: (values: LoginSubmitProps) => void;
@@ -69,4 +69,4 @@ const LoginView = ({ onSubmit, t, isRegistered, hideModal }: LoginViewProps) =>
   );
 };
 
-export default translate('user')(LoginView);
+export default translate('userSignUp')(LoginView);
diff --git a/modules/user/client-react/components/RegisterForm.native.tsx b/modules/user/client-react/signUp/components/RegisterForm.native.tsx
similarity index 92%
rename from modules/user/client-react/components/RegisterForm.native.tsx
rename to modules/user/client-react/signUp/components/RegisterForm.native.tsx
index d2bd140..a007473 100644
--- a/modules/user/client-react/components/RegisterForm.native.tsx
+++ b/modules/user/client-react/signUp/components/RegisterForm.native.tsx
@@ -1,17 +1,18 @@
-import * as React from 'react';
+import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import { withFormik } from 'formik';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
-
 import { RenderField, Button, primary, FormView } from '@restapp/look-client-react-native';
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { match, email, minLength, required, validate } from '@restapp/validation-common-react';
 
-import settings from '../../../../settings';
+import settings from '../../../../../settings';
 
-import { FormProps, RegisterSubmitProps } from '../index.native';
+import { FormProps } from '../../index.native';
+import { RegisterSubmitProps } from '../index.native';
 
 interface RegisterProps extends FormProps<RegisterSubmitProps> {
   valid: string;
@@ -103,4 +104,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(RegisterFormWithFormik(RegisterForm));
+export default translate('userSignUp')(RegisterFormWithFormik(RegisterForm));
diff --git a/modules/user/client-react/components/RegisterForm.tsx b/modules/user/client-react/signUp/components/RegisterForm.tsx
similarity index 90%
rename from modules/user/client-react/components/RegisterForm.tsx
rename to modules/user/client-react/signUp/components/RegisterForm.tsx
index 422dd6a..cfd1932 100644
--- a/modules/user/client-react/components/RegisterForm.tsx
+++ b/modules/user/client-react/signUp/components/RegisterForm.tsx
@@ -1,13 +1,14 @@
-import * as React from 'react';
+import React from 'react';
 import { withFormik } from 'formik';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
-
 import { match, email, minLength, required, validate } from '@restapp/validation-common-react';
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 
-import { FormProps, RegisterSubmitProps } from '..';
-import settings from '../../../../settings';
+import { FormProps } from '../..';
+import { RegisterSubmitProps } from '..';
+import settings from '../../../../../settings';
 
 const registerFormSchema = {
   username: [required, minLength(3)],
@@ -67,4 +68,4 @@ const RegisterFormWithFormik = withFormik<FormProps<RegisterSubmitProps>, Regist
   displayName: 'SignUpForm' // helps with React DevTools
 });
 
-export default translate('user')(RegisterFormWithFormik(RegisterForm));
+export default translate('userSignUp')(RegisterFormWithFormik(RegisterForm));
diff --git a/modules/user/client-react/components/RegisterView.native.tsx b/modules/user/client-react/signUp/components/RegisterView.native.tsx
similarity index 91%
rename from modules/user/client-react/components/RegisterView.native.tsx
rename to modules/user/client-react/signUp/components/RegisterView.native.tsx
index 273c367..8f6433c 100644
--- a/modules/user/client-react/components/RegisterView.native.tsx
+++ b/modules/user/client-react/signUp/components/RegisterView.native.tsx
@@ -1,10 +1,10 @@
-import * as React from 'react';
-import { Button, primary } from '@restapp/look-client-react-native';
+import React from 'react';
 import { View, Text, StyleSheet } from 'react-native';
-import { TranslateFunction, translate } from '@restapp/i18n-client-react';
 
-import RegisterForm from '../components/RegisterForm.native';
+import { Button, primary } from '@restapp/look-client-react-native';
+import { TranslateFunction, translate } from '@restapp/i18n-client-react';
 
+import RegisterForm from './RegisterForm.native';
 import { RegisterSubmitProps } from '../index.native';
 
 interface RegisterViewProps {
@@ -66,4 +66,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(RegisterView);
+export default translate('userSignUp')(RegisterView);
diff --git a/modules/user/client-react/components/RegisterView.tsx b/modules/user/client-react/signUp/components/RegisterView.tsx
similarity index 88%
rename from modules/user/client-react/components/RegisterView.tsx
rename to modules/user/client-react/signUp/components/RegisterView.tsx
index 5578ca5..1492a80 100644
--- a/modules/user/client-react/components/RegisterView.tsx
+++ b/modules/user/client-react/signUp/components/RegisterView.tsx
@@ -1,12 +1,11 @@
-import * as React from 'react';
+import React from 'react';
 import Helmet from 'react-helmet';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText } from '@restapp/look-client-react';
 
-import RegisterForm from '../components/RegisterForm';
-
-import settings from '../../../../settings';
-
+import RegisterForm from './RegisterForm';
+import settings from '../../../../../settings';
 import { RegisterSubmitProps } from '..';
 
 interface RegisterViewProps {
@@ -52,4 +51,4 @@ const RegisterView = ({ t, onSubmit, isRegistered }: RegisterViewProps) => {
   );
 };
 
-export default translate('user')(RegisterView);
+export default translate('userSignUp')(RegisterView);
diff --git a/modules/user/client-react/components/ResetPasswordForm.native.tsx b/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
similarity index 90%
rename from modules/user/client-react/components/ResetPasswordForm.native.tsx
rename to modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
index cabc400..2d5d070 100644
--- a/modules/user/client-react/components/ResetPasswordForm.native.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
@@ -2,14 +2,16 @@ import React from 'react';
 import { withFormik, FormikProps } from 'formik';
 import { View, StyleSheet } from 'react-native';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
-
 import { RenderField, Button, primary } from '@restapp/look-client-react-native';
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { required, minLength, validate, match } from '@restapp/validation-common-react';
-import settings from '../../../../settings';
-import { CommonProps, FormProps, ResetPasswordSubmitProps } from '../index.native';
+
+import settings from '../../../../../settings';
+import { CommonProps, FormProps } from '../../index.native';
+import { ResetPasswordSubmitProps } from '../index.native';
 
 interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
 
@@ -79,4 +81,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(ResetPasswordFormWithFormik(ResetPasswordForm));
+export default translate('userSignUp')(ResetPasswordFormWithFormik(ResetPasswordForm));
diff --git a/modules/user/client-react/components/ResetPasswordForm.tsx b/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
similarity index 89%
rename from modules/user/client-react/components/ResetPasswordForm.tsx
rename to modules/user/client-react/signUp/components/ResetPasswordForm.tsx
index 94330d0..ceee787 100644
--- a/modules/user/client-react/components/ResetPasswordForm.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
@@ -1,11 +1,14 @@
 import React from 'react';
 import { withFormik, FormikProps } from 'formik';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
 import { required, minLength, validate, match } from '@restapp/validation-common-react';
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
-import settings from '../../../../settings';
-import { CommonProps, FormProps, ResetPasswordSubmitProps } from '..';
+
+import settings from '../../../../../settings';
+import { CommonProps, FormProps } from '../..';
+import { ResetPasswordSubmitProps } from '..';
 
 interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
 
@@ -60,4 +63,4 @@ const ResetPasswordFormWithFormik = withFormik<ResetPasswordFormProps, ResetPass
   displayName: 'LoginForm' // helps with React DevTools
 });
 
-export default translate('user')(ResetPasswordFormWithFormik(ResetPasswordForm));
+export default translate('userSignUp')(ResetPasswordFormWithFormik(ResetPasswordForm));
diff --git a/modules/user/client-react/components/ResetPasswordView.native.tsx b/modules/user/client-react/signUp/components/ResetPasswordView.native.tsx
similarity index 89%
rename from modules/user/client-react/components/ResetPasswordView.native.tsx
rename to modules/user/client-react/signUp/components/ResetPasswordView.native.tsx
index 6c594ff..a421a30 100644
--- a/modules/user/client-react/components/ResetPasswordView.native.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordView.native.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { View, StyleSheet } from 'react-native';
 
-import ResetPasswordForm from '../components/ResetPasswordForm.native';
+import ResetPasswordForm from './ResetPasswordForm.native';
 import { ResetPasswordSubmitProps } from '../index.native';
 
 interface ResetPasswordViewProps {
diff --git a/modules/user/client-react/components/ResetPasswordView.tsx b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
similarity index 81%
rename from modules/user/client-react/components/ResetPasswordView.tsx
rename to modules/user/client-react/signUp/components/ResetPasswordView.tsx
index b5886aa..c83fbc1 100644
--- a/modules/user/client-react/components/ResetPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
 import Helmet from 'react-helmet';
+
 import { PageLayout } from '@restapp/look-client-react';
-import ResetPasswordForm from '../components/ResetPasswordForm';
-import { CommonProps, ResetPasswordSubmitProps } from '..';
-import settings from '../../../../settings';
+
+import ResetPasswordForm from './ResetPasswordForm';
+import { CommonProps } from '../..';
+import { ResetPasswordSubmitProps } from '..';
+import settings from '../../../../../settings';
 
 interface ResetPasswordViewProps extends CommonProps {
   onSubmit: (values: ResetPasswordSubmitProps) => void;
diff --git a/modules/user/client-react/containers/ForgotPassword.native.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
similarity index 86%
rename from modules/user/client-react/containers/ForgotPassword.native.tsx
rename to modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
index d604c84..87f036d 100644
--- a/modules/user/client-react/containers/ForgotPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
 import { connect } from 'react-redux';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
+
 import ForgotPasswordView from '../components/ForgotPasswordView.native';
-import { CommonProps, User, ForgotPasswordSubmitProps } from '../index.native';
+import { CommonProps, User } from '../../index.native';
+import { ForgotPasswordSubmitProps } from '../index.native';
 import { FORGOT_PASSWORD } from '../actions';
 
 interface ForgotPasswordProps extends CommonProps {
@@ -36,4 +39,4 @@ class ForgotPassword extends React.Component<ForgotPasswordProps> {
 export default connect<{}, {}, ForgotPasswordProps>(
   null,
   { forgotPassword: FORGOT_PASSWORD }
-)(translate('user')(ForgotPassword));
+)(translate('userSignUp')(ForgotPassword));
diff --git a/modules/user/client-react/containers/ForgotPassword.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
similarity index 88%
rename from modules/user/client-react/containers/ForgotPassword.tsx
rename to modules/user/client-react/signUp/containers/ForgotPassword.tsx
index 38c8598..a1115a3 100644
--- a/modules/user/client-react/containers/ForgotPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
@@ -1,11 +1,12 @@
 import React, { useState } from 'react';
 import { connect } from 'react-redux';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
-import ForgotPasswordView from '../components/ForgotPasswordView';
-
-import { CommonProps, ForgotPasswordSubmitProps } from '..';
 
+import ForgotPasswordView from '../components/ForgotPasswordView';
+import { CommonProps } from '../..';
+import { ForgotPasswordSubmitProps } from '..';
 import { FORGOT_PASSWORD } from '../actions';
 
 interface ForgotPasswordProps extends CommonProps {
@@ -32,4 +33,4 @@ const ForgotPassword: React.FunctionComponent<ForgotPasswordProps> = props => {
 export default connect(
   null,
   { forgotPassword: FORGOT_PASSWORD }
-)(translate('user')(ForgotPassword));
+)(translate('userSignUp')(ForgotPassword));
diff --git a/modules/user/client-react/containers/Login.native.tsx b/modules/user/client-react/signUp/containers/Login.native.tsx
similarity index 87%
rename from modules/user/client-react/containers/Login.native.tsx
rename to modules/user/client-react/signUp/containers/Login.native.tsx
index 99aba46..c60d7a9 100644
--- a/modules/user/client-react/containers/Login.native.tsx
+++ b/modules/user/client-react/signUp/containers/Login.native.tsx
@@ -1,10 +1,13 @@
 import React from 'react';
+import { connect } from 'react-redux';
+
 import { FormError } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
 import authentication from '@restapp/authentication-client-react';
-import { connect } from 'react-redux';
+
 import LoginView from '../components/LoginView.native';
-import { CommonProps, LoginSubmitProps } from '../index.native';
+import { CommonProps } from '../../index.native';
+import { LoginSubmitProps } from '../index.native';
 import { LOGIN } from '../actions';
 
 export interface LoginProps extends CommonProps {
@@ -32,4 +35,4 @@ class Login extends React.Component<LoginProps> {
 export default connect<{}, {}, LoginProps>(
   null,
   { login: LOGIN }
-)(translate('user')(Login));
+)(translate('userSignUp')(Login));
diff --git a/modules/user/client-react/containers/Login.tsx b/modules/user/client-react/signUp/containers/Login.tsx
similarity index 94%
rename from modules/user/client-react/containers/Login.tsx
rename to modules/user/client-react/signUp/containers/Login.tsx
index b7643ac..bc3db2e 100644
--- a/modules/user/client-react/containers/Login.tsx
+++ b/modules/user/client-react/signUp/containers/Login.tsx
@@ -1,13 +1,14 @@
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
+
 import { translate } from '@restapp/i18n-client-react';
 import authentication from '@restapp/authentication-client-react';
 import { FormError } from '@restapp/forms-client-react';
 import { setItem } from '@restapp/core-common/clientStorage';
 
 import LoginView from '../components/LoginView';
-import { CommonProps, LoginSubmitProps } from '..';
-
+import { CommonProps } from '../..';
+import { LoginSubmitProps } from '..';
 import { LOGIN } from '../actions';
 
 export interface LoginProps extends CommonProps {
@@ -76,4 +77,4 @@ const Login: React.FunctionComponent<LoginProps> = props => {
 export default connect(
   null,
   { login: LOGIN }
-)(translate('user')(Login));
+)(translate('userSignUp')(Login));
diff --git a/modules/user/client-react/containers/Logout.native.tsx b/modules/user/client-react/signUp/containers/Logout.native.tsx
similarity index 76%
rename from modules/user/client-react/containers/Logout.native.tsx
rename to modules/user/client-react/signUp/containers/Logout.native.tsx
index bdc21d3..54c5b3a 100644
--- a/modules/user/client-react/containers/Logout.native.tsx
+++ b/modules/user/client-react/signUp/containers/Logout.native.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { View } from 'react-native';
+
 import { HeaderTitle } from '@restapp/look-client-react-native';
 import { translate } from '@restapp/i18n-client-react';
 
-import { withLogout } from './Auth';
-
-import { CommonProps } from '../index.native';
+import { withLogout } from '../../containers/Auth';
+import { CommonProps } from '../../index.native';
 
 interface LogoutViewProps extends CommonProps {
   logout: () => void;
@@ -29,4 +29,4 @@ const LogoutView = ({ logout, t }: LogoutViewProps) => {
   );
 };
 
-export default translate('user')(withLogout(LogoutView));
+export default translate('userSignUp')(withLogout(LogoutView));
diff --git a/modules/user/client-react/containers/Register.native.tsx b/modules/user/client-react/signUp/containers/Register.native.tsx
similarity index 88%
rename from modules/user/client-react/containers/Register.native.tsx
rename to modules/user/client-react/signUp/containers/Register.native.tsx
index c16f1a6..24d3890 100644
--- a/modules/user/client-react/containers/Register.native.tsx
+++ b/modules/user/client-react/signUp/containers/Register.native.tsx
@@ -1,12 +1,14 @@
 import React from 'react';
 import { connect } from 'react-redux';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
-import RegisterView from '../components/RegisterView.native';
 
-import settings from '../../../../settings';
+import RegisterView from '../components/RegisterView.native';
+import settings from '../../../../../settings';
 import { REGISTER } from '../actions';
-import { CommonProps, RegisterSubmitProps } from '../index.native';
+import { CommonProps } from '../../index.native';
+import { RegisterSubmitProps } from '../index.native';
 
 interface RegisterProps extends CommonProps {
   register?: (values: RegisterSubmitProps) => any;
@@ -57,4 +59,4 @@ class Register extends React.Component<RegisterProps, RegisterState> {
 export default connect<{}, {}, RegisterProps>(
   null,
   { register: REGISTER }
-)(translate('user')(Register));
+)(translate('userSignUp')(Register));
diff --git a/modules/user/client-react/containers/Register.tsx b/modules/user/client-react/signUp/containers/Register.tsx
similarity index 84%
rename from modules/user/client-react/containers/Register.tsx
rename to modules/user/client-react/signUp/containers/Register.tsx
index 5e10ed6..fd8dd88 100644
--- a/modules/user/client-react/containers/Register.tsx
+++ b/modules/user/client-react/signUp/containers/Register.tsx
@@ -1,13 +1,14 @@
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import RegisterView from '../components/RegisterView';
-
-import { CommonProps, RegisterSubmitProps } from '..';
+import { CommonProps } from '../..';
+import { RegisterSubmitProps } from '..';
 import { REGISTER } from '../actions';
-import settings from '../../../../settings';
+import settings from '../../../../../settings';
 
 interface RegisterProps extends CommonProps {
   register: (values: RegisterSubmitProps) => any;
@@ -39,4 +40,4 @@ const Register: React.FunctionComponent<RegisterProps> = props => {
 export default connect(
   null,
   { register: REGISTER }
-)(translate('user')(Register));
+)(translate('userSignUp')(Register));
diff --git a/modules/user/client-react/containers/ResetPassword.native.tsx b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
similarity index 84%
rename from modules/user/client-react/containers/ResetPassword.native.tsx
rename to modules/user/client-react/signUp/containers/ResetPassword.native.tsx
index 077ff2f..cc1fb38 100644
--- a/modules/user/client-react/containers/ResetPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
@@ -1,10 +1,13 @@
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
+
 import ResetPasswordView from '../components/ResetPasswordView.native';
 import { RESET_PASSWORD } from '../actions';
-import { CommonProps, ResetPasswordSubmitProps } from '../index.native';
+import { CommonProps } from '../../index.native';
+import { ResetPasswordSubmitProps } from '../index.native';
 
 interface Token {
   token: string;
@@ -33,4 +36,4 @@ const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
 export default connect<{}, {}, ResetPasswordProps>(
   null,
   { resetPassword: RESET_PASSWORD }
-)(translate('user')(ResetPassword));
+)(translate('userSignUp')(ResetPassword));
diff --git a/modules/user/client-react/containers/ResetPassword.tsx b/modules/user/client-react/signUp/containers/ResetPassword.tsx
similarity index 86%
rename from modules/user/client-react/containers/ResetPassword.tsx
rename to modules/user/client-react/signUp/containers/ResetPassword.tsx
index 76905c5..fb8b5e8 100644
--- a/modules/user/client-react/containers/ResetPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.tsx
@@ -1,10 +1,12 @@
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
-import ResetPasswordView from '../components/ResetPasswordView';
 
-import { CommonProps, ResetPasswordSubmitProps } from '..';
+import ResetPasswordView from '../components/ResetPasswordView';
+import { CommonProps } from '../..';
+import { ResetPasswordSubmitProps } from '..';
 import { RESET_PASSWORD } from '../actions';
 
 interface Token {
@@ -34,4 +36,4 @@ const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
 export default connect(
   null,
   { resetPassword: RESET_PASSWORD }
-)(translate('user')(ResetPassword));
+)(translate('userSignUp')(ResetPassword));
diff --git a/modules/user/client-react/signUp/index.native.tsx b/modules/user/client-react/signUp/index.native.tsx
new file mode 100644
index 0000000..236f24e
--- /dev/null
+++ b/modules/user/client-react/signUp/index.native.tsx
@@ -0,0 +1,126 @@
+import React from 'react';
+import { createStackNavigator } from 'react-navigation';
+
+import { translate } from '@restapp/i18n-client-react';
+import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
+import ClientModule from '@restapp/module-client-react-native';
+
+import resources from './locales';
+import Login from './containers/Login.native';
+import Logout from './containers/Logout.native';
+import Register from './containers/Register.native';
+import ForgotPassword from './containers/ForgotPassword.native';
+import ResetPassword from './containers/ResetPassword.native';
+import { NavigationOptionsProps } from '../index.native';
+import signUpReducer from './reducers';
+
+export interface LoginSubmitProps {
+  usernameOrEmail: string;
+  password: string;
+}
+export interface ResetPasswordSubmitProps {
+  password: string;
+  passwordConfirmation: string;
+}
+
+export interface ForgotPasswordSubmitProps {
+  email: string;
+}
+
+export interface RegisterSubmitProps {
+  username: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+}
+
+class LoginScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = ({ navigation }: NavigationOptionsProps) => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.signIn" style="subTitle" />,
+    headerLeft: (
+      <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+    ),
+    headerForceInset: {}
+  });
+
+  public render() {
+    return <Login navigation={this.props.navigation} />;
+  }
+}
+class RegisterScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.register" style="subTitle" />,
+    headerForceInset: {}
+  });
+  public render() {
+    return <Register navigation={this.props.navigation} />;
+  }
+}
+
+class ForgotPasswordScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.forgotPassword" style="subTitle" />,
+    headerForceInset: {}
+  });
+  public render() {
+    return <ForgotPassword navigation={this.props.navigation} />;
+  }
+}
+
+class ResetPasswordScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    headerTitle: <HeaderTitleWithI18n i18nKey="navLink.resetPassword" style="subTitle" />,
+    headerForceInset: {}
+  });
+  public render() {
+    return <ResetPassword navigation={this.props.navigation} />;
+  }
+}
+
+const AuthScreen = createStackNavigator(
+  {
+    Login: { screen: LoginScreen },
+    ForgotPassword: { screen: ForgotPasswordScreen },
+    ResetPassword: { screen: ResetPasswordScreen },
+    Register: { screen: RegisterScreen }
+  },
+  {
+    cardStyle: {
+      backgroundColor: '#fff'
+    },
+    navigationOptions: {
+      headerStyle: { backgroundColor: '#fff' }
+    }
+  }
+);
+
+const HeaderTitleWithI18n = translate('userSignUp')(HeaderTitle);
+
+export default new ClientModule({
+  drawerItem: [
+    {
+      Login: {
+        screen: AuthScreen,
+        userInfo: {
+          showOnLogin: false
+        },
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.signIn" />
+        }
+      },
+      Logout: {
+        screen: (): null => null,
+        userInfo: {
+          showOnLogin: true
+        },
+        navigationOptions: ({ navigation }: NavigationOptionsProps) => {
+          return {
+            drawerLabel: <Logout navigation={navigation} />
+          };
+        }
+      }
+    }
+  ],
+  localization: [{ ns: 'userSignUp', resources }],
+  reducer: [{ signUpReducer }]
+});
diff --git a/modules/user/client-react/signUp/index.tsx b/modules/user/client-react/signUp/index.tsx
new file mode 100644
index 0000000..ebbccf2
--- /dev/null
+++ b/modules/user/client-react/signUp/index.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { NavLink, withRouter } from 'react-router-dom';
+
+import { translate } from '@restapp/i18n-client-react';
+import { MenuItem } from '@restapp/look-client-react';
+import ClientModule from '@restapp/module-client-react';
+
+import Login from './containers/Login';
+import Register from './containers/Register';
+import ForgotPassword from './containers/ForgotPassword';
+import ResetPassword from './containers/ResetPassword';
+import signUpReducer from './reducers';
+import resources from './locales';
+
+import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLogout, WithLogoutProps } from '../containers/Auth';
+
+export interface LoginSubmitProps {
+  usernameOrEmail: string;
+  password: string;
+}
+
+export interface RegisterSubmitProps {
+  username: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+}
+
+export interface ResetPasswordSubmitProps {
+  password: string;
+  passwordConfirmation: string;
+}
+export interface ForgotPasswordSubmitProps {
+  email: string;
+}
+
+const LogoutLink = withRouter(withLogout(({ logout, history }: WithLogoutProps) => (
+  <a
+    href="javascript:void(0)"
+    onClick={e => {
+      e.preventDefault();
+      (async () => {
+        await logout();
+        history.push('/');
+      })();
+    }}
+    className="nav-link"
+  >
+    Logout
+  </a>
+)) as any);
+
+const NavLinkLoginWithI18n = translate('userSignUp')(({ t }: any) => (
+  <NavLink to="/login" className="nav-link" activeClassName="active">
+    {t('navLink.signIn')}
+  </NavLink>
+));
+
+export default new ClientModule({
+  route: [
+    <AuthRoute exact path="/login" redirectOnLoggedIn redirect="/" component={Login} />,
+    <AuthRoute exact path="/register" redirectOnLoggedIn redirect="/profile" component={Register} />,
+    <AuthRoute exact path="/forgot-password" redirectOnLoggedIn redirect="/profile" component={ForgotPassword} />,
+    <AuthRoute exact path="/reset-password/:token" redirectOnLoggedIn redirect="/profile" component={ResetPassword} />
+  ],
+  navItemRight: [
+    <IfLoggedIn key="/logout">
+      <MenuItem>
+        <LogoutLink />
+      </MenuItem>
+    </IfLoggedIn>,
+    <IfNotLoggedIn key="/login">
+      <MenuItem>
+        <NavLinkLoginWithI18n />
+      </MenuItem>
+    </IfNotLoggedIn>
+  ],
+  localization: [{ ns: 'userSignUp', resources }],
+  reducer: [{ signUpReducer }]
+});
diff --git a/modules/user/client-react/signUp/locales/en/translations.json b/modules/user/client-react/signUp/locales/en/translations.json
new file mode 100644
index 0000000..8b83146
--- /dev/null
+++ b/modules/user/client-react/signUp/locales/en/translations.json
@@ -0,0 +1,91 @@
+{
+  "loading": "App is loading...",
+  "navLink": {
+    "signIn": "Sign In",
+    "logout": "Log out",
+    "forgotPassword": "Forgot password",
+    "register": "Register",
+    "resetPassword": "Reset password"
+  },
+  "login": {
+    "title": "Login",
+    "meta": "A Login page example",
+    "errorMsg": "Login failed!",
+    "cardTitle": "Available logins",
+    "notRegText": "Not registered yet?",
+    "fbBtn": "Log in with Facebook",
+    "googleBtn": "Log in with Google",
+    "githubBtn": "Log in with GitHub",
+    "linkedinBtn": "Log in with LinkedIn",
+    "form": {
+      "title": "Sign In",
+      "field": {
+        "usernameOrEmail": "Username or Email",
+        "pass": "Password"
+      },
+      "btnSubmit": "Login"
+    },
+    "btn": {
+      "forgotPass": "Forgot your password?",
+      "notReg": "Not registered yet?",
+      "sign": "Sign Up"
+    }
+  },
+  "reg": {
+    "title": "Register",
+    "meta": "A Registration page example",
+    "errorMsg": "Registration failed!",
+    "form": {
+      "title": "Sign Up",
+      "field": {
+        "name": "Username",
+        "email": "Email",
+        "pass": "Password",
+        "passConf": "Password Confirmation"
+      },
+      "btnSubmit": "Register"
+    },
+    "confirmationMsgTitle": "Verify Your Email Address",
+    "confirmationMsgBody": "We now need to verify your email address. We've sent you the email. Please click the link in that email to continue. ",
+    "confirmationBtn": "Go back to Login page",
+    "successRegTitle": "Email Has Been Verified Successfully",
+    "successRegBody": "Your email has been verified successfully. You can sign in using your login and password."
+  },
+  "resetPass": {
+    "title": "Reset password",
+    "meta": "A Reset Password page example",
+    "errorMsg": "Password reset failed!",
+    "form": {
+      "title": "Reset Password",
+      "field": {
+        "pass": "Password",
+        "passConf": "Password Confirmation"
+      },
+      "btnSubmit": "Reset password"
+    }
+  },
+  "forgotPass": {
+    "title": "Forgot password",
+    "meta": "A Forgot Password page example",
+    "errorMsg": "Reset password failed!",
+    "form": {
+      "title": "Password Reset",
+      "submitMsg": "Instructions for resetting your password were emailed to you.",
+      "fldEmail": "Email",
+      "btnSubmit": "Send instructions"
+    }
+  },
+  "mobile": {
+    "login": {
+      "usernameOrEmail": {
+        "label": "Username or Email",
+        "placeholder": "Enter Your Username or Email"
+      },
+      "pass": {
+        "label": "Password",
+        "placeholder": "Enter Your Password"
+      }
+    },
+    "logout": "Log out"
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/signUp/locales/index.ts b/modules/user/client-react/signUp/locales/index.ts
new file mode 100644
index 0000000..ff8b4c5
--- /dev/null
+++ b/modules/user/client-react/signUp/locales/index.ts
@@ -0,0 +1 @@
+export default {};
diff --git a/modules/user/client-react/signUp/locales/ru/translations.json b/modules/user/client-react/signUp/locales/ru/translations.json
new file mode 100644
index 0000000..3e09be5
--- /dev/null
+++ b/modules/user/client-react/signUp/locales/ru/translations.json
@@ -0,0 +1,91 @@
+{
+  "loading": "Приложение загружается...",
+  "navLink": {
+    "signIn": "Вход в систему",
+    "logout": "Выход",
+    "forgotPassword": "Забыли пароль",
+    "register": "Регистрация",
+    "resetPassword": "Сброс пароля"
+  },
+  "forgotPass": {
+    "title": "Забыли пароль",
+    "meta": "Пример страницы Забыли пароль?",
+    "errorMsg": "Сброс пароля не выполнен!",
+    "form": {
+      "title": "Сброс пароля",
+      "submitMsg": "Инструкции по сбросу пароля были отправлены вам на электронную почту.",
+      "fldEmail": "Электронная почта",
+      "btnSubmit": "Отправить инструкции"
+    }
+  },
+  "login": {
+    "title": "Вход",
+    "meta": "Пример страницы с входом",
+    "errorMsg": "Ошибка входа!",
+    "cardTitle": "Доступные учетные записи",
+    "notRegText": "Ещё не зарегистрированы?",
+    "fbBtn": "Войти через Facebook",
+    "googleBtn": "Войти через Google",
+    "githubBtn": "Войти через GitHub",
+    "linkedinBtn": "Войти через LinkedIn",
+    "form": {
+      "title": "Вход в систему",
+      "field": {
+        "usernameOrEmail": "Имя пользователя или эл.почта",
+        "pass": "Пароль"
+      },
+      "btnSubmit": "Войти"
+    },
+    "btn": {
+      "forgotPass": "Забыли пароль?",
+      "notReg": "Ещё не зарегистрированы?",
+      "sign": "Зарегистрироваться"
+    }
+  },
+  "reg": {
+    "title": "Регистрация",
+    "meta": "Пример страницы с регистрацией",
+    "errorMsg": "Ошибка регистрации!",
+    "form": {
+      "title": "Регистрация",
+      "field": {
+        "name": "Имя пользователя",
+        "email": "Электронная почта",
+        "pass": "Пароль",
+        "passConf": "Подтверждение пароля"
+      },
+      "btnSubmit": "Зарегистрироваться"
+    },
+    "confirmationMsgTitle": "Подтвердите свой адрес электронной почты",
+    "confirmationMsgBody": "Теперь нам нужно подтвердить ваш адрес электронной почты. Мы отправили вам электронное письмо. Пожалуйста, нажмите на ссылку в этом письме, чтобы продолжить.",
+    "confirmationBtn": "Вернуться на страница регистрации",
+    "successRegTitle": "Адрес электронной почты был успешно подтвержден",
+    "successRegBody": "Ваш адрес электронной почты был успешно подтвержден. Вы можете войти в приложение, используя свой логин и пароль."
+  },
+  "resetPass": {
+    "title": "Сброс пароля",
+    "meta": "Пример страницы со сбросом пароля",
+    "errorMsg": "Сброс пароля не выполнен!",
+    "form": {
+      "title": "Сброс пароля",
+      "field": {
+        "pass": "Пароля",
+        "passConf": "Подтверждение пароля"
+      },
+      "btnSubmit": "Сбросить пароль"
+    }
+  },
+  "mobile": {
+    "login": {
+      "usernameOrEmail": {
+        "label": "Имя пользователя или email",
+        "placeholder": "Введите имя пользователя или эл.почту"
+      },
+      "pass": {
+        "label": "Пароль",
+        "placeholder": "Введите пароль"
+      }
+    },
+    "logout": "Выйти"
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/reducers/currentUser.ts b/modules/user/client-react/signUp/reducers/index.ts
similarity index 55%
rename from modules/user/client-react/reducers/currentUser.ts
rename to modules/user/client-react/signUp/reducers/index.ts
index e038a12..76794dd 100644
--- a/modules/user/client-react/reducers/currentUser.ts
+++ b/modules/user/client-react/signUp/reducers/index.ts
@@ -1,5 +1,17 @@
-import { User } from '..';
-import { UserModuleActionProps, ActionType } from '.';
+import { User } from '../..';
+
+export interface SignUpActionProps {
+  type: ActionType | ActionType[];
+  payload?: any;
+  APICall?: () => Promise<any>;
+  [key: string]: any;
+}
+
+export enum ActionType {
+  SET_CURRENT_USER = 'SET_CURRENT_USER',
+  CLEAR_CURRENT_USER = 'CLEAR_CURRENT_USER',
+  SET_LOADING_AND_CLEAR_USER = 'SET_LOADING_AND_CLEAR_USER'
+}
 
 export interface CurrentUserState {
   currentUser: User;
@@ -11,11 +23,12 @@ const defaultState: CurrentUserState = {
   loading: false
 };
 
-export default function(state = defaultState, action: UserModuleActionProps) {
+export default function(state = defaultState, action: SignUpActionProps) {
   switch (action.type) {
-    case ActionType.SET_LOADING:
+    case ActionType.SET_LOADING_AND_CLEAR_USER:
       return {
         ...state,
+        currentUser: null,
         loading: true
       };
 
@@ -23,7 +36,7 @@ export default function(state = defaultState, action: UserModuleActionProps) {
       return {
         ...state,
         currentUser: null,
-        loading: !state.loading
+        loading: false
       };
 
     case ActionType.SET_CURRENT_USER:
diff --git a/modules/user/client-react/users/actions/addUser.ts b/modules/user/client-react/users/actions/addUser.ts
new file mode 100644
index 0000000..8cf509a
--- /dev/null
+++ b/modules/user/client-react/users/actions/addUser.ts
@@ -0,0 +1,10 @@
+import axios from 'axios';
+import { User } from '../..';
+import { ActionType, ActionFunction } from '.';
+
+const ADD_USER: ActionFunction<ActionType, User> = user => ({
+  types: {},
+  APICall: () => axios.post(`${__API_URL__}/addUser`, { ...user })
+});
+
+export default ADD_USER;
diff --git a/modules/user/client-react/actions/deleteUser.ts b/modules/user/client-react/users/actions/deleteUser.ts
similarity index 59%
rename from modules/user/client-react/actions/deleteUser.ts
rename to modules/user/client-react/users/actions/deleteUser.ts
index 28907df..70f72a2 100644
--- a/modules/user/client-react/actions/deleteUser.ts
+++ b/modules/user/client-react/users/actions/deleteUser.ts
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import { ActionFunction } from '.';
-import { ActionType } from '../reducers';
+import { ActionType, ActionFunction } from '.';
 
-const DELETE_USER: ActionFunction<number> = id => ({
+const DELETE_USER: ActionFunction<ActionType, number> = id => ({
   types: {
     SUCCESS: ActionType.DELETE_USER
   },
diff --git a/modules/user/client-react/users/actions/editUser.ts b/modules/user/client-react/users/actions/editUser.ts
new file mode 100644
index 0000000..abf14a3
--- /dev/null
+++ b/modules/user/client-react/users/actions/editUser.ts
@@ -0,0 +1,10 @@
+import axios from 'axios';
+import { ActionType, ActionFunction } from '.';
+import { User } from '../..';
+
+const EDIT_USER: ActionFunction<ActionType, User> = user => ({
+  types: {},
+  APICall: () => axios.post(`${__API_URL__}/editUser`, { ...user })
+});
+
+export default EDIT_USER;
diff --git a/modules/user/client-react/users/actions/index.ts b/modules/user/client-react/users/actions/index.ts
new file mode 100644
index 0000000..b1f91e0
--- /dev/null
+++ b/modules/user/client-react/users/actions/index.ts
@@ -0,0 +1,8 @@
+export { default as ADD_USER } from './addUser';
+export { default as EDIT_USER } from './editUser';
+export { default as DELETE_USER } from './deleteUser';
+export { default as USER } from './user';
+export { default as USERS } from './users';
+
+export * from '../../actions';
+export { ActionType } from '../reducers';
diff --git a/modules/user/client-react/actions/user.ts b/modules/user/client-react/users/actions/user.ts
similarity index 56%
rename from modules/user/client-react/actions/user.ts
rename to modules/user/client-react/users/actions/user.ts
index 24ec0ae..f652e77 100644
--- a/modules/user/client-react/actions/user.ts
+++ b/modules/user/client-react/users/actions/user.ts
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import { ActionFunction } from '.';
-import { ActionType } from '../reducers';
+import { ActionFunction, ActionType } from '.';
 
-const USER: ActionFunction<number> = id => ({
+const USER: ActionFunction<ActionType, number> = id => ({
   types: {
     SUCCESS: ActionType.SET_USER
   },
diff --git a/modules/user/client-react/actions/users.ts b/modules/user/client-react/users/actions/users.ts
similarity index 62%
rename from modules/user/client-react/actions/users.ts
rename to modules/user/client-react/users/actions/users.ts
index 6edf756..f9ce7a8 100644
--- a/modules/user/client-react/actions/users.ts
+++ b/modules/user/client-react/users/actions/users.ts
@@ -1,9 +1,12 @@
 import axios from 'axios';
-import { ActionFunction } from '.';
-import { ActionType } from '../reducers';
+import { ActionType, ActionFunction } from '.';
 import { OrderBy, Filter } from '..';
 
-const USERS: ActionFunction<OrderBy, Filter, ActionType> = (orderBy: OrderBy, filter: Filter, type: ActionType) => ({
+const USERS: ActionFunction<ActionType, OrderBy, Filter, ActionType> = (
+  orderBy: OrderBy,
+  filter: Filter,
+  type: ActionType
+) => ({
   types: {
     REQUEST: type ? ActionType[type] : null,
     SUCCESS: ActionType.SET_USERS,
diff --git a/modules/user/client-react/components/UserAddView.native.tsx b/modules/user/client-react/users/components/UserAddView.native.tsx
similarity index 89%
rename from modules/user/client-react/components/UserAddView.native.tsx
rename to modules/user/client-react/users/components/UserAddView.native.tsx
index 18457e8..e3874be 100644
--- a/modules/user/client-react/components/UserAddView.native.tsx
+++ b/modules/user/client-react/users/components/UserAddView.native.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 
 import UserForm from './UserForm';
-
-import { User } from '../index.native';
+import { User } from '../../index.native';
 
 interface FormValues extends User {
   password: string;
@@ -38,4 +38,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(UserAddView);
+export default translate('userUsers')(UserAddView);
diff --git a/modules/user/client-react/components/UserAddView.tsx b/modules/user/client-react/users/components/UserAddView.tsx
similarity index 82%
rename from modules/user/client-react/components/UserAddView.tsx
rename to modules/user/client-react/users/components/UserAddView.tsx
index 11435f9..4479304 100644
--- a/modules/user/client-react/components/UserAddView.tsx
+++ b/modules/user/client-react/users/components/UserAddView.tsx
@@ -1,14 +1,18 @@
 import React from 'react';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
-import settings from '../../../../settings';
-import { User, ResetPasswordSubmitProps } from '..';
+import settings from '../../../../../settings';
+import { User } from '../..';
 
-interface FormValues extends User, ResetPasswordSubmitProps {}
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
 
 interface UserAddViewProps {
   t: TranslateFunction;
@@ -42,4 +46,4 @@ const UserAddView = ({ t, onSubmit }: UserAddViewProps) => {
   );
 };
 
-export default translate('user')(UserAddView);
+export default translate('userUsers')(UserAddView);
diff --git a/modules/user/client-react/components/UserEditView.native.tsx b/modules/user/client-react/users/components/UserEditView.native.tsx
similarity index 85%
rename from modules/user/client-react/components/UserEditView.native.tsx
rename to modules/user/client-react/users/components/UserEditView.native.tsx
index f8d81ca..1228a37 100644
--- a/modules/user/client-react/components/UserEditView.native.tsx
+++ b/modules/user/client-react/users/components/UserEditView.native.tsx
@@ -4,9 +4,12 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Loading } from '@restapp/look-client-react-native';
 
 import UserForm from './UserForm';
-import { User, ResetPasswordSubmitProps } from '../index.native';
+import { User } from '../../index.native';
 
-interface FormValues extends User, ResetPasswordSubmitProps {}
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
 
 interface UserEditViewProps {
   loading: boolean;
@@ -44,4 +47,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(UserEditView);
+export default translate('userUsers')(UserEditView);
diff --git a/modules/user/client-react/components/UserEditView.tsx b/modules/user/client-react/users/components/UserEditView.tsx
similarity index 85%
rename from modules/user/client-react/components/UserEditView.tsx
rename to modules/user/client-react/users/components/UserEditView.tsx
index 7995aeb..b5ac293 100644
--- a/modules/user/client-react/components/UserEditView.tsx
+++ b/modules/user/client-react/users/components/UserEditView.tsx
@@ -1,14 +1,18 @@
-import * as React from 'react';
+import React from 'react';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
-import settings from '../../../../settings';
-import { User, ResetPasswordSubmitProps } from '..';
+import settings from '../../../../../settings';
+import { User } from '../..';
 
-interface FormValues extends User, ResetPasswordSubmitProps {}
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
 
 interface UserEditViewProps {
   loading: boolean;
@@ -58,4 +62,4 @@ const UserEditView: React.FunctionComponent<UserEditViewProps> = ({ loading, use
   );
 };
 
-export default translate('user')(UserEditView);
+export default translate('userUsers')(UserEditView);
diff --git a/modules/user/client-react/components/UserForm.native.tsx b/modules/user/client-react/users/components/UserForm.native.tsx
similarity index 96%
rename from modules/user/client-react/components/UserForm.native.tsx
rename to modules/user/client-react/users/components/UserForm.native.tsx
index ab52c05..361ba11 100644
--- a/modules/user/client-react/components/UserForm.native.tsx
+++ b/modules/user/client-react/users/components/UserForm.native.tsx
@@ -1,17 +1,16 @@
-import * as React from 'react';
+import React from 'react';
 import { withFormik, FormikProps } from 'formik';
 import { View, StyleSheet } from 'react-native';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-
 import { RenderField, Button, RenderSelect, RenderSwitch, FormView, primary } from '@restapp/look-client-react-native';
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
 
-import { FormProps, User, UserRole } from '../index.native';
-
-import settings from '../../../../settings';
+import { FormProps, User, UserRole } from '../../index.native';
+import settings from '../../../../../settings';
 
 interface FormikFormProps extends FormProps<FormValues> {
   initialValues: FormValues;
@@ -206,4 +205,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(UserFormWithFormik(UserForm));
+export default translate('userUsers')(UserFormWithFormik(UserForm));
diff --git a/modules/user/client-react/components/UserForm.tsx b/modules/user/client-react/users/components/UserForm.tsx
similarity index 93%
rename from modules/user/client-react/components/UserForm.tsx
rename to modules/user/client-react/users/components/UserForm.tsx
index 79e3dcc..6b53785 100644
--- a/modules/user/client-react/components/UserForm.tsx
+++ b/modules/user/client-react/users/components/UserForm.tsx
@@ -1,14 +1,14 @@
-import * as React from 'react';
+import React from 'react';
 import { withFormik, FormikProps } from 'formik';
 import { isEmpty } from 'lodash';
+
 import { FieldAdapter as Field } from '@restapp/forms-client-react';
 import { translate } from '@restapp/i18n-client-react';
 import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
 import { Form, RenderField, RenderSelect, RenderCheckBox, Option, Button, Alert } from '@restapp/look-client-react';
 
-import settings from '../../../../settings';
-
-import { CommonProps, FormProps, User, UserRole, ResetPasswordSubmitProps } from '..';
+import settings from '../../../../../settings';
+import { CommonProps, FormProps, User, UserRole } from '../..';
 
 interface FormikFormProps extends FormProps<FormValues> {
   initialValues: FormValues;
@@ -28,7 +28,10 @@ interface UserFormProps extends CommonProps, FormikProps<FormValues> {
   initialValues: FormValues;
 }
 
-interface FormValues extends User, ResetPasswordSubmitProps {}
+interface FormValues extends User {
+  password: string;
+  passwordConfirmation: string;
+}
 
 const userFormSchema = {
   username: [required, minLength(3)],
@@ -155,4 +158,4 @@ const UserFormWithFormik = withFormik<FormikFormProps, FormValues>({
   }
 });
 
-export default translate('user')(UserFormWithFormik(UserForm));
+export default translate('userUsers')(UserFormWithFormik(UserForm));
diff --git a/modules/user/client-react/components/UsersFilterView.native.tsx b/modules/user/client-react/users/components/UsersFilterView.native.tsx
similarity index 98%
rename from modules/user/client-react/components/UsersFilterView.native.tsx
rename to modules/user/client-react/users/components/UsersFilterView.native.tsx
index 20b90d8..1d08050 100644
--- a/modules/user/client-react/components/UsersFilterView.native.tsx
+++ b/modules/user/client-react/users/components/UsersFilterView.native.tsx
@@ -1,7 +1,8 @@
-import * as React from 'react';
+import React from 'react';
 import { View, StyleSheet, Text, TouchableOpacity } from 'react-native';
 import { debounce } from 'lodash';
 import { FontAwesome } from '@expo/vector-icons';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import {
   Select,
@@ -15,6 +16,7 @@ import {
   Button
 } from '@restapp/look-client-react-native';
 import { itemAction, itemContainer, itemTitle } from '@restapp/look-client-react-native/styles';
+
 import { OrderBy } from '../index.native';
 
 interface UsersFilterViewProps {
@@ -240,4 +242,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(UsersFilterView);
+export default translate('userUsers')(UsersFilterView);
diff --git a/modules/user/client-react/components/UsersFilterView.tsx b/modules/user/client-react/users/components/UsersFilterView.tsx
similarity index 95%
rename from modules/user/client-react/components/UsersFilterView.tsx
rename to modules/user/client-react/users/components/UsersFilterView.tsx
index b90b335..fdd246c 100644
--- a/modules/user/client-react/components/UsersFilterView.tsx
+++ b/modules/user/client-react/users/components/UsersFilterView.tsx
@@ -1,7 +1,9 @@
-import * as React from 'react';
+import React from 'react';
 import { DebounceInput } from 'react-debounce-input';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Form, FormItem, Select, Option, Label, Input } from '@restapp/look-client-react';
+
 import { Filter } from '..';
 
 export interface UsersFilterViewProps {
@@ -54,4 +56,4 @@ const UsersFilterView: React.FunctionComponent<UsersFilterViewProps> = ({
   </Form>
 );
 
-export default translate('user')(UsersFilterView);
+export default translate('userUsers')(UsersFilterView);
diff --git a/modules/user/client-react/components/UsersListView.native.tsx b/modules/user/client-react/users/components/UsersListView.native.tsx
similarity index 97%
rename from modules/user/client-react/components/UsersListView.native.tsx
rename to modules/user/client-react/users/components/UsersListView.native.tsx
index 4e6a56b..97aa8ac 100644
--- a/modules/user/client-react/components/UsersListView.native.tsx
+++ b/modules/user/client-react/users/components/UsersListView.native.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import { FontAwesome } from '@expo/vector-icons';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import {
   Button,
@@ -14,7 +15,7 @@ import {
   primary
 } from '@restapp/look-client-react-native';
 
-import { NavigationOptionsProps, User } from '../index.native';
+import { NavigationOptionsProps, User } from '../../index.native';
 
 interface UsersListViewProps extends NavigationOptionsProps {
   users: User[];
@@ -128,4 +129,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default translate('user')(UsersListView);
+export default translate('userUsers')(UsersListView);
diff --git a/modules/user/client-react/components/UsersListView.tsx b/modules/user/client-react/users/components/UsersListView.tsx
similarity index 95%
rename from modules/user/client-react/components/UsersListView.tsx
rename to modules/user/client-react/users/components/UsersListView.tsx
index 3a28044..11d447d 100644
--- a/modules/user/client-react/components/UsersListView.tsx
+++ b/modules/user/client-react/users/components/UsersListView.tsx
@@ -1,9 +1,11 @@
-import * as React from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
+
 import { translate } from '@restapp/i18n-client-react';
 import { Table, Button } from '@restapp/look-client-react';
-import { User } from '..';
-import { OrderBy, CommonProps } from '..';
+
+import { User, CommonProps } from '../..';
+import { OrderBy } from '..';
 
 export interface UsersViewProps extends CommonProps {
   loading: boolean;
@@ -128,4 +130,4 @@ const UsersView = ({ deleteUser, orderBy, onOrderBy, loading, users, t, ...rest
   );
 };
 
-export default translate('user')(UsersView);
+export default translate('userUsers')(UsersView);
diff --git a/modules/user/client-react/containers/UserAdd.tsx b/modules/user/client-react/users/containers/UserAdd.tsx
similarity index 85%
rename from modules/user/client-react/containers/UserAdd.tsx
rename to modules/user/client-react/users/containers/UserAdd.tsx
index 93e71d8..cb786e5 100644
--- a/modules/user/client-react/containers/UserAdd.tsx
+++ b/modules/user/client-react/users/containers/UserAdd.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { pick } from 'lodash';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import UserAddView from '../components/UserAddView';
-import UserFormatter from '../helpers/UserFormatter';
-import { CommonProps as RNCommonProps } from '../index.native';
-import { User, CommonProps } from '..';
+import UserFormatter from '../../helpers/UserFormatter';
+import { CommonProps as RNCommonProps } from '../../index.native';
+import { User, CommonProps } from '../..';
 import { ADD_USER } from '../actions';
 
 interface UserAddProps extends CommonProps, RNCommonProps {
@@ -43,4 +44,4 @@ const UserAdd: React.FunctionComponent<UserAddProps> = props => {
 export default connect<{}, {}, UserAddProps>(
   null,
   { addUser: ADD_USER }
-)(translate('user')(UserAdd));
+)(translate('userUsers')(UserAdd));
diff --git a/modules/user/client-react/containers/UserEdit.native.tsx b/modules/user/client-react/users/containers/UserEdit.native.tsx
similarity index 85%
rename from modules/user/client-react/containers/UserEdit.native.tsx
rename to modules/user/client-react/users/containers/UserEdit.native.tsx
index 8dcf909..b683ee2 100644
--- a/modules/user/client-react/containers/UserEdit.native.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.native.tsx
@@ -1,12 +1,13 @@
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
 import { pick } from 'lodash';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
-import UserEditView from '../components/UserEditView.native';
 
-import UserFormatter from '../helpers/UserFormatter';
-import { CommonProps, User } from '../index.native';
+import UserEditView from '../components/UserEditView.native';
+import UserFormatter from '../../helpers/UserFormatter';
+import { CommonProps, User } from '../../index.native';
 import { USER, EDIT_USER } from '../actions';
 
 interface UserEditProps extends CommonProps {
@@ -52,10 +53,10 @@ class UserEdit extends React.Component<UserEditProps> {
 }
 
 export default connect<{}, {}, UserEditProps>(
-  ({ users: { user }, currentUser: { currentUser, loading } }: any) => ({
+  ({ usersReducer: { user }, signUpReducer: { currentUser, loading } }: any) => ({
     user,
     currentUser,
     loading
   }),
   { getUser: USER, editUser: EDIT_USER }
-)(translate('user')(UserEdit));
+)(translate('userUsers')(UserEdit));
diff --git a/modules/user/client-react/containers/UserEdit.tsx b/modules/user/client-react/users/containers/UserEdit.tsx
similarity index 89%
rename from modules/user/client-react/containers/UserEdit.tsx
rename to modules/user/client-react/users/containers/UserEdit.tsx
index f549993..f980bd4 100644
--- a/modules/user/client-react/containers/UserEdit.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.tsx
@@ -1,12 +1,13 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 import { pick } from 'lodash';
+
 import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
-import UserEditView from '../components/UserEditView';
 
-import UserFormatter from '../helpers/UserFormatter';
-import { User, CommonProps } from '..';
+import UserEditView from '../components/UserEditView';
+import UserFormatter from '../../helpers/UserFormatter';
+import { User, CommonProps } from '../..';
 import { USER, EDIT_USER } from '../actions';
 
 interface UserEditProps extends CommonProps {
@@ -52,8 +53,8 @@ const UserEdit: React.FunctionComponent<UserEditProps> = props => {
 };
 
 export default connect(
-  ({ users: { user } }: any) => ({
+  ({ usersReducer: { user } }: any) => ({
     user
   }),
   { getUser: USER, editUser: EDIT_USER }
-)(translate('user')(UserEdit));
+)(translate('userUsers')(UserEdit));
diff --git a/modules/user/client-react/containers/UserOperations.tsx b/modules/user/client-react/users/containers/UserOperations.tsx
similarity index 88%
rename from modules/user/client-react/containers/UserOperations.tsx
rename to modules/user/client-react/users/containers/UserOperations.tsx
index 9b8c294..4caae08 100644
--- a/modules/user/client-react/containers/UserOperations.tsx
+++ b/modules/user/client-react/users/containers/UserOperations.tsx
@@ -1,7 +1,9 @@
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
+
 import { USERS, DELETE_USER } from '../actions';
-import { UserRole, OrderBy } from '..';
+import { UserRole } from '../..';
+import { OrderBy } from '..';
 
 const withUsers = (Component: React.ComponentType<any>) => {
   class WithUsers extends React.Component<any> {
@@ -23,8 +25,8 @@ const withUsers = (Component: React.ComponentType<any>) => {
     }
   }
   return connect(
-    ({ users: { loading, users } }: any) => ({
-      loading,
+    ({ usersReducer: { usersLoading, users } }: any) => ({
+      loading: usersLoading,
       users
     }),
     { getUsers: USERS }
@@ -58,7 +60,7 @@ const withSortAndFilter = (Component: React.ComponentType<any>) => {
   };
 
   return connect(
-    ({ users: { orderBy, filter } }: any) => ({
+    ({ usersReducer: { orderBy, filter } }: any) => ({
       orderBy,
       filter
     }),
diff --git a/modules/user/client-react/containers/Users.native.tsx b/modules/user/client-react/users/containers/Users.native.tsx
similarity index 95%
rename from modules/user/client-react/containers/Users.native.tsx
rename to modules/user/client-react/users/containers/Users.native.tsx
index cebf0d5..b1648bd 100644
--- a/modules/user/client-react/containers/Users.native.tsx
+++ b/modules/user/client-react/users/containers/Users.native.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
 import { compose } from 'redux';
+
 import UsersList from '../components/UsersListView.native';
 import UsersFilter from '../components/UsersFilterView.native';
 import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
 
-import { NavigationOptionsProps } from '../index.native';
+import { NavigationOptionsProps } from '../../index.native';
 
 interface UsersProps extends NavigationOptionsProps {
   loading: boolean;
diff --git a/modules/user/client-react/containers/Users.tsx b/modules/user/client-react/users/containers/Users.tsx
similarity index 94%
rename from modules/user/client-react/containers/Users.tsx
rename to modules/user/client-react/users/containers/Users.tsx
index 59469f9..36cc559 100644
--- a/modules/user/client-react/containers/Users.tsx
+++ b/modules/user/client-react/users/containers/Users.tsx
@@ -2,9 +2,11 @@ import * as React from 'react';
 import Helmet from 'react-helmet';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
+
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Button, PageLayout } from '@restapp/look-client-react';
-import settings from '../../../../settings';
+
+import settings from '../../../../../settings';
 import UsersFilterView, { UsersFilterViewProps } from '../components/UsersFilterView';
 import UsersListView, { UsersViewProps } from '../components/UsersListView';
 import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
@@ -46,4 +48,4 @@ export default compose(
   withUsersDeleting,
   withSortAndFilter,
   withUsers
-)(translate('user')(Users));
+)(translate('userUsers')(Users));
diff --git a/modules/user/client-react/users/index.native.tsx b/modules/user/client-react/users/index.native.tsx
new file mode 100644
index 0000000..89a7727
--- /dev/null
+++ b/modules/user/client-react/users/index.native.tsx
@@ -0,0 +1,105 @@
+import React from 'react';
+import { createStackNavigator } from 'react-navigation';
+
+import { translate } from '@restapp/i18n-client-react';
+import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
+import ClientModule from '@restapp/module-client-react-native';
+
+import resources from './locales';
+import Users from './containers/Users.native';
+import UserEdit from './containers/UserEdit.native';
+import UserAdd from './containers/UserAdd';
+import { NavigationOptionsProps } from '../index.native';
+import usersReducer from './reducers';
+
+export interface OrderBy {
+  column: string;
+  order: string;
+}
+
+export interface Filter {
+  searchText: string;
+  role: string;
+  isActive: boolean;
+}
+
+class UsersListScreen extends React.Component<NavigationOptionsProps> {
+  public render() {
+    return <Users navigation={this.props.navigation} />;
+  }
+}
+
+class UserEditScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Edit user'
+  });
+  public render() {
+    return <UserEdit navigation={this.props.navigation} />;
+  }
+}
+
+class UserAddScreen extends React.Component<NavigationOptionsProps> {
+  public static navigationOptions = () => ({
+    title: 'Create user'
+  });
+  public render() {
+    return <UserAdd navigation={this.props.navigation} />;
+  }
+}
+
+const HeaderTitleWithI18n = translate('userUsers')(HeaderTitle);
+
+export default new ClientModule({
+  drawerItem: [
+    {
+      Users: {
+        screen: createStackNavigator({
+          Users: {
+            screen: UsersListScreen,
+            navigationOptions: ({ navigation }: NavigationOptionsProps) => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.users" style="subTitle" />,
+              headerLeft: (
+                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+              ),
+              headerRight: (
+                <IconButton
+                  iconName="filter"
+                  iconSize={32}
+                  iconColor="#0275d8"
+                  onPress={() => {
+                    const isOpenFilter = navigation.getParam('isOpenFilter');
+                    navigation.setParams({ isOpenFilter: !isOpenFilter });
+                  }}
+                />
+              ),
+              headerForceInset: {}
+            })
+          },
+          UserEdit: {
+            screen: UserEditScreen,
+            navigationOptions: () => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editUser" style="subTitle" />,
+              headerForceInset: {}
+            })
+          },
+          UserAdd: {
+            screen: UserAddScreen,
+            navigationOptions: () => ({
+              headerTitle: <HeaderTitleWithI18n i18nKey="navLink.editUser" style="subTitle" />,
+              headerForceInset: {}
+            })
+          }
+        }),
+        userInfo: {
+          showOnLogin: true,
+          role: 'admin'
+        },
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n i18nKey="navLink.users" />
+        }
+      }
+    }
+  ],
+  localization: [{ ns: 'userUsers', resources }],
+  reducer: [{ usersReducer }]
+});
diff --git a/modules/user/client-react/users/index.tsx b/modules/user/client-react/users/index.tsx
new file mode 100644
index 0000000..c127314
--- /dev/null
+++ b/modules/user/client-react/users/index.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+import { translate } from '@restapp/i18n-client-react';
+import { MenuItem } from '@restapp/look-client-react';
+import ClientModule from '@restapp/module-client-react';
+
+import resources from './locales';
+import Users from './containers/Users';
+import UserEdit from './containers/UserEdit';
+import UserAdd from './containers/UserAdd';
+import { AuthRoute, IfLoggedIn } from '../containers/Auth';
+import usersReducer from './reducers';
+
+export enum UserRole {
+  admin = 'admin',
+  user = 'user'
+}
+
+export interface OrderBy {
+  column: string;
+  order: string;
+}
+
+export interface Filter {
+  searchText: string;
+  role: string;
+  isActive: boolean;
+}
+
+export * from '../containers/Auth';
+
+const NavLinkUsersWithI18n = translate('userUsers')(({ t }: any) => (
+  <NavLink to="/users" className="nav-link" activeClassName="active">
+    {t('navLink.users')}
+  </NavLink>
+));
+
+export default new ClientModule({
+  route: [
+    <AuthRoute exact path="/users" redirect="/profile" role={UserRole.admin} component={Users} />,
+    <AuthRoute exact path="/users/new" role={[UserRole.admin]} component={UserAdd} />,
+    <AuthRoute path="/users/:id" redirect="/profile" role={[UserRole.user, UserRole.admin]} component={UserEdit} />
+  ],
+  navItem: [
+    <IfLoggedIn key="/users" role={UserRole.admin}>
+      <MenuItem>
+        <NavLinkUsersWithI18n />
+      </MenuItem>
+    </IfLoggedIn>
+  ],
+  localization: [{ ns: 'userUsers', resources }],
+  reducer: [{ usersReducer }]
+});
diff --git a/modules/user/client-react/users/locales/en/translations.json b/modules/user/client-react/users/locales/en/translations.json
new file mode 100644
index 0000000..a1befbc
--- /dev/null
+++ b/modules/user/client-react/users/locales/en/translations.json
@@ -0,0 +1,78 @@
+{
+  "loading": "App is loading...",
+  "navLink": {
+    "users": "Users",
+    "editUser": "Edit user"
+  },
+  "userEdit": {
+    "title": "Edit User",
+    "meta": "An Edit User page example",
+    "errorMsg": "User editing failed!",
+    "loadMsg": "Loading...",
+    "form": {
+      "title": "User",
+      "titleEdit": "Edit",
+      "titleCreate": "Create",
+      "field": {
+        "name": "Username",
+        "email": "Email",
+        "role": {
+          "label": "Role",
+          "user": "user",
+          "admin": "admin"
+        },
+        "active": "Is Active",
+        "firstName": "First Name",
+        "lastName": "Last Name",
+        "pass": "Password",
+        "passConf": "Password Confirmation"
+      },
+      "btnSubmit": "Save"
+    },
+    "select": {
+      "okText": "Done",
+      "dismissText": "Cancel"
+    },
+    "btnBack": "Back"
+  },
+  "userAdd": {
+    "errorMsg": "Add user failed!"
+  },
+  "users": {
+    "title": "Users",
+    "meta": "A User List page example",
+    "loadMsg": "Loading...",
+    "list": {
+      "title": "Users",
+      "item": {
+        "filter": "Filter",
+        "search": "Search ...",
+        "role": {
+          "label": "Role",
+          "all": "All",
+          "user": "user",
+          "admin": "admin"
+        },
+        "active": "Is Active"
+      }
+    },
+    "select": {
+      "okText": "Done",
+      "dismissText": "Cancel"
+    },
+    "btnModalSubmit": "Submit",
+    "btnModalClose": "Close",
+    "orderByText": "Order by",
+    "column": {
+      "name": "Username",
+      "email": "Email",
+      "role": "Role",
+      "active": "Is Active",
+      "actions": "Actions"
+    },
+    "btn": {
+      "add": "Add user",
+      "delete": "Delete"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/users/locales/index.ts b/modules/user/client-react/users/locales/index.ts
new file mode 100644
index 0000000..ff8b4c5
--- /dev/null
+++ b/modules/user/client-react/users/locales/index.ts
@@ -0,0 +1 @@
+export default {};
diff --git a/modules/user/client-react/users/locales/ru/translations.json b/modules/user/client-react/users/locales/ru/translations.json
new file mode 100644
index 0000000..3a3ff7b
--- /dev/null
+++ b/modules/user/client-react/users/locales/ru/translations.json
@@ -0,0 +1,78 @@
+{
+  "loading": "Приложение загружается...",
+  "navLink": {
+    "users": "Пользователи",
+    "editUser": "Редактирование пользователя"
+  },
+  "userEdit": {
+    "title": "Редактирование пользователя",
+    "meta": "Пример страницы с редактированием пользователя",
+    "errorMsg": "Не удалось изменить пользователя!",
+    "loadMsg": "Загрузка...",
+    "form": {
+      "title": "пользователя",
+      "titleEdit": "Редактировать",
+      "titleCreate": "Создать",
+      "field": {
+        "name": "Имя пользователя",
+        "email": "Электронная почта",
+        "role": {
+          "label": "Роль",
+          "user": "пользователь",
+          "admin": "админ"
+        },
+        "active": "Активен",
+        "firstName": "Имя",
+        "lastName": "Фамилия",
+        "pass": "Пароль",
+        "passConf": "Подтверждение пароля"
+      },
+      "btnSubmit": "Сохранить"
+    },
+    "select": {
+      "okText": "Подтвердить",
+      "dismissText": "Отмена"
+    },
+    "btnBack": "Назад"
+  },
+  "userAdd": {
+    "errorMsg": "Не удалось добавить пользователя!"
+  },
+  "users": {
+    "title": "Список пользователей",
+    "meta": "Пример страницы со списком пользователей",
+    "loadMsg": "Загрузка...",
+    "list": {
+      "title": "Список пользователей",
+      "item": {
+        "filter": "Фильтр",
+        "search": "Поиск ...",
+        "role": {
+          "label": "Роль",
+          "all": "Все",
+          "user": "пользователь",
+          "admin": "админ"
+        },
+        "active": "Активен"
+      }
+    },
+    "select": {
+      "okText": "Подтвердить",
+      "dismissText": "Отмена"
+    },
+    "btnModalSubmit": "Сохранить",
+    "btnModalClose": "Закрыть",
+    "orderByText": "Сортировать",
+    "column": {
+      "name": "Имя пользователя",
+      "email": "Электронная почта",
+      "role": "Роль",
+      "active": "Активен",
+      "actions": "Действия"
+    },
+    "btn": {
+      "add": "Добавить пользователя",
+      "delete": "Удалить"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/client-react/reducers/users.ts b/modules/user/client-react/users/reducers/index.ts
similarity index 58%
rename from modules/user/client-react/reducers/users.ts
rename to modules/user/client-react/users/reducers/index.ts
index b0d8ac8..301b5ed 100644
--- a/modules/user/client-react/reducers/users.ts
+++ b/modules/user/client-react/users/reducers/index.ts
@@ -1,8 +1,25 @@
-import { User, OrderBy, Filter } from '..';
-import { UserModuleActionProps, ActionType } from '.';
+import { User } from '../..';
+import { OrderBy, Filter } from '..';
+
+export enum ActionType {
+  SET_LOADING = 'SET_LOADING',
+  SET_USER = 'SET_USER',
+  SET_USERS = 'SET_USERS',
+  CLEAR_USERS = 'CLEAR_USERS',
+  SET_ORDER_BY = 'SET_ORDER_BY',
+  SET_FILTER = 'SET_FILTER',
+  DELETE_USER = 'DELETE_USER'
+}
+
+export interface UsersActionProps {
+  type: ActionType | ActionType[];
+  payload?: any;
+  APICall?: () => Promise<any>;
+  [key: string]: any;
+}
 
 export interface UserModuleState {
-  loading: boolean;
+  usersLoading: boolean;
   user: User;
   users: User[];
   orderBy: OrderBy;
@@ -10,37 +27,40 @@ export interface UserModuleState {
 }
 
 const defaultState: UserModuleState = {
-  loading: false,
+  usersLoading: false,
   user: null,
   users: [],
   orderBy: { column: '', order: '' },
   filter: { searchText: '', role: '', isActive: true }
 };
 
-export default function(state = defaultState, action: UserModuleActionProps) {
+export default function(state = defaultState, action: UsersActionProps) {
   switch (action.type) {
     case ActionType.SET_LOADING:
       return {
         ...state,
-        loading: true
+        usersLoading: true
       };
 
     case ActionType.SET_USER:
       return {
         ...state,
-        user: action.payload
+        user: action.payload,
+        usersLoading: false
       };
 
     case ActionType.SET_USERS:
       return {
         ...state,
-        users: action.payload
+        users: action.payload,
+        usersLoading: false
       };
 
     case ActionType.CLEAR_USERS:
       return {
         ...state,
-        users: null
+        users: null,
+        usersLoading: false
       };
 
     case ActionType.SET_FILTER:

From 701b2a618dcbba16e09ad69acc4ca774731cb4b9 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 31 May 2019 15:24:42 +0300
Subject: [PATCH 089/104] Create MetaData component

---
 .../user/client-react/components/MetaData.tsx | 23 +++++++++++++++++++
 .../profile/components/ProfileView.tsx        | 22 ++++--------------
 .../signUp/components/ForgotPasswordView.tsx  | 17 ++------------
 .../signUp/components/LoginView.tsx           | 18 ++-------------
 .../signUp/components/RegisterView.tsx        | 16 ++-----------
 .../signUp/components/ResetPasswordView.tsx   | 17 ++------------
 .../users/components/UserAddView.tsx          | 17 ++------------
 .../users/components/UserEditView.tsx         | 17 ++------------
 .../client-react/users/containers/Users.tsx   | 20 ++++------------
 9 files changed, 43 insertions(+), 124 deletions(-)
 create mode 100644 modules/user/client-react/components/MetaData.tsx

diff --git a/modules/user/client-react/components/MetaData.tsx b/modules/user/client-react/components/MetaData.tsx
new file mode 100644
index 0000000..b28b4d2
--- /dev/null
+++ b/modules/user/client-react/components/MetaData.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+
+import settings from '../../../../settings';
+
+interface MetaDataProps {
+  title: string;
+  meta: string;
+}
+
+const MetaData = ({ title, meta }: MetaDataProps) => (
+  <Helmet
+    title={`${settings.app.name} - ${title}`}
+    meta={[
+      {
+        name: 'description',
+        content: `${settings.app.name} - ${meta}`
+      }
+    ]}
+  />
+);
+
+export default MetaData;
diff --git a/modules/user/client-react/profile/components/ProfileView.tsx b/modules/user/client-react/profile/components/ProfileView.tsx
index 913f08a..8323adf 100644
--- a/modules/user/client-react/profile/components/ProfileView.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.tsx
@@ -1,44 +1,30 @@
 import React from 'react';
-import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { LayoutCenter, Card, CardGroup, CardTitle, CardText, PageLayout } from '@restapp/look-client-react';
 
 import { User } from '../..';
-import settings from '../../../../../settings';
+import MetaData from '../../components/MetaData';
 
 interface ProfileViewProps {
   currentUserLoading: boolean;
   currentUser: User;
   t: TranslateFunction;
 }
-const renderMetaData = (t: TranslateFunction) => {
-  return (
-    <Helmet
-      title={`${settings.app.name} - ${t('profile.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('profile.meta')}`
-        }
-      ]}
-    />
-  );
-};
 
 const ProfileView: React.FunctionComponent<ProfileViewProps> = ({ currentUserLoading, currentUser, t }) => {
   if (currentUserLoading && !currentUser) {
     return (
       <PageLayout>
-        {renderMetaData(t)}
+        <MetaData title={t('profile.title')} meta={t('profile.meta')} />
         <div className="text-center">{t('profile.loadMsg')}</div>
       </PageLayout>
     );
   } else if (currentUser) {
     return (
       <PageLayout>
-        {renderMetaData(t)}
+        <MetaData title={t('profile.title')} meta={t('profile.meta')} />
         <LayoutCenter>
           <h1 className="text-center">{t('profile.card.title')}</h1>
           <Card>
@@ -70,7 +56,7 @@ const ProfileView: React.FunctionComponent<ProfileViewProps> = ({ currentUserLoa
   } else {
     return (
       <PageLayout>
-        {renderMetaData(t)}
+        <MetaData title={t('profile.title')} meta={t('profile.meta')} />
         <h2>{t('profile.errorMsg')}</h2>
       </PageLayout>
     );
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
index e3a0e5b..7d6f7c3 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
-import Helmet from 'react-helmet';
 
 import { LayoutCenter, PageLayout } from '@restapp/look-client-react';
 
 import ForgotPasswordForm from './ForgotPasswordForm';
-import settings from '../../../../../settings';
 import { CommonProps } from '../..';
 import { ForgotPasswordSubmitProps } from '..';
+import MetaData from '../../components/MetaData';
 
 interface ForgotPasswordViewProps extends CommonProps {
   onSubmit: (values: ForgotPasswordSubmitProps) => void;
@@ -14,21 +13,9 @@ interface ForgotPasswordViewProps extends CommonProps {
 }
 
 const ForgotPasswordView: React.FunctionComponent<ForgotPasswordViewProps> = ({ onSubmit, t, sent }) => {
-  const renderMetaData = () => (
-    <Helmet
-      title={`${settings.app.name} - ${t('forgotPass.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('forgotPass.meta')}`
-        }
-      ]}
-    />
-  );
-
   return (
     <PageLayout>
-      {renderMetaData()}
+      <MetaData title={t('forgotPass.title')} meta={t('forgotPass.title')} />
       <LayoutCenter>
         <h1 className="text-center">{t('forgotPass.form.title')}</h1>
         <ForgotPasswordForm onSubmit={onSubmit} sent={sent} />
diff --git a/modules/user/client-react/signUp/components/LoginView.tsx b/modules/user/client-react/signUp/components/LoginView.tsx
index d8ad227..ce00c1d 100644
--- a/modules/user/client-react/signUp/components/LoginView.tsx
+++ b/modules/user/client-react/signUp/components/LoginView.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import Helmet from 'react-helmet';
 
 import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText, Button } from '@restapp/look-client-react';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
@@ -7,8 +6,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import LoginForm from './LoginForm';
 import { LoginSubmitProps } from '..';
 import { LoginProps } from '../containers/Login';
-
-import settings from '../../../../../settings';
+import MetaData from '../../components/MetaData';
 
 interface LoginViewProps extends LoginProps {
   onSubmit: (values: LoginSubmitProps) => void;
@@ -18,18 +16,6 @@ interface LoginViewProps extends LoginProps {
 }
 
 const LoginView = ({ onSubmit, t, isRegistered, hideModal }: LoginViewProps) => {
-  const renderMetaData = () => (
-    <Helmet
-      title={`${settings.app.name} - ${t('login.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('login.meta')}`
-        }
-      ]}
-    />
-  );
-
   const renderConfirmationModal = () => (
     <Card>
       <CardGroup style={{ textAlign: 'center' }}>
@@ -46,7 +32,7 @@ const LoginView = ({ onSubmit, t, isRegistered, hideModal }: LoginViewProps) =>
 
   return (
     <PageLayout>
-      {renderMetaData()}
+      <MetaData title={t('login.title')} meta={t('login.meta')} />
       <LayoutCenter>
         {isRegistered ? (
           renderConfirmationModal()
diff --git a/modules/user/client-react/signUp/components/RegisterView.tsx b/modules/user/client-react/signUp/components/RegisterView.tsx
index 1492a80..edd5b70 100644
--- a/modules/user/client-react/signUp/components/RegisterView.tsx
+++ b/modules/user/client-react/signUp/components/RegisterView.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import Helmet from 'react-helmet';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText } from '@restapp/look-client-react';
@@ -7,6 +6,7 @@ import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText } from '
 import RegisterForm from './RegisterForm';
 import settings from '../../../../../settings';
 import { RegisterSubmitProps } from '..';
+import MetaData from '../../components/MetaData';
 
 interface RegisterViewProps {
   t: TranslateFunction;
@@ -15,18 +15,6 @@ interface RegisterViewProps {
 }
 
 const RegisterView = ({ t, onSubmit, isRegistered }: RegisterViewProps) => {
-  const renderMetaData = () => (
-    <Helmet
-      title={`${settings.app.name} - ${t('reg.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('reg.meta')}`
-        }
-      ]}
-    />
-  );
-
   const renderConfirmationModal = () => (
     <Card>
       <CardGroup style={{ textAlign: 'center' }}>
@@ -38,7 +26,7 @@ const RegisterView = ({ t, onSubmit, isRegistered }: RegisterViewProps) => {
 
   return (
     <PageLayout>
-      {renderMetaData()}
+      <MetaData title={t('reg.title')} meta={t('reg.meta')} />
       <LayoutCenter>
         <h1 className="text-center">{t('reg.form.title')}</h1>
         {isRegistered && settings.auth.password.requireEmailConfirmation ? (
diff --git a/modules/user/client-react/signUp/components/ResetPasswordView.tsx b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
index c83fbc1..c608fac 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
@@ -1,33 +1,20 @@
 import React from 'react';
-import Helmet from 'react-helmet';
 
 import { PageLayout } from '@restapp/look-client-react';
 
 import ResetPasswordForm from './ResetPasswordForm';
 import { CommonProps } from '../..';
 import { ResetPasswordSubmitProps } from '..';
-import settings from '../../../../../settings';
+import MetaData from '../../components/MetaData';
 
 interface ResetPasswordViewProps extends CommonProps {
   onSubmit: (values: ResetPasswordSubmitProps) => void;
 }
 
 const ResetPasswordView: React.FunctionComponent<ResetPasswordViewProps> = ({ t, onSubmit }) => {
-  const renderMetaData = () => (
-    <Helmet
-      title={`${settings.app.name} - ${t('resetPass.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('resetPass.meta')}`
-        }
-      ]}
-    />
-  );
-
   return (
     <PageLayout>
-      {renderMetaData()}
+      <MetaData title={t('resetPass.title')} meta={t('resetPass.meta')} />
       <h1>{t('resetPass.form.title')}</h1>
       <ResetPasswordForm onSubmit={onSubmit} />
     </PageLayout>
diff --git a/modules/user/client-react/users/components/UserAddView.tsx b/modules/user/client-react/users/components/UserAddView.tsx
index 4479304..6190aa7 100644
--- a/modules/user/client-react/users/components/UserAddView.tsx
+++ b/modules/user/client-react/users/components/UserAddView.tsx
@@ -1,13 +1,12 @@
 import React from 'react';
-import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
-import settings from '../../../../../settings';
 import { User } from '../..';
+import MetaData from '../../components/MetaData';
 
 interface FormValues extends User {
   password: string;
@@ -20,21 +19,9 @@ interface UserAddViewProps {
 }
 
 const UserAddView = ({ t, onSubmit }: UserAddViewProps) => {
-  const renderMetaData = () => (
-    <Helmet
-      title={`${settings.app.name} - ${t('userEdit.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('userEdit.meta')}`
-        }
-      ]}
-    />
-  );
-
   return (
     <PageLayout>
-      {renderMetaData()}
+      <MetaData title={t('userEdit.title')} meta={t('userEdit.meta')} />
       <Link id="back-button" to="/users">
         Back
       </Link>
diff --git a/modules/user/client-react/users/components/UserEditView.tsx b/modules/user/client-react/users/components/UserEditView.tsx
index b5ac293..f5c1ed6 100644
--- a/modules/user/client-react/users/components/UserEditView.tsx
+++ b/modules/user/client-react/users/components/UserEditView.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
-import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
-import settings from '../../../../../settings';
+import MetaData from '../../components/MetaData';
 import { User } from '../..';
 
 interface FormValues extends User {
@@ -25,21 +24,9 @@ interface UserEditViewProps {
 const UserEditView: React.FunctionComponent<UserEditViewProps> = ({ loading, user, t, currentUser, onSubmit }) => {
   const isNotSelf = !user || (user && user.id !== currentUser.id);
 
-  const renderMetaData = () => (
-    <Helmet
-      title={`${settings.app.name} - ${t('userEdit.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('userEdit.meta')}`
-        }
-      ]}
-    />
-  );
-
   return (
     <PageLayout>
-      {renderMetaData()}
+      <MetaData title={t('userEdit.title')} meta={t('userEdit.meta')} />
       {loading && !user ? (
         <div className="text-center">{t('userEdit.loadMsg')}</div>
       ) : (
diff --git a/modules/user/client-react/users/containers/Users.tsx b/modules/user/client-react/users/containers/Users.tsx
index 36cc559..f2e3e9a 100644
--- a/modules/user/client-react/users/containers/Users.tsx
+++ b/modules/user/client-react/users/containers/Users.tsx
@@ -1,36 +1,24 @@
-import * as React from 'react';
-import Helmet from 'react-helmet';
+import React from 'react';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
 
-import { translate, TranslateFunction } from '@restapp/i18n-client-react';
+import { translate } from '@restapp/i18n-client-react';
 import { Button, PageLayout } from '@restapp/look-client-react';
 
-import settings from '../../../../../settings';
 import UsersFilterView, { UsersFilterViewProps } from '../components/UsersFilterView';
 import UsersListView, { UsersViewProps } from '../components/UsersListView';
 import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
+import MetaData from '../../components/MetaData';
 
 interface UsersProps extends UsersViewProps, UsersFilterViewProps {}
 
 class Users extends React.Component<UsersProps> {
-  public renderMetaData = (t: TranslateFunction) => (
-    <Helmet
-      title={`${settings.app.name} - ${t('users.title')}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${t('users.meta')}`
-        }
-      ]}
-    />
-  );
   public render() {
     const { t } = this.props;
 
     return (
       <PageLayout>
-        {this.renderMetaData(t)}
+        <MetaData title={t('userEdit.title')} meta={t('userEdit.meta')} />
         <h2>{t('users.list.title')}</h2>
         <Link to="/users/new">
           <Button color="primary">{t('users.btn.add')}</Button>

From b41a7555b84c698d73272f40c26995947e4ac533 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 31 May 2019 15:40:55 +0300
Subject: [PATCH 090/104] Move common types in types directory

---
 modules/user/client-react/index.native.tsx    | 60 +----------------
 modules/user/client-react/index.tsx           | 55 ---------------
 .../components/ProfileEditForm.native.tsx     |  2 +-
 .../components/ProfileEditView.native.tsx     |  2 +-
 .../profile/components/ProfileView.native.tsx |  2 +-
 .../profile/components/ProfileView.tsx        |  2 +-
 .../profile/containers/Profile.native.tsx     |  2 +-
 .../profile/containers/Profile.tsx            |  2 +-
 .../profile/containers/ProfileEdit.native.tsx |  2 +-
 .../components/ForgotPasswordForm.native.tsx  |  2 +-
 .../signUp/components/ForgotPasswordForm.tsx  |  2 +-
 .../signUp/components/ForgotPasswordView.tsx  |  2 +-
 .../signUp/components/LoginForm.native.tsx    |  2 +-
 .../signUp/components/LoginForm.tsx           |  2 +-
 .../signUp/components/RegisterForm.native.tsx |  2 +-
 .../signUp/components/RegisterForm.tsx        |  2 +-
 .../components/ResetPasswordForm.native.tsx   |  2 +-
 .../signUp/components/ResetPasswordForm.tsx   |  2 +-
 .../signUp/components/ResetPasswordView.tsx   |  2 +-
 .../containers/ForgotPassword.native.tsx      |  2 +-
 .../signUp/containers/ForgotPassword.tsx      |  2 +-
 .../signUp/containers/Login.native.tsx        |  2 +-
 .../client-react/signUp/containers/Login.tsx  |  2 +-
 .../signUp/containers/Logout.native.tsx       |  2 +-
 .../signUp/containers/Register.native.tsx     |  2 +-
 .../signUp/containers/Register.tsx            |  2 +-
 .../containers/ResetPassword.native.tsx       |  2 +-
 .../signUp/containers/ResetPassword.tsx       |  3 +-
 modules/user/client-react/types/typings.d.ts  | 67 +++++++++++++++++++
 .../users/components/UserAddView.native.tsx   |  2 +-
 .../users/components/UserAddView.tsx          |  2 +-
 .../users/components/UserEditView.native.tsx  |  2 +-
 .../users/components/UserEditView.tsx         |  2 +-
 .../users/components/UserForm.native.tsx      |  2 +-
 .../users/components/UserForm.tsx             |  2 +-
 .../users/components/UsersListView.native.tsx |  2 +-
 .../users/components/UsersListView.tsx        |  2 +-
 .../client-react/users/containers/UserAdd.tsx |  5 +-
 .../users/containers/UserEdit.native.tsx      |  2 +-
 .../users/containers/UserEdit.tsx             |  2 +-
 .../users/containers/UserOperations.tsx       |  2 +-
 .../users/containers/Users.native.tsx         |  2 +-
 42 files changed, 109 insertions(+), 155 deletions(-)
 create mode 100644 modules/user/client-react/types/typings.d.ts

diff --git a/modules/user/client-react/index.native.tsx b/modules/user/client-react/index.native.tsx
index 5824d70..e8c4f4c 100644
--- a/modules/user/client-react/index.native.tsx
+++ b/modules/user/client-react/index.native.tsx
@@ -1,8 +1,5 @@
 import React from 'react';
-import { NavigationContainer, NavigationScreenProp, NavigationRoute, NavigationParams } from 'react-navigation';
-import { FormikErrors } from 'formik';
-
-import { TranslateFunction } from '@restapp/i18n-client-react';
+import { NavigationContainer } from 'react-navigation';
 import ClientModule from '@restapp/module-client-react-native';
 
 import signUp from './signUp/index.native';
@@ -12,61 +9,6 @@ import resources from './locales';
 import DataRootComponent from './containers/DataRootComponent.native';
 import UserScreenNavigator from './containers/UserScreenNavigator.native';
 
-export enum UserRole {
-  admin = 'admin',
-  user = 'user'
-}
-
-interface Auth {
-  lnDisplayName: string;
-  lnId: string;
-  googleDisplayName: string;
-  googleId: string;
-  ghDisplayName: string;
-  ghId: string;
-  fbId: string;
-  fbDisplayName: string;
-}
-
-interface UserProfile {
-  fullName?: string;
-  firstName?: string;
-  lastName?: string;
-}
-
-export interface User extends UserProfile, Auth {
-  id?: number | string;
-  username: string;
-  role: UserRole;
-  isActive: boolean;
-  email: string;
-}
-export interface NavigationOptionsProps {
-  navigation?: NavigationScreenProp<NavigationRoute<NavigationParams>, NavigationParams>;
-}
-
-export interface CommonProps extends NavigationOptionsProps {
-  t?: TranslateFunction;
-}
-
-interface HandleSubmitProps<P> {
-  setErrors: (errors: FormikErrors<P>) => void;
-  props: P;
-}
-
-interface Errors {
-  message?: string;
-}
-
-export interface FormProps<V> {
-  handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;
-  onSubmit: (values: V) => Promise<void> | void | any;
-  submitting?: boolean;
-  errors: Errors;
-  values: V;
-  t?: TranslateFunction;
-}
-
 export const ref: { navigator: NavigationContainer } = {
   navigator: null
 };
diff --git a/modules/user/client-react/index.tsx b/modules/user/client-react/index.tsx
index 1a6db5a..cb9f408 100644
--- a/modules/user/client-react/index.tsx
+++ b/modules/user/client-react/index.tsx
@@ -1,9 +1,6 @@
 import React from 'react';
-import * as H from 'history';
 import { CookiesProvider } from 'react-cookie';
-import { FormikErrors } from 'formik';
 
-import { TranslateFunction } from '@restapp/i18n-client-react';
 import ClientModule from '@restapp/module-client-react';
 
 import signUp from './signUp';
@@ -12,58 +9,6 @@ import users from './users';
 import resources from './locales';
 import DataRootComponent from './containers/DataRootComponent';
 
-export enum UserRole {
-  admin = 'admin',
-  user = 'user'
-}
-
-interface Auth {
-  lnDisplayName: string;
-  lnId: string;
-  googleDisplayName: string;
-  googleId: string;
-  ghDisplayName: string;
-  ghId: string;
-  fbId: string;
-  fbDisplayName: string;
-}
-
-interface UserProfile {
-  fullName?: string;
-  firstName?: string;
-  lastName?: string;
-}
-
-export interface User extends UserProfile, Auth {
-  id?: number | string;
-  username: string;
-  role: UserRole;
-  isActive: boolean;
-  email: string;
-}
-
-export interface CommonProps {
-  t?: TranslateFunction;
-  history?: H.History;
-}
-
-interface HandleSubmitProps<P> {
-  setErrors: (errors: FormikErrors<P>) => void;
-  props: P;
-}
-
-interface Errors {
-  message?: string;
-}
-export interface FormProps<V> {
-  handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;
-  onSubmit: (values: V) => Promise<any>;
-  submitting?: boolean;
-  errors: Errors;
-  values: V;
-  t?: TranslateFunction;
-}
-
 export default new ClientModule(signUp, profile, users, {
   localization: [{ ns: 'user', resources }],
   dataRootComponent: [DataRootComponent],
diff --git a/modules/user/client-react/profile/components/ProfileEditForm.native.tsx b/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
index 361ba11..a1178b7 100644
--- a/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
+++ b/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
@@ -9,7 +9,7 @@ import { RenderField, Button, RenderSelect, RenderSwitch, FormView, primary } fr
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
 
-import { FormProps, User, UserRole } from '../../index.native';
+import { FormProps, User, UserRole } from '../../types/typings';
 import settings from '../../../../../settings';
 
 interface FormikFormProps extends FormProps<FormValues> {
diff --git a/modules/user/client-react/profile/components/ProfileEditView.native.tsx b/modules/user/client-react/profile/components/ProfileEditView.native.tsx
index b3bffda..04956ca 100644
--- a/modules/user/client-react/profile/components/ProfileEditView.native.tsx
+++ b/modules/user/client-react/profile/components/ProfileEditView.native.tsx
@@ -4,7 +4,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Loading } from '@restapp/look-client-react-native';
 
 import UserForm from './ProfileEditForm.native';
-import { User } from '../../index.native';
+import { User } from '../../types/typings';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/profile/components/ProfileView.native.tsx b/modules/user/client-react/profile/components/ProfileView.native.tsx
index c2d9fad..749277b 100644
--- a/modules/user/client-react/profile/components/ProfileView.native.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.native.tsx
@@ -5,7 +5,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Card, CardItem, CardText, CardHeader, CardLabel, Loading } from '@restapp/look-client-react-native';
 import { linkText } from '@restapp/look-client-react-native/styles';
 
-import { NavigationOptionsProps, User } from '../../index.native';
+import { NavigationOptionsProps, User } from '../../types/typings';
 
 interface ProfileViewProps extends NavigationOptionsProps {
   currentUserLoading: boolean;
diff --git a/modules/user/client-react/profile/components/ProfileView.tsx b/modules/user/client-react/profile/components/ProfileView.tsx
index 8323adf..2b5958d 100644
--- a/modules/user/client-react/profile/components/ProfileView.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.tsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { LayoutCenter, Card, CardGroup, CardTitle, CardText, PageLayout } from '@restapp/look-client-react';
 
-import { User } from '../..';
+import { User } from '../../types/typings';
 import MetaData from '../../components/MetaData';
 
 interface ProfileViewProps {
diff --git a/modules/user/client-react/profile/containers/Profile.native.tsx b/modules/user/client-react/profile/containers/Profile.native.tsx
index 4b2183d..c410d42 100644
--- a/modules/user/client-react/profile/containers/Profile.native.tsx
+++ b/modules/user/client-react/profile/containers/Profile.native.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView.native';
-import { CommonProps, User } from '../../index.native';
+import { CommonProps, User } from '../../types/typings';
 
 interface ProfileProps extends CommonProps {
   currentUser?: User;
diff --git a/modules/user/client-react/profile/containers/Profile.tsx b/modules/user/client-react/profile/containers/Profile.tsx
index e731c82..f233123 100644
--- a/modules/user/client-react/profile/containers/Profile.tsx
+++ b/modules/user/client-react/profile/containers/Profile.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView';
-import { User, CommonProps } from '../..';
+import { User, CommonProps } from '../../types/typings';
 
 interface ProfileProps extends CommonProps {
   currentUser?: User;
diff --git a/modules/user/client-react/profile/containers/ProfileEdit.native.tsx b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
index a815a98..a863286 100644
--- a/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
+++ b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import ProfileEditView from '../components/ProfileEditView.native';
 import UserFormatter from '../../helpers/UserFormatter';
-import { User, CommonProps } from '../../index.native';
+import { User, CommonProps } from '../../types/typings';
 import { USER, EDIT_USER } from '../actions';
 
 interface ProfileEditProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx b/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
index 15ca6cb..9de152d 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
@@ -10,7 +10,7 @@ import { placeholderColor, submit } from '@restapp/look-client-react-native/styl
 import { required, email, validate } from '@restapp/validation-common-react';
 import { translate } from '@restapp/i18n-client-react';
 
-import { CommonProps, FormProps } from '../../index.native';
+import { CommonProps, FormProps } from '../../types/typings';
 import { ForgotPasswordSubmitProps } from '../index.native';
 
 interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx b/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
index c370e34..7fe819f 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
@@ -6,7 +6,7 @@ import { translate } from '@restapp/i18n-client-react';
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 import { required, email, validate } from '@restapp/validation-common-react';
 
-import { CommonProps, FormProps } from '../..';
+import { CommonProps, FormProps } from '../../types/typings';
 import { ForgotPasswordSubmitProps } from '..';
 
 interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
index 7d6f7c3..c3cdf69 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { LayoutCenter, PageLayout } from '@restapp/look-client-react';
 
 import ForgotPasswordForm from './ForgotPasswordForm';
-import { CommonProps } from '../..';
+import { CommonProps } from '../../types/typings';
 import { ForgotPasswordSubmitProps } from '..';
 import MetaData from '../../components/MetaData';
 
diff --git a/modules/user/client-react/signUp/components/LoginForm.native.tsx b/modules/user/client-react/signUp/components/LoginForm.native.tsx
index 1764adc..546b566 100644
--- a/modules/user/client-react/signUp/components/LoginForm.native.tsx
+++ b/modules/user/client-react/signUp/components/LoginForm.native.tsx
@@ -10,7 +10,7 @@ import { placeholderColor, submit } from '@restapp/look-client-react-native/styl
 import { required, minLength, validate } from '@restapp/validation-common-react';
 import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@restapp/authentication-client-react';
 
-import { FormProps, NavigationOptionsProps } from '../../index.native';
+import { FormProps, NavigationOptionsProps } from '../../types/typings';
 import { LoginSubmitProps } from '../index.native';
 import settings from '../../../../../settings';
 
diff --git a/modules/user/client-react/signUp/components/LoginForm.tsx b/modules/user/client-react/signUp/components/LoginForm.tsx
index 1fb3a0d..b4b060b 100644
--- a/modules/user/client-react/signUp/components/LoginForm.tsx
+++ b/modules/user/client-react/signUp/components/LoginForm.tsx
@@ -10,7 +10,7 @@ import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@res
 
 import settings from '../../../../../settings';
 import { LoginSubmitProps } from '..';
-import { FormProps } from '../..';
+import { FormProps } from '../../types/typings';
 
 interface SocialButtons {
   buttonsLength: number;
diff --git a/modules/user/client-react/signUp/components/RegisterForm.native.tsx b/modules/user/client-react/signUp/components/RegisterForm.native.tsx
index a007473..66d2a65 100644
--- a/modules/user/client-react/signUp/components/RegisterForm.native.tsx
+++ b/modules/user/client-react/signUp/components/RegisterForm.native.tsx
@@ -11,7 +11,7 @@ import { match, email, minLength, required, validate } from '@restapp/validation
 
 import settings from '../../../../../settings';
 
-import { FormProps } from '../../index.native';
+import { FormProps } from '../../types/typings';
 import { RegisterSubmitProps } from '../index.native';
 
 interface RegisterProps extends FormProps<RegisterSubmitProps> {
diff --git a/modules/user/client-react/signUp/components/RegisterForm.tsx b/modules/user/client-react/signUp/components/RegisterForm.tsx
index cfd1932..6992e99 100644
--- a/modules/user/client-react/signUp/components/RegisterForm.tsx
+++ b/modules/user/client-react/signUp/components/RegisterForm.tsx
@@ -6,7 +6,7 @@ import { translate } from '@restapp/i18n-client-react';
 import { match, email, minLength, required, validate } from '@restapp/validation-common-react';
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 
-import { FormProps } from '../..';
+import { FormProps } from '../../types/typings';
 import { RegisterSubmitProps } from '..';
 import settings from '../../../../../settings';
 
diff --git a/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx b/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
index 2d5d070..e335a28 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
@@ -10,7 +10,7 @@ import { placeholderColor, submit } from '@restapp/look-client-react-native/styl
 import { required, minLength, validate, match } from '@restapp/validation-common-react';
 
 import settings from '../../../../../settings';
-import { CommonProps, FormProps } from '../../index.native';
+import { CommonProps, FormProps } from '../../types/typings';
 import { ResetPasswordSubmitProps } from '../index.native';
 
 interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
diff --git a/modules/user/client-react/signUp/components/ResetPasswordForm.tsx b/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
index ceee787..b8cc5d4 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
@@ -7,7 +7,7 @@ import { required, minLength, validate, match } from '@restapp/validation-common
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 
 import settings from '../../../../../settings';
-import { CommonProps, FormProps } from '../..';
+import { CommonProps, FormProps } from '../../types/typings';
 import { ResetPasswordSubmitProps } from '..';
 
 interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
diff --git a/modules/user/client-react/signUp/components/ResetPasswordView.tsx b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
index c608fac..bfff280 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import ResetPasswordForm from './ResetPasswordForm';
-import { CommonProps } from '../..';
+import { CommonProps } from '../../types/typings';
 import { ResetPasswordSubmitProps } from '..';
 import MetaData from '../../components/MetaData';
 
diff --git a/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
index 87f036d..178c293 100644
--- a/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
@@ -5,7 +5,7 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import ForgotPasswordView from '../components/ForgotPasswordView.native';
-import { CommonProps, User } from '../../index.native';
+import { CommonProps, User } from '../../types/typings';
 import { ForgotPasswordSubmitProps } from '../index.native';
 import { FORGOT_PASSWORD } from '../actions';
 
diff --git a/modules/user/client-react/signUp/containers/ForgotPassword.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
index a1115a3..2aec34c 100644
--- a/modules/user/client-react/signUp/containers/ForgotPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
@@ -5,7 +5,7 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import ForgotPasswordView from '../components/ForgotPasswordView';
-import { CommonProps } from '../..';
+import { CommonProps } from '../../types/typings';
 import { ForgotPasswordSubmitProps } from '..';
 import { FORGOT_PASSWORD } from '../actions';
 
diff --git a/modules/user/client-react/signUp/containers/Login.native.tsx b/modules/user/client-react/signUp/containers/Login.native.tsx
index c60d7a9..502661e 100644
--- a/modules/user/client-react/signUp/containers/Login.native.tsx
+++ b/modules/user/client-react/signUp/containers/Login.native.tsx
@@ -6,7 +6,7 @@ import { translate } from '@restapp/i18n-client-react';
 import authentication from '@restapp/authentication-client-react';
 
 import LoginView from '../components/LoginView.native';
-import { CommonProps } from '../../index.native';
+import { CommonProps } from '../../types/typings';
 import { LoginSubmitProps } from '../index.native';
 import { LOGIN } from '../actions';
 
diff --git a/modules/user/client-react/signUp/containers/Login.tsx b/modules/user/client-react/signUp/containers/Login.tsx
index bc3db2e..9fa0df4 100644
--- a/modules/user/client-react/signUp/containers/Login.tsx
+++ b/modules/user/client-react/signUp/containers/Login.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 import { setItem } from '@restapp/core-common/clientStorage';
 
 import LoginView from '../components/LoginView';
-import { CommonProps } from '../..';
+import { CommonProps } from '../../types/typings';
 import { LoginSubmitProps } from '..';
 import { LOGIN } from '../actions';
 
diff --git a/modules/user/client-react/signUp/containers/Logout.native.tsx b/modules/user/client-react/signUp/containers/Logout.native.tsx
index 54c5b3a..dd0104f 100644
--- a/modules/user/client-react/signUp/containers/Logout.native.tsx
+++ b/modules/user/client-react/signUp/containers/Logout.native.tsx
@@ -5,7 +5,7 @@ import { HeaderTitle } from '@restapp/look-client-react-native';
 import { translate } from '@restapp/i18n-client-react';
 
 import { withLogout } from '../../containers/Auth';
-import { CommonProps } from '../../index.native';
+import { CommonProps } from '../../types/typings';
 
 interface LogoutViewProps extends CommonProps {
   logout: () => void;
diff --git a/modules/user/client-react/signUp/containers/Register.native.tsx b/modules/user/client-react/signUp/containers/Register.native.tsx
index 24d3890..e5e5fef 100644
--- a/modules/user/client-react/signUp/containers/Register.native.tsx
+++ b/modules/user/client-react/signUp/containers/Register.native.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 import RegisterView from '../components/RegisterView.native';
 import settings from '../../../../../settings';
 import { REGISTER } from '../actions';
-import { CommonProps } from '../../index.native';
+import { CommonProps } from '../../types/typings';
 import { RegisterSubmitProps } from '../index.native';
 
 interface RegisterProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/containers/Register.tsx b/modules/user/client-react/signUp/containers/Register.tsx
index fd8dd88..27c9d8e 100644
--- a/modules/user/client-react/signUp/containers/Register.tsx
+++ b/modules/user/client-react/signUp/containers/Register.tsx
@@ -5,7 +5,7 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import RegisterView from '../components/RegisterView';
-import { CommonProps } from '../..';
+import { CommonProps } from '../../types/typings';
 import { RegisterSubmitProps } from '..';
 import { REGISTER } from '../actions';
 import settings from '../../../../../settings';
diff --git a/modules/user/client-react/signUp/containers/ResetPassword.native.tsx b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
index cc1fb38..47a4f5c 100644
--- a/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
@@ -6,7 +6,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import ResetPasswordView from '../components/ResetPasswordView.native';
 import { RESET_PASSWORD } from '../actions';
-import { CommonProps } from '../../index.native';
+import { CommonProps } from '../../types/typings';
 import { ResetPasswordSubmitProps } from '../index.native';
 
 interface Token {
diff --git a/modules/user/client-react/signUp/containers/ResetPassword.tsx b/modules/user/client-react/signUp/containers/ResetPassword.tsx
index fb8b5e8..5092535 100644
--- a/modules/user/client-react/signUp/containers/ResetPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.tsx
@@ -5,9 +5,10 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import ResetPasswordView from '../components/ResetPasswordView';
-import { CommonProps } from '../..';
+
 import { ResetPasswordSubmitProps } from '..';
 import { RESET_PASSWORD } from '../actions';
+import { CommonProps } from '../../types/typings';
 
 interface Token {
   token: string;
diff --git a/modules/user/client-react/types/typings.d.ts b/modules/user/client-react/types/typings.d.ts
new file mode 100644
index 0000000..6ae6af2
--- /dev/null
+++ b/modules/user/client-react/types/typings.d.ts
@@ -0,0 +1,67 @@
+import * as H from 'history';
+import { FormikErrors } from 'formik';
+import { NavigationScreenProp, NavigationRoute, NavigationParams } from 'react-navigation';
+
+import { TranslateFunction } from '@restapp/i18n-client-react';
+
+export enum UserRole {
+  admin = 'admin',
+  user = 'user'
+}
+
+interface Auth {
+  lnDisplayName: string;
+  lnId: string;
+  googleDisplayName: string;
+  googleId: string;
+  ghDisplayName: string;
+  ghId: string;
+  fbId: string;
+  fbDisplayName: string;
+}
+
+interface UserProfile {
+  fullName?: string;
+  firstName?: string;
+  lastName?: string;
+}
+
+export interface User extends UserProfile, Auth {
+  id?: number | string;
+  username: string;
+  role: UserRole;
+  isActive: boolean;
+  email: string;
+}
+
+export interface CommonProps extends HistoryProp, NavigationOptionsProps {
+  t?: TranslateFunction;
+  
+}
+
+export interface HistoryProp {
+  history?: H.History;
+}
+
+export interface NavigationOptionsProps {
+  navigation?: NavigationScreenProp<NavigationRoute<NavigationParams>, NavigationParams>;
+}
+
+export interface FormProps<V> {
+  handleSubmit: (values: V, props: HandleSubmitProps<V>) => void;
+  onSubmit: (values: V) => Promise<any>;
+  submitting?: boolean;
+  errors: Errors;
+  values: V;
+  t?: TranslateFunction;
+}
+
+interface HandleSubmitProps<P> {
+  setErrors: (errors: FormikErrors<P>) => void;
+  props: P;
+}
+
+interface Errors {
+  message?: string;
+}
+
diff --git a/modules/user/client-react/users/components/UserAddView.native.tsx b/modules/user/client-react/users/components/UserAddView.native.tsx
index e3874be..d3dcc0f 100644
--- a/modules/user/client-react/users/components/UserAddView.native.tsx
+++ b/modules/user/client-react/users/components/UserAddView.native.tsx
@@ -4,7 +4,7 @@ import { StyleSheet, View } from 'react-native';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 
 import UserForm from './UserForm';
-import { User } from '../../index.native';
+import { User } from '../../types/typings';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/users/components/UserAddView.tsx b/modules/user/client-react/users/components/UserAddView.tsx
index 6190aa7..740f639 100644
--- a/modules/user/client-react/users/components/UserAddView.tsx
+++ b/modules/user/client-react/users/components/UserAddView.tsx
@@ -5,7 +5,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
-import { User } from '../..';
+import { User } from '../../types/typings';
 import MetaData from '../../components/MetaData';
 
 interface FormValues extends User {
diff --git a/modules/user/client-react/users/components/UserEditView.native.tsx b/modules/user/client-react/users/components/UserEditView.native.tsx
index 1228a37..f00ce61 100644
--- a/modules/user/client-react/users/components/UserEditView.native.tsx
+++ b/modules/user/client-react/users/components/UserEditView.native.tsx
@@ -4,7 +4,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Loading } from '@restapp/look-client-react-native';
 
 import UserForm from './UserForm';
-import { User } from '../../index.native';
+import { User } from '../../types/typings';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/users/components/UserEditView.tsx b/modules/user/client-react/users/components/UserEditView.tsx
index f5c1ed6..397f990 100644
--- a/modules/user/client-react/users/components/UserEditView.tsx
+++ b/modules/user/client-react/users/components/UserEditView.tsx
@@ -6,7 +6,7 @@ import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
 import MetaData from '../../components/MetaData';
-import { User } from '../..';
+import { User } from '../../types/typings';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/users/components/UserForm.native.tsx b/modules/user/client-react/users/components/UserForm.native.tsx
index 361ba11..a1178b7 100644
--- a/modules/user/client-react/users/components/UserForm.native.tsx
+++ b/modules/user/client-react/users/components/UserForm.native.tsx
@@ -9,7 +9,7 @@ import { RenderField, Button, RenderSelect, RenderSwitch, FormView, primary } fr
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
 
-import { FormProps, User, UserRole } from '../../index.native';
+import { FormProps, User, UserRole } from '../../types/typings';
 import settings from '../../../../../settings';
 
 interface FormikFormProps extends FormProps<FormValues> {
diff --git a/modules/user/client-react/users/components/UserForm.tsx b/modules/user/client-react/users/components/UserForm.tsx
index 6b53785..202215a 100644
--- a/modules/user/client-react/users/components/UserForm.tsx
+++ b/modules/user/client-react/users/components/UserForm.tsx
@@ -8,7 +8,7 @@ import { email as emailRule, minLength, required, match, validate } from '@resta
 import { Form, RenderField, RenderSelect, RenderCheckBox, Option, Button, Alert } from '@restapp/look-client-react';
 
 import settings from '../../../../../settings';
-import { CommonProps, FormProps, User, UserRole } from '../..';
+import { CommonProps, FormProps, User, UserRole } from '../../types/typings';
 
 interface FormikFormProps extends FormProps<FormValues> {
   initialValues: FormValues;
diff --git a/modules/user/client-react/users/components/UsersListView.native.tsx b/modules/user/client-react/users/components/UsersListView.native.tsx
index 97aa8ac..a9b71b0 100644
--- a/modules/user/client-react/users/components/UsersListView.native.tsx
+++ b/modules/user/client-react/users/components/UsersListView.native.tsx
@@ -15,7 +15,7 @@ import {
   primary
 } from '@restapp/look-client-react-native';
 
-import { NavigationOptionsProps, User } from '../../index.native';
+import { NavigationOptionsProps, User } from '../../types/typings';
 
 interface UsersListViewProps extends NavigationOptionsProps {
   users: User[];
diff --git a/modules/user/client-react/users/components/UsersListView.tsx b/modules/user/client-react/users/components/UsersListView.tsx
index 11d447d..6354e15 100644
--- a/modules/user/client-react/users/components/UsersListView.tsx
+++ b/modules/user/client-react/users/components/UsersListView.tsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import { translate } from '@restapp/i18n-client-react';
 import { Table, Button } from '@restapp/look-client-react';
 
-import { User, CommonProps } from '../..';
+import { User, CommonProps } from '../../types/typings';
 import { OrderBy } from '..';
 
 export interface UsersViewProps extends CommonProps {
diff --git a/modules/user/client-react/users/containers/UserAdd.tsx b/modules/user/client-react/users/containers/UserAdd.tsx
index cb786e5..33cd3ac 100644
--- a/modules/user/client-react/users/containers/UserAdd.tsx
+++ b/modules/user/client-react/users/containers/UserAdd.tsx
@@ -7,11 +7,10 @@ import { FormError } from '@restapp/forms-client-react';
 
 import UserAddView from '../components/UserAddView';
 import UserFormatter from '../../helpers/UserFormatter';
-import { CommonProps as RNCommonProps } from '../../index.native';
-import { User, CommonProps } from '../..';
+import { User, CommonProps } from '../../types/typings';
 import { ADD_USER } from '../actions';
 
-interface UserAddProps extends CommonProps, RNCommonProps {
+interface UserAddProps extends CommonProps {
   addUser?: (values: User) => any;
 }
 
diff --git a/modules/user/client-react/users/containers/UserEdit.native.tsx b/modules/user/client-react/users/containers/UserEdit.native.tsx
index b683ee2..9b5b302 100644
--- a/modules/user/client-react/users/containers/UserEdit.native.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.native.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import UserEditView from '../components/UserEditView.native';
 import UserFormatter from '../../helpers/UserFormatter';
-import { CommonProps, User } from '../../index.native';
+import { CommonProps, User } from '../../types/typings';
 import { USER, EDIT_USER } from '../actions';
 
 interface UserEditProps extends CommonProps {
diff --git a/modules/user/client-react/users/containers/UserEdit.tsx b/modules/user/client-react/users/containers/UserEdit.tsx
index f980bd4..9ae018b 100644
--- a/modules/user/client-react/users/containers/UserEdit.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import UserEditView from '../components/UserEditView';
 import UserFormatter from '../../helpers/UserFormatter';
-import { User, CommonProps } from '../..';
+import { User, CommonProps } from '../../types/typings';
 import { USER, EDIT_USER } from '../actions';
 
 interface UserEditProps extends CommonProps {
diff --git a/modules/user/client-react/users/containers/UserOperations.tsx b/modules/user/client-react/users/containers/UserOperations.tsx
index 4caae08..5bc6ea5 100644
--- a/modules/user/client-react/users/containers/UserOperations.tsx
+++ b/modules/user/client-react/users/containers/UserOperations.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { USERS, DELETE_USER } from '../actions';
-import { UserRole } from '../..';
+import { UserRole } from '../../types/typings';
 import { OrderBy } from '..';
 
 const withUsers = (Component: React.ComponentType<any>) => {
diff --git a/modules/user/client-react/users/containers/Users.native.tsx b/modules/user/client-react/users/containers/Users.native.tsx
index b1648bd..d77ec45 100644
--- a/modules/user/client-react/users/containers/Users.native.tsx
+++ b/modules/user/client-react/users/containers/Users.native.tsx
@@ -6,7 +6,7 @@ import UsersList from '../components/UsersListView.native';
 import UsersFilter from '../components/UsersFilterView.native';
 import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
 
-import { NavigationOptionsProps } from '../../index.native';
+import { NavigationOptionsProps } from '../../types/typings';
 
 interface UsersProps extends NavigationOptionsProps {
   loading: boolean;

From a20423efb24edf8e2e2736e771d2e6863c880f8f Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 31 May 2019 16:53:58 +0300
Subject: [PATCH 091/104] Fix prev commit

---
 .../user/client-react/components/Loading.tsx  |  2 +-
 modules/user/client-react/containers/Auth.tsx |  2 +-
 .../user/client-react/containers/AuthBase.tsx |  6 +--
 .../containers/DataRootComponent.tsx          |  2 +-
 .../components/ProfileEditForm.native.tsx     |  2 +-
 .../components/ProfileEditView.native.tsx     |  2 +-
 .../profile/components/ProfileView.native.tsx |  2 +-
 .../profile/components/ProfileView.tsx        |  2 +-
 .../profile/containers/Profile.native.tsx     |  2 +-
 .../profile/containers/Profile.tsx            |  2 +-
 .../profile/containers/ProfileEdit.native.tsx |  2 +-
 .../client-react/profile/index.native.tsx     |  7 +--
 modules/user/client-react/profile/index.tsx   |  6 +--
 .../signUp/actions/forgotPassword.ts          |  2 +-
 .../user/client-react/signUp/actions/login.ts |  2 +-
 .../client-react/signUp/actions/register.ts   |  2 +-
 .../signUp/actions/resetPassword.ts           |  2 +-
 .../components/ForgotPasswordForm.native.tsx  |  4 +-
 .../signUp/components/ForgotPasswordForm.tsx  |  4 +-
 .../components/ForgotPasswordView.native.tsx  |  2 +-
 .../signUp/components/ForgotPasswordView.tsx  |  4 +-
 .../signUp/components/LoginForm.native.tsx    |  4 +-
 .../signUp/components/LoginForm.tsx           |  4 +-
 .../signUp/components/LoginView.native.tsx    |  2 +-
 .../signUp/components/LoginView.tsx           |  2 +-
 .../signUp/components/RegisterForm.native.tsx |  4 +-
 .../signUp/components/RegisterForm.tsx        |  4 +-
 .../signUp/components/RegisterView.native.tsx |  2 +-
 .../signUp/components/RegisterView.tsx        |  2 +-
 .../components/ResetPasswordForm.native.tsx   |  4 +-
 .../signUp/components/ResetPasswordForm.tsx   |  4 +-
 .../components/ResetPasswordView.native.tsx   |  2 +-
 .../signUp/components/ResetPasswordView.tsx   |  4 +-
 .../containers/ForgotPassword.native.tsx      |  4 +-
 .../signUp/containers/ForgotPassword.tsx      |  4 +-
 .../signUp/containers/Login.native.tsx        |  4 +-
 .../client-react/signUp/containers/Login.tsx  |  4 +-
 .../signUp/containers/Logout.native.tsx       |  2 +-
 .../client-react/signUp/containers/Logout.tsx | 23 +++++++++
 .../signUp/containers/NavLoginLink.tsx        | 13 +++++
 .../signUp/containers/Register.native.tsx     |  4 +-
 .../signUp/containers/Register.tsx            |  4 +-
 .../containers/ResetPassword.native.tsx       |  4 +-
 .../signUp/containers/ResetPassword.tsx       |  4 +-
 .../user/client-react/signUp/index.native.tsx | 22 +-------
 modules/user/client-react/signUp/index.tsx    | 50 ++-----------------
 .../signUp/locales/en/translations.json       |  1 +
 .../signUp/locales/ru/translations.json       |  1 +
 .../client-react/signUp/reducers/index.ts     |  2 +-
 .../user/client-react/signUp/types/index.ts   | 19 +++++++
 .../types/{typings.d.ts => index.ts}          |  2 -
 .../client-react/users/actions/addUser.ts     |  2 +-
 .../client-react/users/actions/editUser.ts    |  2 +-
 .../user/client-react/users/actions/users.ts  |  2 +-
 .../users/components/UserAddView.native.tsx   |  2 +-
 .../users/components/UserAddView.tsx          |  2 +-
 .../users/components/UserEditView.native.tsx  |  2 +-
 .../users/components/UserEditView.tsx         |  2 +-
 .../users/components/UserForm.native.tsx      |  2 +-
 .../users/components/UserForm.tsx             |  2 +-
 .../users/components/UsersFilterView.tsx      |  2 +-
 .../users/components/UsersListView.native.tsx |  2 +-
 .../users/components/UsersListView.tsx        |  4 +-
 .../client-react/users/containers/NavLink.tsx | 14 ++++++
 .../client-react/users/containers/UserAdd.tsx |  2 +-
 .../users/containers/UserEdit.native.tsx      |  2 +-
 .../users/containers/UserEdit.tsx             |  2 +-
 .../users/containers/UserOperations.tsx       |  4 +-
 .../users/containers/Users.native.tsx         |  2 +-
 .../user/client-react/users/index.native.tsx  | 13 +----
 modules/user/client-react/users/index.tsx     | 28 +----------
 .../user/client-react/users/reducers/index.ts |  4 +-
 .../user/client-react/users/types/index.ts    | 10 ++++
 73 files changed, 172 insertions(+), 201 deletions(-)
 create mode 100644 modules/user/client-react/signUp/containers/Logout.tsx
 create mode 100644 modules/user/client-react/signUp/containers/NavLoginLink.tsx
 create mode 100644 modules/user/client-react/signUp/types/index.ts
 rename modules/user/client-react/types/{typings.d.ts => index.ts} (99%)
 create mode 100644 modules/user/client-react/users/containers/NavLink.tsx
 create mode 100644 modules/user/client-react/users/types/index.ts

diff --git a/modules/user/client-react/components/Loading.tsx b/modules/user/client-react/components/Loading.tsx
index 810acb1..3d61751 100644
--- a/modules/user/client-react/components/Loading.tsx
+++ b/modules/user/client-react/components/Loading.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { translate } from '@restapp/i18n-client-react';
 import { LayoutCenter } from '@restapp/look-client-react';
 
-import { CommonProps } from '..';
+import { CommonProps } from '../types';
 
 interface LoadingProps extends CommonProps {}
 
diff --git a/modules/user/client-react/containers/Auth.tsx b/modules/user/client-react/containers/Auth.tsx
index c239ead..0ff79b0 100644
--- a/modules/user/client-react/containers/Auth.tsx
+++ b/modules/user/client-react/containers/Auth.tsx
@@ -2,7 +2,7 @@ import React, { ComponentType, FunctionComponent } from 'react';
 import { Route, Redirect, RouteComponentProps } from 'react-router-dom';
 
 import { withUser } from './AuthBase';
-import { UserRole, User } from '..';
+import { UserRole, User } from '../types';
 import { WithUserProps } from './AuthBase';
 
 interface AuthRouteProps extends WithUserProps {
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index c463883..dc7cce3 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
 import { RouteProps } from 'react-router';
-import { History } from 'history';
 import { connect } from 'react-redux';
 
 import authentication from '@restapp/authentication-client-react';
 import { getItem } from '@restapp/core-common/clientStorage';
 
-import { User, UserRole } from '..';
+import { User, UserRole, CommonProps } from '../types';
 import CLEAR_USER from '../signUp/actions/clearUser';
 import { CURRENT_USER } from '../actions';
 import setting from '../../../../settings';
@@ -27,9 +26,8 @@ interface IfLoggedInComponent {
   children?: Element | any;
 }
 
-export interface WithLogoutProps extends WithUserProps {
+export interface WithLogoutProps extends WithUserProps, CommonProps {
   logout?: () => void;
-  history?: History;
   clearUser?: () => void;
 }
 
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index 92dc110..e9eb206 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -5,7 +5,7 @@ import { getItem } from '@restapp/core-common/clientStorage';
 
 import Loading from '../components/Loading';
 import { CURRENT_USER } from '../actions';
-import { User } from '..';
+import { User } from '../types';
 import setting from '../../../../settings';
 
 interface DataRootComponent {
diff --git a/modules/user/client-react/profile/components/ProfileEditForm.native.tsx b/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
index a1178b7..781dcdb 100644
--- a/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
+++ b/modules/user/client-react/profile/components/ProfileEditForm.native.tsx
@@ -9,7 +9,7 @@ import { RenderField, Button, RenderSelect, RenderSwitch, FormView, primary } fr
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
 
-import { FormProps, User, UserRole } from '../../types/typings';
+import { FormProps, User, UserRole } from '../../types';
 import settings from '../../../../../settings';
 
 interface FormikFormProps extends FormProps<FormValues> {
diff --git a/modules/user/client-react/profile/components/ProfileEditView.native.tsx b/modules/user/client-react/profile/components/ProfileEditView.native.tsx
index 04956ca..e823c9f 100644
--- a/modules/user/client-react/profile/components/ProfileEditView.native.tsx
+++ b/modules/user/client-react/profile/components/ProfileEditView.native.tsx
@@ -4,7 +4,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Loading } from '@restapp/look-client-react-native';
 
 import UserForm from './ProfileEditForm.native';
-import { User } from '../../types/typings';
+import { User } from '../../types';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/profile/components/ProfileView.native.tsx b/modules/user/client-react/profile/components/ProfileView.native.tsx
index 749277b..eb4bf01 100644
--- a/modules/user/client-react/profile/components/ProfileView.native.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.native.tsx
@@ -5,7 +5,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Card, CardItem, CardText, CardHeader, CardLabel, Loading } from '@restapp/look-client-react-native';
 import { linkText } from '@restapp/look-client-react-native/styles';
 
-import { NavigationOptionsProps, User } from '../../types/typings';
+import { NavigationOptionsProps, User } from '../../types';
 
 interface ProfileViewProps extends NavigationOptionsProps {
   currentUserLoading: boolean;
diff --git a/modules/user/client-react/profile/components/ProfileView.tsx b/modules/user/client-react/profile/components/ProfileView.tsx
index 2b5958d..2c74fd3 100644
--- a/modules/user/client-react/profile/components/ProfileView.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.tsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { LayoutCenter, Card, CardGroup, CardTitle, CardText, PageLayout } from '@restapp/look-client-react';
 
-import { User } from '../../types/typings';
+import { User } from '../../types';
 import MetaData from '../../components/MetaData';
 
 interface ProfileViewProps {
diff --git a/modules/user/client-react/profile/containers/Profile.native.tsx b/modules/user/client-react/profile/containers/Profile.native.tsx
index c410d42..37857f9 100644
--- a/modules/user/client-react/profile/containers/Profile.native.tsx
+++ b/modules/user/client-react/profile/containers/Profile.native.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView.native';
-import { CommonProps, User } from '../../types/typings';
+import { CommonProps, User } from '../../types';
 
 interface ProfileProps extends CommonProps {
   currentUser?: User;
diff --git a/modules/user/client-react/profile/containers/Profile.tsx b/modules/user/client-react/profile/containers/Profile.tsx
index f233123..2a17392 100644
--- a/modules/user/client-react/profile/containers/Profile.tsx
+++ b/modules/user/client-react/profile/containers/Profile.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import ProfileView from '../components/ProfileView';
-import { User, CommonProps } from '../../types/typings';
+import { User, CommonProps } from '../../types';
 
 interface ProfileProps extends CommonProps {
   currentUser?: User;
diff --git a/modules/user/client-react/profile/containers/ProfileEdit.native.tsx b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
index a863286..b64853b 100644
--- a/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
+++ b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import ProfileEditView from '../components/ProfileEditView.native';
 import UserFormatter from '../../helpers/UserFormatter';
-import { User, CommonProps } from '../../types/typings';
+import { User, CommonProps } from '../../types';
 import { USER, EDIT_USER } from '../actions';
 
 interface ProfileEditProps extends CommonProps {
diff --git a/modules/user/client-react/profile/index.native.tsx b/modules/user/client-react/profile/index.native.tsx
index 0e04ead..4003ecb 100644
--- a/modules/user/client-react/profile/index.native.tsx
+++ b/modules/user/client-react/profile/index.native.tsx
@@ -7,15 +7,10 @@ import { HeaderTitle, IconButton } from '@restapp/look-client-react-native';
 import ClientModule from '@restapp/module-client-react-native';
 
 import resources from './locales';
-
+import { UserRole } from '../types';
 import Profile from './containers/Profile.native';
 import ProfileEdit from './containers/ProfileEdit.native';
 
-export enum UserRole {
-  admin = 'admin',
-  user = 'user'
-}
-
 interface Auth {
   lnDisplayName: string;
   lnId: string;
diff --git a/modules/user/client-react/profile/index.tsx b/modules/user/client-react/profile/index.tsx
index a01210f..74410d6 100644
--- a/modules/user/client-react/profile/index.tsx
+++ b/modules/user/client-react/profile/index.tsx
@@ -7,11 +7,7 @@ import ClientModule from '@restapp/module-client-react';
 import resources from './locales';
 import Profile from './containers/Profile';
 import { AuthRoute, IfLoggedIn, withUser } from '../containers/Auth';
-
-export enum UserRole {
-  admin = 'admin',
-  user = 'user'
-}
+import { UserRole } from '../types';
 
 const ProfileName = withUser(({ currentUser }) => (
   <>{currentUser ? currentUser.fullName || currentUser.username : null}</>
diff --git a/modules/user/client-react/signUp/actions/forgotPassword.ts b/modules/user/client-react/signUp/actions/forgotPassword.ts
index 4e3fe1a..2ff0212 100644
--- a/modules/user/client-react/signUp/actions/forgotPassword.ts
+++ b/modules/user/client-react/signUp/actions/forgotPassword.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
-import { ForgotPasswordSubmitProps } from '..';
+import { ForgotPasswordSubmitProps } from '../types';
 
 const FORGOT_PASSWORD: ActionFunction<ActionType, ForgotPasswordSubmitProps> = value => ({
   types: {},
diff --git a/modules/user/client-react/signUp/actions/login.ts b/modules/user/client-react/signUp/actions/login.ts
index 858e5b3..e92b3c2 100644
--- a/modules/user/client-react/signUp/actions/login.ts
+++ b/modules/user/client-react/signUp/actions/login.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
-import { LoginSubmitProps } from '..';
+import { LoginSubmitProps } from '../types';
 
 const LOGIN: ActionFunction<ActionType, LoginSubmitProps> = value => ({
   types: {
diff --git a/modules/user/client-react/signUp/actions/register.ts b/modules/user/client-react/signUp/actions/register.ts
index ec096c5..3d902e4 100644
--- a/modules/user/client-react/signUp/actions/register.ts
+++ b/modules/user/client-react/signUp/actions/register.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
-import { RegisterSubmitProps } from '..';
+import { RegisterSubmitProps } from '../types';
 
 const REGISTER: ActionFunction<ActionType, RegisterSubmitProps> = value => ({
   types: {},
diff --git a/modules/user/client-react/signUp/actions/resetPassword.ts b/modules/user/client-react/signUp/actions/resetPassword.ts
index 4c82901..94420eb 100644
--- a/modules/user/client-react/signUp/actions/resetPassword.ts
+++ b/modules/user/client-react/signUp/actions/resetPassword.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
-import { ResetPasswordSubmitProps } from '..';
+import { ResetPasswordSubmitProps } from '../types';
 
 interface ResetPasswordProps extends ResetPasswordSubmitProps {
   token: string;
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx b/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
index 9de152d..2302f24 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordForm.native.tsx
@@ -10,8 +10,8 @@ import { placeholderColor, submit } from '@restapp/look-client-react-native/styl
 import { required, email, validate } from '@restapp/validation-common-react';
 import { translate } from '@restapp/i18n-client-react';
 
-import { CommonProps, FormProps } from '../../types/typings';
-import { ForgotPasswordSubmitProps } from '../index.native';
+import { CommonProps, FormProps } from '../../types';
+import { ForgotPasswordSubmitProps } from '../types';
 
 interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
   sent: boolean;
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx b/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
index 7fe819f..b5719b7 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordForm.tsx
@@ -6,8 +6,8 @@ import { translate } from '@restapp/i18n-client-react';
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 import { required, email, validate } from '@restapp/validation-common-react';
 
-import { CommonProps, FormProps } from '../../types/typings';
-import { ForgotPasswordSubmitProps } from '..';
+import { CommonProps, FormProps } from '../../types';
+import { ForgotPasswordSubmitProps } from '../types';
 
 interface ForgotPasswordFormProps extends CommonProps, FormProps<ForgotPasswordSubmitProps> {
   sent: boolean;
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordView.native.tsx b/modules/user/client-react/signUp/components/ForgotPasswordView.native.tsx
index de1b59c..7881dcb 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordView.native.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordView.native.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, View } from 'react-native';
 
 import ForgotPasswordForm from './ForgotPasswordForm.native';
-import { ForgotPasswordSubmitProps } from '../index.native';
+import { ForgotPasswordSubmitProps } from '../types';
 
 interface ForgotPasswordViewProps {
   onSubmit: (values: ForgotPasswordSubmitProps) => void;
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
index c3cdf69..c28ede4 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
@@ -3,8 +3,8 @@ import React from 'react';
 import { LayoutCenter, PageLayout } from '@restapp/look-client-react';
 
 import ForgotPasswordForm from './ForgotPasswordForm';
-import { CommonProps } from '../../types/typings';
-import { ForgotPasswordSubmitProps } from '..';
+import { CommonProps } from '../../types';
+import { ForgotPasswordSubmitProps } from '../types';
 import MetaData from '../../components/MetaData';
 
 interface ForgotPasswordViewProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/components/LoginForm.native.tsx b/modules/user/client-react/signUp/components/LoginForm.native.tsx
index 546b566..94dd988 100644
--- a/modules/user/client-react/signUp/components/LoginForm.native.tsx
+++ b/modules/user/client-react/signUp/components/LoginForm.native.tsx
@@ -10,8 +10,8 @@ import { placeholderColor, submit } from '@restapp/look-client-react-native/styl
 import { required, minLength, validate } from '@restapp/validation-common-react';
 import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@restapp/authentication-client-react';
 
-import { FormProps, NavigationOptionsProps } from '../../types/typings';
-import { LoginSubmitProps } from '../index.native';
+import { FormProps, NavigationOptionsProps } from '../../types';
+import { LoginSubmitProps } from '../types';
 import settings from '../../../../../settings';
 
 interface SocialButtons {
diff --git a/modules/user/client-react/signUp/components/LoginForm.tsx b/modules/user/client-react/signUp/components/LoginForm.tsx
index b4b060b..30c732b 100644
--- a/modules/user/client-react/signUp/components/LoginForm.tsx
+++ b/modules/user/client-react/signUp/components/LoginForm.tsx
@@ -9,8 +9,8 @@ import { Form, RenderField, Alert, Button } from '@restapp/look-client-react';
 import { LinkedInButton, GoogleButton, GitHubButton, FacebookButton } from '@restapp/authentication-client-react';
 
 import settings from '../../../../../settings';
-import { LoginSubmitProps } from '..';
-import { FormProps } from '../../types/typings';
+import { LoginSubmitProps } from '../types';
+import { FormProps } from '../../types';
 
 interface SocialButtons {
   buttonsLength: number;
diff --git a/modules/user/client-react/signUp/components/LoginView.native.tsx b/modules/user/client-react/signUp/components/LoginView.native.tsx
index 09bb995..f504e8a 100644
--- a/modules/user/client-react/signUp/components/LoginView.native.tsx
+++ b/modules/user/client-react/signUp/components/LoginView.native.tsx
@@ -10,7 +10,7 @@ import authentication from '@restapp/authentication-client-react';
 import LoginForm from './LoginForm.native';
 import { LoginProps } from '../containers/Login.native';
 
-import { LoginSubmitProps } from '../index.native';
+import { LoginSubmitProps } from '../types';
 
 interface LoginViewProps extends LoginProps {
   onSubmit: (values: LoginSubmitProps) => void;
diff --git a/modules/user/client-react/signUp/components/LoginView.tsx b/modules/user/client-react/signUp/components/LoginView.tsx
index ce00c1d..61bb5df 100644
--- a/modules/user/client-react/signUp/components/LoginView.tsx
+++ b/modules/user/client-react/signUp/components/LoginView.tsx
@@ -4,7 +4,7 @@ import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText, Button
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 
 import LoginForm from './LoginForm';
-import { LoginSubmitProps } from '..';
+import { LoginSubmitProps } from '../types';
 import { LoginProps } from '../containers/Login';
 import MetaData from '../../components/MetaData';
 
diff --git a/modules/user/client-react/signUp/components/RegisterForm.native.tsx b/modules/user/client-react/signUp/components/RegisterForm.native.tsx
index 66d2a65..7860aed 100644
--- a/modules/user/client-react/signUp/components/RegisterForm.native.tsx
+++ b/modules/user/client-react/signUp/components/RegisterForm.native.tsx
@@ -11,8 +11,8 @@ import { match, email, minLength, required, validate } from '@restapp/validation
 
 import settings from '../../../../../settings';
 
-import { FormProps } from '../../types/typings';
-import { RegisterSubmitProps } from '../index.native';
+import { FormProps } from '../../types';
+import { RegisterSubmitProps } from '../types';
 
 interface RegisterProps extends FormProps<RegisterSubmitProps> {
   valid: string;
diff --git a/modules/user/client-react/signUp/components/RegisterForm.tsx b/modules/user/client-react/signUp/components/RegisterForm.tsx
index 6992e99..c5856bc 100644
--- a/modules/user/client-react/signUp/components/RegisterForm.tsx
+++ b/modules/user/client-react/signUp/components/RegisterForm.tsx
@@ -6,8 +6,8 @@ import { translate } from '@restapp/i18n-client-react';
 import { match, email, minLength, required, validate } from '@restapp/validation-common-react';
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 
-import { FormProps } from '../../types/typings';
-import { RegisterSubmitProps } from '..';
+import { FormProps } from '../../types';
+import { RegisterSubmitProps } from '../types';
 import settings from '../../../../../settings';
 
 const registerFormSchema = {
diff --git a/modules/user/client-react/signUp/components/RegisterView.native.tsx b/modules/user/client-react/signUp/components/RegisterView.native.tsx
index 8f6433c..6a333a9 100644
--- a/modules/user/client-react/signUp/components/RegisterView.native.tsx
+++ b/modules/user/client-react/signUp/components/RegisterView.native.tsx
@@ -5,7 +5,7 @@ import { Button, primary } from '@restapp/look-client-react-native';
 import { TranslateFunction, translate } from '@restapp/i18n-client-react';
 
 import RegisterForm from './RegisterForm.native';
-import { RegisterSubmitProps } from '../index.native';
+import { RegisterSubmitProps } from '../types';
 
 interface RegisterViewProps {
   t: TranslateFunction;
diff --git a/modules/user/client-react/signUp/components/RegisterView.tsx b/modules/user/client-react/signUp/components/RegisterView.tsx
index edd5b70..6b64be0 100644
--- a/modules/user/client-react/signUp/components/RegisterView.tsx
+++ b/modules/user/client-react/signUp/components/RegisterView.tsx
@@ -5,7 +5,7 @@ import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText } from '
 
 import RegisterForm from './RegisterForm';
 import settings from '../../../../../settings';
-import { RegisterSubmitProps } from '..';
+import { RegisterSubmitProps } from '../types';
 import MetaData from '../../components/MetaData';
 
 interface RegisterViewProps {
diff --git a/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx b/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
index e335a28..2f4243e 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordForm.native.tsx
@@ -10,8 +10,8 @@ import { placeholderColor, submit } from '@restapp/look-client-react-native/styl
 import { required, minLength, validate, match } from '@restapp/validation-common-react';
 
 import settings from '../../../../../settings';
-import { CommonProps, FormProps } from '../../types/typings';
-import { ResetPasswordSubmitProps } from '../index.native';
+import { CommonProps, FormProps } from '../../types';
+import { ResetPasswordSubmitProps } from '../types';
 
 interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
 
diff --git a/modules/user/client-react/signUp/components/ResetPasswordForm.tsx b/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
index b8cc5d4..474f957 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordForm.tsx
@@ -7,8 +7,8 @@ import { required, minLength, validate, match } from '@restapp/validation-common
 import { Form, RenderField, Button, Alert } from '@restapp/look-client-react';
 
 import settings from '../../../../../settings';
-import { CommonProps, FormProps } from '../../types/typings';
-import { ResetPasswordSubmitProps } from '..';
+import { CommonProps, FormProps } from '../../types';
+import { ResetPasswordSubmitProps } from '../types';
 
 interface ResetPasswordFormProps extends CommonProps, FormProps<ResetPasswordSubmitProps> {}
 
diff --git a/modules/user/client-react/signUp/components/ResetPasswordView.native.tsx b/modules/user/client-react/signUp/components/ResetPasswordView.native.tsx
index a421a30..0864c70 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordView.native.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordView.native.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 
 import ResetPasswordForm from './ResetPasswordForm.native';
-import { ResetPasswordSubmitProps } from '../index.native';
+import { ResetPasswordSubmitProps } from '../types';
 
 interface ResetPasswordViewProps {
   onSubmit: (values: ResetPasswordSubmitProps) => void;
diff --git a/modules/user/client-react/signUp/components/ResetPasswordView.tsx b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
index bfff280..2c4f726 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
@@ -3,8 +3,8 @@ import React from 'react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import ResetPasswordForm from './ResetPasswordForm';
-import { CommonProps } from '../../types/typings';
-import { ResetPasswordSubmitProps } from '..';
+import { CommonProps } from '../../types';
+import { ResetPasswordSubmitProps } from '../types';
 import MetaData from '../../components/MetaData';
 
 interface ResetPasswordViewProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
index 178c293..3ea4939 100644
--- a/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
@@ -5,8 +5,8 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import ForgotPasswordView from '../components/ForgotPasswordView.native';
-import { CommonProps, User } from '../../types/typings';
-import { ForgotPasswordSubmitProps } from '../index.native';
+import { CommonProps, User } from '../../types';
+import { ForgotPasswordSubmitProps } from '../types';
 import { FORGOT_PASSWORD } from '../actions';
 
 interface ForgotPasswordProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/containers/ForgotPassword.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
index 2aec34c..83d9e27 100644
--- a/modules/user/client-react/signUp/containers/ForgotPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
@@ -5,8 +5,8 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import ForgotPasswordView from '../components/ForgotPasswordView';
-import { CommonProps } from '../../types/typings';
-import { ForgotPasswordSubmitProps } from '..';
+import { CommonProps } from '../../types';
+import { ForgotPasswordSubmitProps } from '../types';
 import { FORGOT_PASSWORD } from '../actions';
 
 interface ForgotPasswordProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/containers/Login.native.tsx b/modules/user/client-react/signUp/containers/Login.native.tsx
index 502661e..b22b0c9 100644
--- a/modules/user/client-react/signUp/containers/Login.native.tsx
+++ b/modules/user/client-react/signUp/containers/Login.native.tsx
@@ -6,8 +6,8 @@ import { translate } from '@restapp/i18n-client-react';
 import authentication from '@restapp/authentication-client-react';
 
 import LoginView from '../components/LoginView.native';
-import { CommonProps } from '../../types/typings';
-import { LoginSubmitProps } from '../index.native';
+import { CommonProps } from '../../types';
+import { LoginSubmitProps } from '../types';
 import { LOGIN } from '../actions';
 
 export interface LoginProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/containers/Login.tsx b/modules/user/client-react/signUp/containers/Login.tsx
index 9fa0df4..fd8b3ab 100644
--- a/modules/user/client-react/signUp/containers/Login.tsx
+++ b/modules/user/client-react/signUp/containers/Login.tsx
@@ -7,8 +7,8 @@ import { FormError } from '@restapp/forms-client-react';
 import { setItem } from '@restapp/core-common/clientStorage';
 
 import LoginView from '../components/LoginView';
-import { CommonProps } from '../../types/typings';
-import { LoginSubmitProps } from '..';
+import { CommonProps } from '../../types';
+import { LoginSubmitProps } from '../types';
 import { LOGIN } from '../actions';
 
 export interface LoginProps extends CommonProps {
diff --git a/modules/user/client-react/signUp/containers/Logout.native.tsx b/modules/user/client-react/signUp/containers/Logout.native.tsx
index dd0104f..98996e4 100644
--- a/modules/user/client-react/signUp/containers/Logout.native.tsx
+++ b/modules/user/client-react/signUp/containers/Logout.native.tsx
@@ -5,7 +5,7 @@ import { HeaderTitle } from '@restapp/look-client-react-native';
 import { translate } from '@restapp/i18n-client-react';
 
 import { withLogout } from '../../containers/Auth';
-import { CommonProps } from '../../types/typings';
+import { CommonProps } from '../../types';
 
 interface LogoutViewProps extends CommonProps {
   logout: () => void;
diff --git a/modules/user/client-react/signUp/containers/Logout.tsx b/modules/user/client-react/signUp/containers/Logout.tsx
new file mode 100644
index 0000000..dfb2d5f
--- /dev/null
+++ b/modules/user/client-react/signUp/containers/Logout.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { withRouter } from 'react-router-dom';
+
+import { withLogout, WithLogoutProps } from '../../containers/Auth';
+import { translate } from 'react-i18next';
+
+const LogoutLink = ({ logout, history, t }: WithLogoutProps) => (
+  <a
+    href="javascript:void(0)"
+    onClick={e => {
+      e.preventDefault();
+      (async () => {
+        await logout();
+        history.push('/');
+      })();
+    }}
+    className="nav-link"
+  >
+    {t('logout')}
+  </a>
+);
+
+export default withRouter(withLogout(translate('userSignUp')(LogoutLink)) as any);
diff --git a/modules/user/client-react/signUp/containers/NavLoginLink.tsx b/modules/user/client-react/signUp/containers/NavLoginLink.tsx
new file mode 100644
index 0000000..604d14d
--- /dev/null
+++ b/modules/user/client-react/signUp/containers/NavLoginLink.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+import { translate } from '@restapp/i18n-client-react';
+import { CommonProps } from '../../types';
+
+const NavLinkLoginWithI18n = ({ t }: CommonProps) => (
+  <NavLink to="/login" className="nav-link" activeClassName="active">
+    {t('navLink.signIn')}
+  </NavLink>
+);
+
+export default translate('userSignUp')(NavLinkLoginWithI18n);
diff --git a/modules/user/client-react/signUp/containers/Register.native.tsx b/modules/user/client-react/signUp/containers/Register.native.tsx
index e5e5fef..d849619 100644
--- a/modules/user/client-react/signUp/containers/Register.native.tsx
+++ b/modules/user/client-react/signUp/containers/Register.native.tsx
@@ -7,8 +7,8 @@ import { FormError } from '@restapp/forms-client-react';
 import RegisterView from '../components/RegisterView.native';
 import settings from '../../../../../settings';
 import { REGISTER } from '../actions';
-import { CommonProps } from '../../types/typings';
-import { RegisterSubmitProps } from '../index.native';
+import { CommonProps } from '../../types';
+import { RegisterSubmitProps } from '../types';
 
 interface RegisterProps extends CommonProps {
   register?: (values: RegisterSubmitProps) => any;
diff --git a/modules/user/client-react/signUp/containers/Register.tsx b/modules/user/client-react/signUp/containers/Register.tsx
index 27c9d8e..821545d 100644
--- a/modules/user/client-react/signUp/containers/Register.tsx
+++ b/modules/user/client-react/signUp/containers/Register.tsx
@@ -5,8 +5,8 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import RegisterView from '../components/RegisterView';
-import { CommonProps } from '../../types/typings';
-import { RegisterSubmitProps } from '..';
+import { CommonProps } from '../../types';
+import { RegisterSubmitProps } from '../types';
 import { REGISTER } from '../actions';
 import settings from '../../../../../settings';
 
diff --git a/modules/user/client-react/signUp/containers/ResetPassword.native.tsx b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
index 47a4f5c..02e615f 100644
--- a/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
@@ -6,8 +6,8 @@ import { FormError } from '@restapp/forms-client-react';
 
 import ResetPasswordView from '../components/ResetPasswordView.native';
 import { RESET_PASSWORD } from '../actions';
-import { CommonProps } from '../../types/typings';
-import { ResetPasswordSubmitProps } from '../index.native';
+import { CommonProps } from '../../types';
+import { ResetPasswordSubmitProps } from '../types';
 
 interface Token {
   token: string;
diff --git a/modules/user/client-react/signUp/containers/ResetPassword.tsx b/modules/user/client-react/signUp/containers/ResetPassword.tsx
index 5092535..7e13469 100644
--- a/modules/user/client-react/signUp/containers/ResetPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.tsx
@@ -6,9 +6,9 @@ import { FormError } from '@restapp/forms-client-react';
 
 import ResetPasswordView from '../components/ResetPasswordView';
 
-import { ResetPasswordSubmitProps } from '..';
+import { ResetPasswordSubmitProps } from '../types';
 import { RESET_PASSWORD } from '../actions';
-import { CommonProps } from '../../types/typings';
+import { CommonProps } from '../../types';
 
 interface Token {
   token: string;
diff --git a/modules/user/client-react/signUp/index.native.tsx b/modules/user/client-react/signUp/index.native.tsx
index 236f24e..c811e93 100644
--- a/modules/user/client-react/signUp/index.native.tsx
+++ b/modules/user/client-react/signUp/index.native.tsx
@@ -11,29 +11,9 @@ import Logout from './containers/Logout.native';
 import Register from './containers/Register.native';
 import ForgotPassword from './containers/ForgotPassword.native';
 import ResetPassword from './containers/ResetPassword.native';
-import { NavigationOptionsProps } from '../index.native';
+import { NavigationOptionsProps } from '../types';
 import signUpReducer from './reducers';
 
-export interface LoginSubmitProps {
-  usernameOrEmail: string;
-  password: string;
-}
-export interface ResetPasswordSubmitProps {
-  password: string;
-  passwordConfirmation: string;
-}
-
-export interface ForgotPasswordSubmitProps {
-  email: string;
-}
-
-export interface RegisterSubmitProps {
-  username: string;
-  email: string;
-  password: string;
-  passwordConfirmation: string;
-}
-
 class LoginScreen extends React.Component<NavigationOptionsProps> {
   public static navigationOptions = ({ navigation }: NavigationOptionsProps) => ({
     headerTitle: <HeaderTitleWithI18n i18nKey="navLink.signIn" style="subTitle" />,
diff --git a/modules/user/client-react/signUp/index.tsx b/modules/user/client-react/signUp/index.tsx
index ebbccf2..c727c17 100644
--- a/modules/user/client-react/signUp/index.tsx
+++ b/modules/user/client-react/signUp/index.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
-import { NavLink, withRouter } from 'react-router-dom';
 
-import { translate } from '@restapp/i18n-client-react';
 import { MenuItem } from '@restapp/look-client-react';
 import ClientModule from '@restapp/module-client-react';
 
@@ -9,52 +7,12 @@ import Login from './containers/Login';
 import Register from './containers/Register';
 import ForgotPassword from './containers/ForgotPassword';
 import ResetPassword from './containers/ResetPassword';
+import Logout from './containers/Logout';
+import NavLinkLoginWithI18n from './containers/NavLoginLink';
 import signUpReducer from './reducers';
 import resources from './locales';
 
-import { AuthRoute, IfLoggedIn, IfNotLoggedIn, withLogout, WithLogoutProps } from '../containers/Auth';
-
-export interface LoginSubmitProps {
-  usernameOrEmail: string;
-  password: string;
-}
-
-export interface RegisterSubmitProps {
-  username: string;
-  email: string;
-  password: string;
-  passwordConfirmation: string;
-}
-
-export interface ResetPasswordSubmitProps {
-  password: string;
-  passwordConfirmation: string;
-}
-export interface ForgotPasswordSubmitProps {
-  email: string;
-}
-
-const LogoutLink = withRouter(withLogout(({ logout, history }: WithLogoutProps) => (
-  <a
-    href="javascript:void(0)"
-    onClick={e => {
-      e.preventDefault();
-      (async () => {
-        await logout();
-        history.push('/');
-      })();
-    }}
-    className="nav-link"
-  >
-    Logout
-  </a>
-)) as any);
-
-const NavLinkLoginWithI18n = translate('userSignUp')(({ t }: any) => (
-  <NavLink to="/login" className="nav-link" activeClassName="active">
-    {t('navLink.signIn')}
-  </NavLink>
-));
+import { AuthRoute, IfLoggedIn, IfNotLoggedIn } from '../containers/Auth';
 
 export default new ClientModule({
   route: [
@@ -66,7 +24,7 @@ export default new ClientModule({
   navItemRight: [
     <IfLoggedIn key="/logout">
       <MenuItem>
-        <LogoutLink />
+        <Logout />
       </MenuItem>
     </IfLoggedIn>,
     <IfNotLoggedIn key="/login">
diff --git a/modules/user/client-react/signUp/locales/en/translations.json b/modules/user/client-react/signUp/locales/en/translations.json
index 8b83146..985cb0e 100644
--- a/modules/user/client-react/signUp/locales/en/translations.json
+++ b/modules/user/client-react/signUp/locales/en/translations.json
@@ -31,6 +31,7 @@
       "sign": "Sign Up"
     }
   },
+  "logout": "Log out",
   "reg": {
     "title": "Register",
     "meta": "A Registration page example",
diff --git a/modules/user/client-react/signUp/locales/ru/translations.json b/modules/user/client-react/signUp/locales/ru/translations.json
index 3e09be5..a69180c 100644
--- a/modules/user/client-react/signUp/locales/ru/translations.json
+++ b/modules/user/client-react/signUp/locales/ru/translations.json
@@ -42,6 +42,7 @@
       "sign": "Зарегистрироваться"
     }
   },
+  "logout": "Выход",
   "reg": {
     "title": "Регистрация",
     "meta": "Пример страницы с регистрацией",
diff --git a/modules/user/client-react/signUp/reducers/index.ts b/modules/user/client-react/signUp/reducers/index.ts
index 76794dd..3ac4888 100644
--- a/modules/user/client-react/signUp/reducers/index.ts
+++ b/modules/user/client-react/signUp/reducers/index.ts
@@ -1,4 +1,4 @@
-import { User } from '../..';
+import { User } from '../../types';
 
 export interface SignUpActionProps {
   type: ActionType | ActionType[];
diff --git a/modules/user/client-react/signUp/types/index.ts b/modules/user/client-react/signUp/types/index.ts
new file mode 100644
index 0000000..53aa9f3
--- /dev/null
+++ b/modules/user/client-react/signUp/types/index.ts
@@ -0,0 +1,19 @@
+export interface LoginSubmitProps {
+  usernameOrEmail: string;
+  password: string;
+}
+
+export interface RegisterSubmitProps {
+  username: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+}
+
+export interface ResetPasswordSubmitProps {
+  password: string;
+  passwordConfirmation: string;
+}
+export interface ForgotPasswordSubmitProps {
+  email: string;
+}
diff --git a/modules/user/client-react/types/typings.d.ts b/modules/user/client-react/types/index.ts
similarity index 99%
rename from modules/user/client-react/types/typings.d.ts
rename to modules/user/client-react/types/index.ts
index 6ae6af2..57efddf 100644
--- a/modules/user/client-react/types/typings.d.ts
+++ b/modules/user/client-react/types/index.ts
@@ -36,7 +36,6 @@ export interface User extends UserProfile, Auth {
 
 export interface CommonProps extends HistoryProp, NavigationOptionsProps {
   t?: TranslateFunction;
-  
 }
 
 export interface HistoryProp {
@@ -64,4 +63,3 @@ interface HandleSubmitProps<P> {
 interface Errors {
   message?: string;
 }
-
diff --git a/modules/user/client-react/users/actions/addUser.ts b/modules/user/client-react/users/actions/addUser.ts
index 8cf509a..8b30ece 100644
--- a/modules/user/client-react/users/actions/addUser.ts
+++ b/modules/user/client-react/users/actions/addUser.ts
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { User } from '../..';
+import { User } from '../../types';
 import { ActionType, ActionFunction } from '.';
 
 const ADD_USER: ActionFunction<ActionType, User> = user => ({
diff --git a/modules/user/client-react/users/actions/editUser.ts b/modules/user/client-react/users/actions/editUser.ts
index abf14a3..339e6a6 100644
--- a/modules/user/client-react/users/actions/editUser.ts
+++ b/modules/user/client-react/users/actions/editUser.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { ActionType, ActionFunction } from '.';
-import { User } from '../..';
+import { User } from '../../types';
 
 const EDIT_USER: ActionFunction<ActionType, User> = user => ({
   types: {},
diff --git a/modules/user/client-react/users/actions/users.ts b/modules/user/client-react/users/actions/users.ts
index f9ce7a8..470088f 100644
--- a/modules/user/client-react/users/actions/users.ts
+++ b/modules/user/client-react/users/actions/users.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { ActionType, ActionFunction } from '.';
-import { OrderBy, Filter } from '..';
+import { OrderBy, Filter } from '../types';
 
 const USERS: ActionFunction<ActionType, OrderBy, Filter, ActionType> = (
   orderBy: OrderBy,
diff --git a/modules/user/client-react/users/components/UserAddView.native.tsx b/modules/user/client-react/users/components/UserAddView.native.tsx
index d3dcc0f..bc73d9a 100644
--- a/modules/user/client-react/users/components/UserAddView.native.tsx
+++ b/modules/user/client-react/users/components/UserAddView.native.tsx
@@ -4,7 +4,7 @@ import { StyleSheet, View } from 'react-native';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 
 import UserForm from './UserForm';
-import { User } from '../../types/typings';
+import { User } from '../../types';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/users/components/UserAddView.tsx b/modules/user/client-react/users/components/UserAddView.tsx
index 740f639..68a7e89 100644
--- a/modules/user/client-react/users/components/UserAddView.tsx
+++ b/modules/user/client-react/users/components/UserAddView.tsx
@@ -5,7 +5,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
-import { User } from '../../types/typings';
+import { User } from '../../types';
 import MetaData from '../../components/MetaData';
 
 interface FormValues extends User {
diff --git a/modules/user/client-react/users/components/UserEditView.native.tsx b/modules/user/client-react/users/components/UserEditView.native.tsx
index f00ce61..33f4f75 100644
--- a/modules/user/client-react/users/components/UserEditView.native.tsx
+++ b/modules/user/client-react/users/components/UserEditView.native.tsx
@@ -4,7 +4,7 @@ import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Loading } from '@restapp/look-client-react-native';
 
 import UserForm from './UserForm';
-import { User } from '../../types/typings';
+import { User } from '../../types';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/users/components/UserEditView.tsx b/modules/user/client-react/users/components/UserEditView.tsx
index 397f990..5fae11e 100644
--- a/modules/user/client-react/users/components/UserEditView.tsx
+++ b/modules/user/client-react/users/components/UserEditView.tsx
@@ -6,7 +6,7 @@ import { PageLayout } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
 import MetaData from '../../components/MetaData';
-import { User } from '../../types/typings';
+import { User } from '../../types';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/users/components/UserForm.native.tsx b/modules/user/client-react/users/components/UserForm.native.tsx
index a1178b7..781dcdb 100644
--- a/modules/user/client-react/users/components/UserForm.native.tsx
+++ b/modules/user/client-react/users/components/UserForm.native.tsx
@@ -9,7 +9,7 @@ import { RenderField, Button, RenderSelect, RenderSwitch, FormView, primary } fr
 import { placeholderColor, submit } from '@restapp/look-client-react-native/styles';
 import { email as emailRule, minLength, required, match, validate } from '@restapp/validation-common-react';
 
-import { FormProps, User, UserRole } from '../../types/typings';
+import { FormProps, User, UserRole } from '../../types';
 import settings from '../../../../../settings';
 
 interface FormikFormProps extends FormProps<FormValues> {
diff --git a/modules/user/client-react/users/components/UserForm.tsx b/modules/user/client-react/users/components/UserForm.tsx
index 202215a..9ab2a19 100644
--- a/modules/user/client-react/users/components/UserForm.tsx
+++ b/modules/user/client-react/users/components/UserForm.tsx
@@ -8,7 +8,7 @@ import { email as emailRule, minLength, required, match, validate } from '@resta
 import { Form, RenderField, RenderSelect, RenderCheckBox, Option, Button, Alert } from '@restapp/look-client-react';
 
 import settings from '../../../../../settings';
-import { CommonProps, FormProps, User, UserRole } from '../../types/typings';
+import { CommonProps, FormProps, User, UserRole } from '../../types';
 
 interface FormikFormProps extends FormProps<FormValues> {
   initialValues: FormValues;
diff --git a/modules/user/client-react/users/components/UsersFilterView.tsx b/modules/user/client-react/users/components/UsersFilterView.tsx
index fdd246c..346da90 100644
--- a/modules/user/client-react/users/components/UsersFilterView.tsx
+++ b/modules/user/client-react/users/components/UsersFilterView.tsx
@@ -4,7 +4,7 @@ import { DebounceInput } from 'react-debounce-input';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 import { Form, FormItem, Select, Option, Label, Input } from '@restapp/look-client-react';
 
-import { Filter } from '..';
+import { Filter } from '../types';
 
 export interface UsersFilterViewProps {
   filter: Filter;
diff --git a/modules/user/client-react/users/components/UsersListView.native.tsx b/modules/user/client-react/users/components/UsersListView.native.tsx
index a9b71b0..75b4fc5 100644
--- a/modules/user/client-react/users/components/UsersListView.native.tsx
+++ b/modules/user/client-react/users/components/UsersListView.native.tsx
@@ -15,7 +15,7 @@ import {
   primary
 } from '@restapp/look-client-react-native';
 
-import { NavigationOptionsProps, User } from '../../types/typings';
+import { NavigationOptionsProps, User } from '../../types';
 
 interface UsersListViewProps extends NavigationOptionsProps {
   users: User[];
diff --git a/modules/user/client-react/users/components/UsersListView.tsx b/modules/user/client-react/users/components/UsersListView.tsx
index 6354e15..9a3def9 100644
--- a/modules/user/client-react/users/components/UsersListView.tsx
+++ b/modules/user/client-react/users/components/UsersListView.tsx
@@ -4,8 +4,8 @@ import { Link } from 'react-router-dom';
 import { translate } from '@restapp/i18n-client-react';
 import { Table, Button } from '@restapp/look-client-react';
 
-import { User, CommonProps } from '../../types/typings';
-import { OrderBy } from '..';
+import { User, CommonProps } from '../../types';
+import { OrderBy } from '../types';
 
 export interface UsersViewProps extends CommonProps {
   loading: boolean;
diff --git a/modules/user/client-react/users/containers/NavLink.tsx b/modules/user/client-react/users/containers/NavLink.tsx
new file mode 100644
index 0000000..ffb9748
--- /dev/null
+++ b/modules/user/client-react/users/containers/NavLink.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+import { translate } from '@restapp/i18n-client-react';
+
+import { CommonProps } from '../../types';
+
+const NavLinkUsersWithI18n = ({ t }: CommonProps) => (
+  <NavLink to="/users" className="nav-link" activeClassName="active">
+    {t('navLink.users')}
+  </NavLink>
+);
+
+export default translate('userUsers')(NavLinkUsersWithI18n);
diff --git a/modules/user/client-react/users/containers/UserAdd.tsx b/modules/user/client-react/users/containers/UserAdd.tsx
index 33cd3ac..737ab1b 100644
--- a/modules/user/client-react/users/containers/UserAdd.tsx
+++ b/modules/user/client-react/users/containers/UserAdd.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import UserAddView from '../components/UserAddView';
 import UserFormatter from '../../helpers/UserFormatter';
-import { User, CommonProps } from '../../types/typings';
+import { User, CommonProps } from '../../types';
 import { ADD_USER } from '../actions';
 
 interface UserAddProps extends CommonProps {
diff --git a/modules/user/client-react/users/containers/UserEdit.native.tsx b/modules/user/client-react/users/containers/UserEdit.native.tsx
index 9b5b302..8e337d3 100644
--- a/modules/user/client-react/users/containers/UserEdit.native.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.native.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import UserEditView from '../components/UserEditView.native';
 import UserFormatter from '../../helpers/UserFormatter';
-import { CommonProps, User } from '../../types/typings';
+import { CommonProps, User } from '../../types/';
 import { USER, EDIT_USER } from '../actions';
 
 interface UserEditProps extends CommonProps {
diff --git a/modules/user/client-react/users/containers/UserEdit.tsx b/modules/user/client-react/users/containers/UserEdit.tsx
index 9ae018b..abb842b 100644
--- a/modules/user/client-react/users/containers/UserEdit.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import UserEditView from '../components/UserEditView';
 import UserFormatter from '../../helpers/UserFormatter';
-import { User, CommonProps } from '../../types/typings';
+import { User, CommonProps } from '../../types';
 import { USER, EDIT_USER } from '../actions';
 
 interface UserEditProps extends CommonProps {
diff --git a/modules/user/client-react/users/containers/UserOperations.tsx b/modules/user/client-react/users/containers/UserOperations.tsx
index 5bc6ea5..f27dd29 100644
--- a/modules/user/client-react/users/containers/UserOperations.tsx
+++ b/modules/user/client-react/users/containers/UserOperations.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { USERS, DELETE_USER } from '../actions';
-import { UserRole } from '../../types/typings';
-import { OrderBy } from '..';
+import { UserRole } from '../../types';
+import { OrderBy } from '../types';
 
 const withUsers = (Component: React.ComponentType<any>) => {
   class WithUsers extends React.Component<any> {
diff --git a/modules/user/client-react/users/containers/Users.native.tsx b/modules/user/client-react/users/containers/Users.native.tsx
index d77ec45..e20dfb4 100644
--- a/modules/user/client-react/users/containers/Users.native.tsx
+++ b/modules/user/client-react/users/containers/Users.native.tsx
@@ -6,7 +6,7 @@ import UsersList from '../components/UsersListView.native';
 import UsersFilter from '../components/UsersFilterView.native';
 import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
 
-import { NavigationOptionsProps } from '../../types/typings';
+import { NavigationOptionsProps } from '../../types';
 
 interface UsersProps extends NavigationOptionsProps {
   loading: boolean;
diff --git a/modules/user/client-react/users/index.native.tsx b/modules/user/client-react/users/index.native.tsx
index 89a7727..57eff5c 100644
--- a/modules/user/client-react/users/index.native.tsx
+++ b/modules/user/client-react/users/index.native.tsx
@@ -9,20 +9,9 @@ import resources from './locales';
 import Users from './containers/Users.native';
 import UserEdit from './containers/UserEdit.native';
 import UserAdd from './containers/UserAdd';
-import { NavigationOptionsProps } from '../index.native';
+import { NavigationOptionsProps } from '../types';
 import usersReducer from './reducers';
 
-export interface OrderBy {
-  column: string;
-  order: string;
-}
-
-export interface Filter {
-  searchText: string;
-  role: string;
-  isActive: boolean;
-}
-
 class UsersListScreen extends React.Component<NavigationOptionsProps> {
   public render() {
     return <Users navigation={this.props.navigation} />;
diff --git a/modules/user/client-react/users/index.tsx b/modules/user/client-react/users/index.tsx
index c127314..4838773 100644
--- a/modules/user/client-react/users/index.tsx
+++ b/modules/user/client-react/users/index.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
-import { NavLink } from 'react-router-dom';
 
-import { translate } from '@restapp/i18n-client-react';
 import { MenuItem } from '@restapp/look-client-react';
 import ClientModule from '@restapp/module-client-react';
 
@@ -9,32 +7,10 @@ import resources from './locales';
 import Users from './containers/Users';
 import UserEdit from './containers/UserEdit';
 import UserAdd from './containers/UserAdd';
+import NavLinkUsersWithI18n from './containers/NavLink';
 import { AuthRoute, IfLoggedIn } from '../containers/Auth';
 import usersReducer from './reducers';
-
-export enum UserRole {
-  admin = 'admin',
-  user = 'user'
-}
-
-export interface OrderBy {
-  column: string;
-  order: string;
-}
-
-export interface Filter {
-  searchText: string;
-  role: string;
-  isActive: boolean;
-}
-
-export * from '../containers/Auth';
-
-const NavLinkUsersWithI18n = translate('userUsers')(({ t }: any) => (
-  <NavLink to="/users" className="nav-link" activeClassName="active">
-    {t('navLink.users')}
-  </NavLink>
-));
+import { UserRole } from '../types';
 
 export default new ClientModule({
   route: [
diff --git a/modules/user/client-react/users/reducers/index.ts b/modules/user/client-react/users/reducers/index.ts
index 301b5ed..dd8fa05 100644
--- a/modules/user/client-react/users/reducers/index.ts
+++ b/modules/user/client-react/users/reducers/index.ts
@@ -1,5 +1,5 @@
-import { User } from '../..';
-import { OrderBy, Filter } from '..';
+import { User } from '../../types';
+import { OrderBy, Filter } from '../types';
 
 export enum ActionType {
   SET_LOADING = 'SET_LOADING',
diff --git a/modules/user/client-react/users/types/index.ts b/modules/user/client-react/users/types/index.ts
new file mode 100644
index 0000000..653e9b7
--- /dev/null
+++ b/modules/user/client-react/users/types/index.ts
@@ -0,0 +1,10 @@
+export interface OrderBy {
+  column: string;
+  order: string;
+}
+
+export interface Filter {
+  searchText: string;
+  role: string;
+  isActive: boolean;
+}

From 7615835bf662a3257c78d5bc0a5e201cfb21289b Mon Sep 17 00:00:00 2001
From: Evgenij Olshanskij <gekanchiko@gmail.com>
Date: Thu, 6 Jun 2019 09:25:29 +0300
Subject: [PATCH 092/104] Cleanup

---
 modules/user/client-react/signUp/containers/index.ts | 6 ++++++
 modules/user/client-react/signUp/index.tsx           | 9 ++-------
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 modules/user/client-react/signUp/containers/index.ts

diff --git a/modules/user/client-react/signUp/containers/index.ts b/modules/user/client-react/signUp/containers/index.ts
new file mode 100644
index 0000000..4ccd7c4
--- /dev/null
+++ b/modules/user/client-react/signUp/containers/index.ts
@@ -0,0 +1,6 @@
+export { default as Login } from './Login';
+export { default as Logout } from './Logout';
+export { default as ForgotPassword } from './ForgotPassword';
+export { default as NavLoginLink } from './NavLoginLink';
+export { default as Register } from './Register';
+export { default as ResetPassword } from './ResetPassword';
diff --git a/modules/user/client-react/signUp/index.tsx b/modules/user/client-react/signUp/index.tsx
index c727c17..8e589f1 100644
--- a/modules/user/client-react/signUp/index.tsx
+++ b/modules/user/client-react/signUp/index.tsx
@@ -3,12 +3,7 @@ import React from 'react';
 import { MenuItem } from '@restapp/look-client-react';
 import ClientModule from '@restapp/module-client-react';
 
-import Login from './containers/Login';
-import Register from './containers/Register';
-import ForgotPassword from './containers/ForgotPassword';
-import ResetPassword from './containers/ResetPassword';
-import Logout from './containers/Logout';
-import NavLinkLoginWithI18n from './containers/NavLoginLink';
+import { Login, Register, ForgotPassword, ResetPassword, Logout, NavLoginLink } from './containers';
 import signUpReducer from './reducers';
 import resources from './locales';
 
@@ -29,7 +24,7 @@ export default new ClientModule({
     </IfLoggedIn>,
     <IfNotLoggedIn key="/login">
       <MenuItem>
-        <NavLinkLoginWithI18n />
+        <NavLoginLink />
       </MenuItem>
     </IfNotLoggedIn>
   ],

From d5a9c21f964f2039e19c091030f62fbf8961385a Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Thu, 6 Jun 2019 11:12:14 +0300
Subject: [PATCH 093/104] Rename action functions

---
 .../user/client-react/actions/currentUser.ts   |  4 ++--
 modules/user/client-react/actions/index.ts     |  2 +-
 .../user/client-react/containers/AuthBase.tsx  | 18 +++++++++---------
 .../containers/DataRootComponent.native.tsx    | 10 +++++-----
 .../containers/DataRootComponent.tsx           | 12 ++++++++----
 .../containers/UserScreenNavigator.native.tsx  |  2 +-
 .../user/client-react/helpers/UserFormatter.ts |  8 --------
 .../profile/containers/ProfileEdit.native.tsx  | 16 ++++++++--------
 .../client-react/signUp/actions/clearUser.ts   |  4 ++--
 .../signUp/actions/forgotPassword.ts           |  4 ++--
 .../user/client-react/signUp/actions/index.ts  | 10 +++++-----
 .../user/client-react/signUp/actions/login.ts  |  4 ++--
 .../client-react/signUp/actions/register.ts    |  4 ++--
 .../signUp/actions/resetPassword.ts            |  4 ++--
 .../containers/ForgotPassword.native.tsx       |  8 ++++----
 .../signUp/containers/ForgotPassword.tsx       |  8 ++++----
 .../signUp/containers/Login.native.tsx         |  8 ++++----
 .../client-react/signUp/containers/Login.tsx   |  8 ++++----
 .../signUp/containers/Register.native.tsx      |  8 ++++----
 .../signUp/containers/Register.tsx             |  8 ++++----
 .../signUp/containers/ResetPassword.native.tsx |  8 ++++----
 .../signUp/containers/ResetPassword.tsx        |  8 ++++----
 .../user/client-react/users/actions/addUser.ts |  4 ++--
 .../client-react/users/actions/deleteUser.ts   |  4 ++--
 .../client-react/users/actions/editUser.ts     |  4 ++--
 .../user/client-react/users/actions/index.ts   | 10 +++++-----
 .../user/client-react/users/actions/user.ts    |  4 ++--
 .../user/client-react/users/actions/users.ts   |  4 ++--
 .../client-react/users/containers/UserAdd.tsx  |  8 ++++----
 .../users/containers/UserEdit.native.tsx       | 18 ++++++++++--------
 .../client-react/users/containers/UserEdit.tsx | 16 ++++++++--------
 .../users/containers/UserOperations.tsx        | 12 ++++++------
 32 files changed, 124 insertions(+), 126 deletions(-)

diff --git a/modules/user/client-react/actions/currentUser.ts b/modules/user/client-react/actions/currentUser.ts
index 6d0ce37..8e1805c 100644
--- a/modules/user/client-react/actions/currentUser.ts
+++ b/modules/user/client-react/actions/currentUser.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { ActionType } from '../signUp/reducers';
 import { ActionFunction } from '.';
 
-const CURRENT_USER: ActionFunction<ActionType> = () => ({
+const getCurrentUser: ActionFunction<ActionType> = () => ({
   types: {
     REQUEST: ActionType.SET_LOADING_AND_CLEAR_USER,
     SUCCESS: ActionType.SET_CURRENT_USER,
@@ -10,4 +10,4 @@ const CURRENT_USER: ActionFunction<ActionType> = () => ({
   },
   APICall: () => axios.get(`${__API_URL__}/currentUser`)
 });
-export default CURRENT_USER;
+export default getCurrentUser;
diff --git a/modules/user/client-react/actions/index.ts b/modules/user/client-react/actions/index.ts
index 8c92f22..e2a1e3e 100644
--- a/modules/user/client-react/actions/index.ts
+++ b/modules/user/client-react/actions/index.ts
@@ -1,4 +1,4 @@
-export { default as CURRENT_USER } from './currentUser';
+export { default as getCurrentUser } from './currentUser';
 import { ActionType } from '../reducers';
 
 interface Types<AT> {
diff --git a/modules/user/client-react/containers/AuthBase.tsx b/modules/user/client-react/containers/AuthBase.tsx
index dc7cce3..6e95e36 100644
--- a/modules/user/client-react/containers/AuthBase.tsx
+++ b/modules/user/client-react/containers/AuthBase.tsx
@@ -6,8 +6,8 @@ import authentication from '@restapp/authentication-client-react';
 import { getItem } from '@restapp/core-common/clientStorage';
 
 import { User, UserRole, CommonProps } from '../types';
-import CLEAR_USER from '../signUp/actions/clearUser';
-import { CURRENT_USER } from '../actions';
+import { clearUser } from '../signUp/actions';
+import { getCurrentUser } from '../actions';
 import setting from '../../../../settings';
 
 export interface WithUserProps extends RouteProps {
@@ -34,14 +34,14 @@ export interface WithLogoutProps extends WithUserProps, CommonProps {
 const withUser = (Component: React.ComponentType<any>) => {
   class WithUser extends React.Component<WithUserProps> {
     public async componentDidMount() {
-      const { currentUser, getCurrentUser } = this.props;
+      const { currentUser, getCurrentUser: actionGetCurrentUser } = this.props;
       if (currentUser === undefined && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
-        await getCurrentUser();
+        await actionGetCurrentUser();
       }
     }
 
     public render() {
-      const { currentUserLoading, currentUser, getCurrentUser, ...rest } = this.props;
+      const { currentUserLoading, currentUser, getCurrentUser: actionGetCurrentUser, ...rest } = this.props;
       return currentUserLoading ? null : (
         <Component currentUser={currentUser} currentUserLoading={currentUserLoading} {...rest} />
       );
@@ -52,7 +52,7 @@ const withUser = (Component: React.ComponentType<any>) => {
       currentUserLoading: loading,
       currentUser
     }),
-    { getCurrentUser: CURRENT_USER }
+    { getCurrentUser }
   )(WithUser);
 };
 
@@ -76,17 +76,17 @@ const IfNotLoggedInComponent: React.FunctionComponent<IfLoggedInComponent> = ({
 const IfNotLoggedIn: React.ComponentType<IfLoggedInComponent> = withUser(IfNotLoggedInComponent);
 
 const withLogout = (Component: React.ComponentType<any>) => {
-  const WithLogout = ({ clearUser, ...props }: WithLogoutProps) => {
+  const WithLogout = ({ clearUser: dispatchClearUser, ...props }: WithLogoutProps) => {
     const newProps = {
       ...props,
-      logout: () => authentication.doLogout(clearUser)
+      logout: () => authentication.doLogout(dispatchClearUser)
     };
     return <Component {...newProps} />;
   };
 
   return connect(
     null,
-    { clearUser: CLEAR_USER }
+    { clearUser }
   )(WithLogout);
 };
 
diff --git a/modules/user/client-react/containers/DataRootComponent.native.tsx b/modules/user/client-react/containers/DataRootComponent.native.tsx
index 60c0b46..38fccfa 100644
--- a/modules/user/client-react/containers/DataRootComponent.native.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.native.tsx
@@ -4,8 +4,8 @@ import { connect } from 'react-redux';
 import { getItem } from '@restapp/core-common/clientStorage';
 
 import Loading from '../components/Loading.native';
-import { CURRENT_USER } from '../actions';
-import { User } from '..';
+import { getCurrentUser } from '../actions';
+import { User } from '../types';
 import setting from '../../../../settings';
 
 interface DataRootComponent {
@@ -19,9 +19,9 @@ class DataRootComponent extends React.Component<DataRootComponent> {
   };
 
   public async componentDidMount() {
-    const { currentUser, getCurrentUser } = this.props;
+    const { currentUser, getCurrentUser: actionGetCurrentUser } = this.props;
     if (!this.state.ready && !currentUser && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
-      await getCurrentUser();
+      await actionGetCurrentUser();
     }
     this.setState({ ready: true });
   }
@@ -35,5 +35,5 @@ export default connect(
   ({ signUpReducer: { currentUser } }: any) => ({
     currentUser
   }),
-  { getCurrentUser: CURRENT_USER }
+  { getCurrentUser }
 )(DataRootComponent);
diff --git a/modules/user/client-react/containers/DataRootComponent.tsx b/modules/user/client-react/containers/DataRootComponent.tsx
index e9eb206..e9b15f2 100644
--- a/modules/user/client-react/containers/DataRootComponent.tsx
+++ b/modules/user/client-react/containers/DataRootComponent.tsx
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { getItem } from '@restapp/core-common/clientStorage';
 
 import Loading from '../components/Loading';
-import { CURRENT_USER } from '../actions';
+import { getCurrentUser } from '../actions';
 import { User } from '../types';
 import setting from '../../../../settings';
 
@@ -14,13 +14,17 @@ interface DataRootComponent {
   children?: Element | any;
 }
 
-const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({ currentUser, children, getCurrentUser }) => {
+const DataRootComponent: React.FunctionComponent<DataRootComponent> = ({
+  currentUser,
+  children,
+  getCurrentUser: actionGetCurrentUser
+}) => {
   const [ready, setReady] = React.useState(false);
 
   React.useEffect(() => {
     (async () => {
       if (!ready && !currentUser && ((await getItem('refreshToken')) || setting.auth.session.enabled)) {
-        await getCurrentUser();
+        await actionGetCurrentUser();
       }
       setReady(true);
     })();
@@ -32,5 +36,5 @@ export default connect(
   ({ signUpReducer: { currentUser } }: any) => ({
     currentUser
   }),
-  { getCurrentUser: CURRENT_USER }
+  { getCurrentUser }
 )(DataRootComponent);
diff --git a/modules/user/client-react/containers/UserScreenNavigator.native.tsx b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
index 9d2735f..24db782 100644
--- a/modules/user/client-react/containers/UserScreenNavigator.native.tsx
+++ b/modules/user/client-react/containers/UserScreenNavigator.native.tsx
@@ -4,7 +4,7 @@ import { pickBy } from 'lodash';
 import { compose } from 'redux';
 import { DrawerComponent } from '@restapp/look-client-react-native';
 
-import { UserRole } from '../index.native';
+import { UserRole } from '../types';
 import { withUser } from './Auth.native';
 
 interface User {
diff --git a/modules/user/client-react/helpers/UserFormatter.ts b/modules/user/client-react/helpers/UserFormatter.ts
index f0adf09..30d8703 100644
--- a/modules/user/client-react/helpers/UserFormatter.ts
+++ b/modules/user/client-react/helpers/UserFormatter.ts
@@ -8,14 +8,6 @@ export default class UserFormatter {
         if (propsForTrim.includes(prop) && userValues[prop]) {
           userValues[prop] = userValues[prop].trim();
         }
-
-        if (prop === 'profile') {
-          for (const profileProp in userValues.profile) {
-            if (propsForTrim.includes(profileProp) && userValues.profile[profileProp]) {
-              userValues.profile[profileProp] = userValues.profile[profileProp].trim();
-            }
-          }
-        }
       }
     }
 
diff --git a/modules/user/client-react/profile/containers/ProfileEdit.native.tsx b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
index b64853b..e615590 100644
--- a/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
+++ b/modules/user/client-react/profile/containers/ProfileEdit.native.tsx
@@ -8,10 +8,10 @@ import { FormError } from '@restapp/forms-client-react';
 import ProfileEditView from '../components/ProfileEditView.native';
 import UserFormatter from '../../helpers/UserFormatter';
 import { User, CommonProps } from '../../types';
-import { USER, EDIT_USER } from '../actions';
+import { user, editUser } from '../actions';
 
 interface ProfileEditProps extends CommonProps {
-  user?: User;
+  editableUser?: User;
   editUser?: (value: User) => any;
   location?: any;
   match?: any;
@@ -19,7 +19,7 @@ interface ProfileEditProps extends CommonProps {
 }
 
 const UserEdit: React.FunctionComponent<ProfileEditProps> = props => {
-  const { user, editUser, t, match, getUser } = props;
+  const { editableUser, editUser: actionEditUser, t, match, getUser } = props;
   const [ready, setReady] = useState(false);
   useEffect(() => {
     (async () => {
@@ -38,19 +38,19 @@ const UserEdit: React.FunctionComponent<ProfileEditProps> = props => {
     userValues = UserFormatter.trimExtraSpaces(userValues);
 
     try {
-      await editUser({ id: user.id, ...userValues } as any);
+      await actionEditUser({ id: editableUser.id, ...userValues } as any);
     } catch (e) {
       const data = e.response && e.response.data;
       throw new FormError(t('userEdit.errorMsg'), data);
     }
   };
 
-  return ready ? <ProfileEditView onSubmit={onSubmit} {...props} /> : null;
+  return ready ? <ProfileEditView onSubmit={onSubmit} {...props} user={editableUser} /> : null;
 };
 
 export default connect<{}, {}, ProfileEditProps>(
-  ({ usersReducer: { user } }: any) => ({
-    user
+  ({ usersReducer: { user: editableUser } }: any) => ({
+    editableUser
   }),
-  { getUser: USER, editUser: EDIT_USER }
+  { getUser: user, editUser }
 )(translate('userUsers')(UserEdit));
diff --git a/modules/user/client-react/signUp/actions/clearUser.ts b/modules/user/client-react/signUp/actions/clearUser.ts
index da5484f..f6c6675 100644
--- a/modules/user/client-react/signUp/actions/clearUser.ts
+++ b/modules/user/client-react/signUp/actions/clearUser.ts
@@ -1,7 +1,7 @@
 import { ActionFunction, ActionType } from '.';
 
-const CLEAR_USER: ActionFunction<ActionType> = () => ({
+const clearUser: ActionFunction<ActionType> = () => ({
   type: ActionType.CLEAR_CURRENT_USER
 });
 
-export default CLEAR_USER;
+export default clearUser;
diff --git a/modules/user/client-react/signUp/actions/forgotPassword.ts b/modules/user/client-react/signUp/actions/forgotPassword.ts
index 2ff0212..ab58a97 100644
--- a/modules/user/client-react/signUp/actions/forgotPassword.ts
+++ b/modules/user/client-react/signUp/actions/forgotPassword.ts
@@ -2,9 +2,9 @@ import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
 import { ForgotPasswordSubmitProps } from '../types';
 
-const FORGOT_PASSWORD: ActionFunction<ActionType, ForgotPasswordSubmitProps> = value => ({
+const forgotPassword: ActionFunction<ActionType, ForgotPasswordSubmitProps> = value => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/forgotPassword`, { value })
 });
 
-export default FORGOT_PASSWORD;
+export default forgotPassword;
diff --git a/modules/user/client-react/signUp/actions/index.ts b/modules/user/client-react/signUp/actions/index.ts
index c02af42..6ec123f 100644
--- a/modules/user/client-react/signUp/actions/index.ts
+++ b/modules/user/client-react/signUp/actions/index.ts
@@ -1,8 +1,8 @@
-export { default as REGISTER } from './register';
-export { default as LOGIN } from './login';
-export { default as CLEAR_USER } from './clearUser';
-export { default as RESET_PASSWORD } from './resetPassword';
-export { default as FORGOT_PASSWORD } from './forgotPassword';
+export { default as register } from './register';
+export { default as login } from './login';
+export { default as clearUser } from './clearUser';
+export { default as resetPassword } from './resetPassword';
+export { default as forgotPassword } from './forgotPassword';
 
 export * from '../../actions';
 export { ActionType } from '../reducers';
diff --git a/modules/user/client-react/signUp/actions/login.ts b/modules/user/client-react/signUp/actions/login.ts
index e92b3c2..35c17fd 100644
--- a/modules/user/client-react/signUp/actions/login.ts
+++ b/modules/user/client-react/signUp/actions/login.ts
@@ -2,11 +2,11 @@ import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
 import { LoginSubmitProps } from '../types';
 
-const LOGIN: ActionFunction<ActionType, LoginSubmitProps> = value => ({
+const login: ActionFunction<ActionType, LoginSubmitProps> = value => ({
   types: {
     SUCCESS: ActionType.SET_CURRENT_USER
   },
   APICall: () => axios.post(`${__API_URL__}/login`, { ...value })
 });
 
-export default LOGIN;
+export default login;
diff --git a/modules/user/client-react/signUp/actions/register.ts b/modules/user/client-react/signUp/actions/register.ts
index 3d902e4..8f8bb45 100644
--- a/modules/user/client-react/signUp/actions/register.ts
+++ b/modules/user/client-react/signUp/actions/register.ts
@@ -2,9 +2,9 @@ import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
 import { RegisterSubmitProps } from '../types';
 
-const REGISTER: ActionFunction<ActionType, RegisterSubmitProps> = value => ({
+const register: ActionFunction<ActionType, RegisterSubmitProps> = value => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/register`, { ...value })
 });
 
-export default REGISTER;
+export default register;
diff --git a/modules/user/client-react/signUp/actions/resetPassword.ts b/modules/user/client-react/signUp/actions/resetPassword.ts
index 94420eb..f958b25 100644
--- a/modules/user/client-react/signUp/actions/resetPassword.ts
+++ b/modules/user/client-react/signUp/actions/resetPassword.ts
@@ -6,9 +6,9 @@ interface ResetPasswordProps extends ResetPasswordSubmitProps {
   token: string;
 }
 
-const RESET_PASSWORD: ActionFunction<ActionType, ResetPasswordProps> = value => ({
+const resetPassword: ActionFunction<ActionType, ResetPasswordProps> = value => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/resetPassword`, { ...value })
 });
 
-export default RESET_PASSWORD;
+export default resetPassword;
diff --git a/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
index 3ea4939..90535ce 100644
--- a/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.native.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 import ForgotPasswordView from '../components/ForgotPasswordView.native';
 import { CommonProps, User } from '../../types';
 import { ForgotPasswordSubmitProps } from '../types';
-import { FORGOT_PASSWORD } from '../actions';
+import { forgotPassword } from '../actions';
 
 interface ForgotPasswordProps extends CommonProps {
   forgotPassword?: (values: ForgotPasswordSubmitProps) => any;
@@ -19,11 +19,11 @@ class ForgotPassword extends React.Component<ForgotPasswordProps> {
   };
 
   public onSubmit = async (values: User) => {
-    const { t, forgotPassword } = this.props;
+    const { t, forgotPassword: actionForgotPassword } = this.props;
 
     this.setState({ sent: true });
     try {
-      await forgotPassword(values);
+      await actionForgotPassword(values);
     } catch (e) {
       throw new FormError(t('forgotPass.errorMsg'), e);
     }
@@ -38,5 +38,5 @@ class ForgotPassword extends React.Component<ForgotPasswordProps> {
 
 export default connect<{}, {}, ForgotPasswordProps>(
   null,
-  { forgotPassword: FORGOT_PASSWORD }
+  { forgotPassword }
 )(translate('userSignUp')(ForgotPassword));
diff --git a/modules/user/client-react/signUp/containers/ForgotPassword.tsx b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
index 83d9e27..b4a5407 100644
--- a/modules/user/client-react/signUp/containers/ForgotPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ForgotPassword.tsx
@@ -7,21 +7,21 @@ import { FormError } from '@restapp/forms-client-react';
 import ForgotPasswordView from '../components/ForgotPasswordView';
 import { CommonProps } from '../../types';
 import { ForgotPasswordSubmitProps } from '../types';
-import { FORGOT_PASSWORD } from '../actions';
+import { forgotPassword } from '../actions';
 
 interface ForgotPasswordProps extends CommonProps {
   forgotPassword: (values: ForgotPasswordSubmitProps) => any;
 }
 
 const ForgotPassword: React.FunctionComponent<ForgotPasswordProps> = props => {
-  const { t, forgotPassword } = props;
+  const { t, forgotPassword: actionForgotPassword } = props;
 
   const [sent, setSent] = useState(false);
 
   const onSubmit = async (values: ForgotPasswordSubmitProps) => {
     setSent(true);
     try {
-      await forgotPassword(values);
+      await actionForgotPassword(values);
     } catch (e) {
       throw new FormError(t('forgotPass.errorMsg'), e);
     }
@@ -32,5 +32,5 @@ const ForgotPassword: React.FunctionComponent<ForgotPasswordProps> = props => {
 
 export default connect(
   null,
-  { forgotPassword: FORGOT_PASSWORD }
+  { forgotPassword }
 )(translate('userSignUp')(ForgotPassword));
diff --git a/modules/user/client-react/signUp/containers/Login.native.tsx b/modules/user/client-react/signUp/containers/Login.native.tsx
index b22b0c9..1ce148b 100644
--- a/modules/user/client-react/signUp/containers/Login.native.tsx
+++ b/modules/user/client-react/signUp/containers/Login.native.tsx
@@ -8,7 +8,7 @@ import authentication from '@restapp/authentication-client-react';
 import LoginView from '../components/LoginView.native';
 import { CommonProps } from '../../types';
 import { LoginSubmitProps } from '../types';
-import { LOGIN } from '../actions';
+import { login } from '../actions';
 
 export interface LoginProps extends CommonProps {
   login?: (values: LoginSubmitProps) => Promise<void> | any;
@@ -16,10 +16,10 @@ export interface LoginProps extends CommonProps {
 
 class Login extends React.Component<LoginProps> {
   public onSubmit = async (values: LoginSubmitProps) => {
-    const { t, login } = this.props;
+    const { t, login: actionLogin } = this.props;
 
     try {
-      await login(values);
+      await actionLogin(values);
     } catch (e) {
       const data = e.response && e.response.data;
       throw new FormError(t('reg.errorMsg'), data);
@@ -34,5 +34,5 @@ class Login extends React.Component<LoginProps> {
 
 export default connect<{}, {}, LoginProps>(
   null,
-  { login: LOGIN }
+  { login }
 )(translate('userSignUp')(Login));
diff --git a/modules/user/client-react/signUp/containers/Login.tsx b/modules/user/client-react/signUp/containers/Login.tsx
index fd8b3ab..83e45ac 100644
--- a/modules/user/client-react/signUp/containers/Login.tsx
+++ b/modules/user/client-react/signUp/containers/Login.tsx
@@ -9,14 +9,14 @@ import { setItem } from '@restapp/core-common/clientStorage';
 import LoginView from '../components/LoginView';
 import { CommonProps } from '../../types';
 import { LoginSubmitProps } from '../types';
-import { LOGIN } from '../actions';
+import { login } from '../actions';
 
 export interface LoginProps extends CommonProps {
   login?: (values: LoginSubmitProps) => any;
 }
 
 const Login: React.FunctionComponent<LoginProps> = props => {
-  const { t, history, login } = props;
+  const { t, history, login: actionLogin } = props;
   const {
     location: { search }
   } = history;
@@ -60,7 +60,7 @@ const Login: React.FunctionComponent<LoginProps> = props => {
 
   const onSubmit = async (values: LoginSubmitProps) => {
     try {
-      await login(values);
+      await actionLogin(values);
     } catch (e) {
       const data = e.response && e.response.data;
 
@@ -76,5 +76,5 @@ const Login: React.FunctionComponent<LoginProps> = props => {
 
 export default connect(
   null,
-  { login: LOGIN }
+  { login }
 )(translate('userSignUp')(Login));
diff --git a/modules/user/client-react/signUp/containers/Register.native.tsx b/modules/user/client-react/signUp/containers/Register.native.tsx
index d849619..b12774d 100644
--- a/modules/user/client-react/signUp/containers/Register.native.tsx
+++ b/modules/user/client-react/signUp/containers/Register.native.tsx
@@ -6,7 +6,7 @@ import { FormError } from '@restapp/forms-client-react';
 
 import RegisterView from '../components/RegisterView.native';
 import settings from '../../../../../settings';
-import { REGISTER } from '../actions';
+import { register } from '../actions';
 import { CommonProps } from '../../types';
 import { RegisterSubmitProps } from '../types';
 
@@ -24,10 +24,10 @@ class Register extends React.Component<RegisterProps, RegisterState> {
   };
 
   public onSubmit = async (values: RegisterSubmitProps) => {
-    const { t, register, navigation } = this.props;
+    const { t, register: actionRegister, navigation } = this.props;
 
     try {
-      await await register(values);
+      await await actionRegister(values);
     } catch (e) {
       const data = e.response && e.response.data;
       throw new FormError(t('reg.errorMsg'), data);
@@ -58,5 +58,5 @@ class Register extends React.Component<RegisterProps, RegisterState> {
 
 export default connect<{}, {}, RegisterProps>(
   null,
-  { register: REGISTER }
+  { register }
 )(translate('userSignUp')(Register));
diff --git a/modules/user/client-react/signUp/containers/Register.tsx b/modules/user/client-react/signUp/containers/Register.tsx
index 821545d..40d839e 100644
--- a/modules/user/client-react/signUp/containers/Register.tsx
+++ b/modules/user/client-react/signUp/containers/Register.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 import RegisterView from '../components/RegisterView';
 import { CommonProps } from '../../types';
 import { RegisterSubmitProps } from '../types';
-import { REGISTER } from '../actions';
+import { register } from '../actions';
 import settings from '../../../../../settings';
 
 interface RegisterProps extends CommonProps {
@@ -15,13 +15,13 @@ interface RegisterProps extends CommonProps {
 }
 
 const Register: React.FunctionComponent<RegisterProps> = props => {
-  const { t, register, history } = props;
+  const { t, register: actionRegister, history } = props;
 
   const [isRegistered, setIsRegistered] = React.useState(false);
 
   const onSubmit = async (values: RegisterSubmitProps) => {
     try {
-      await await register(values);
+      await await actionRegister(values);
     } catch (e) {
       const data = e.response && e.response.data;
       throw new FormError(t('reg.errorMsg'), data);
@@ -39,5 +39,5 @@ const Register: React.FunctionComponent<RegisterProps> = props => {
 
 export default connect(
   null,
-  { register: REGISTER }
+  { register }
 )(translate('userSignUp')(Register));
diff --git a/modules/user/client-react/signUp/containers/ResetPassword.native.tsx b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
index 02e615f..227d410 100644
--- a/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.native.tsx
@@ -5,7 +5,7 @@ import { translate } from '@restapp/i18n-client-react';
 import { FormError } from '@restapp/forms-client-react';
 
 import ResetPasswordView from '../components/ResetPasswordView.native';
-import { RESET_PASSWORD } from '../actions';
+import { resetPassword } from '../actions';
 import { CommonProps } from '../../types';
 import { ResetPasswordSubmitProps } from '../types';
 
@@ -19,11 +19,11 @@ interface ResetPasswordProps extends CommonProps {
 }
 
 const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
-  const { t, resetPassword, navigation, match } = props;
+  const { t, resetPassword: actionResetPassword, navigation, match } = props;
 
   const onSubmit = async (values: ResetPasswordSubmitProps) => {
     try {
-      await resetPassword({ ...values, token: match.params.token });
+      await actionResetPassword({ ...values, token: match.params.token });
     } catch (e) {
       throw new FormError(t('resetPass.errorMsg'), e);
     }
@@ -35,5 +35,5 @@ const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
 
 export default connect<{}, {}, ResetPasswordProps>(
   null,
-  { resetPassword: RESET_PASSWORD }
+  { resetPassword }
 )(translate('userSignUp')(ResetPassword));
diff --git a/modules/user/client-react/signUp/containers/ResetPassword.tsx b/modules/user/client-react/signUp/containers/ResetPassword.tsx
index 7e13469..976c4dc 100644
--- a/modules/user/client-react/signUp/containers/ResetPassword.tsx
+++ b/modules/user/client-react/signUp/containers/ResetPassword.tsx
@@ -7,7 +7,7 @@ import { FormError } from '@restapp/forms-client-react';
 import ResetPasswordView from '../components/ResetPasswordView';
 
 import { ResetPasswordSubmitProps } from '../types';
-import { RESET_PASSWORD } from '../actions';
+import { resetPassword } from '../actions';
 import { CommonProps } from '../../types';
 
 interface Token {
@@ -20,11 +20,11 @@ interface ResetPasswordProps extends CommonProps {
 }
 
 const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
-  const { t, resetPassword, history, match } = props;
+  const { t, resetPassword: actionResetPassword, history, match } = props;
 
   const onSubmit = async (values: ResetPasswordSubmitProps) => {
     try {
-      await resetPassword({ ...values, token: match.params.token });
+      await actionResetPassword({ ...values, token: match.params.token });
     } catch (e) {
       throw new FormError(t('resetPass.errorMsg'), e);
     }
@@ -36,5 +36,5 @@ const ResetPassword: React.FunctionComponent<ResetPasswordProps> = props => {
 
 export default connect(
   null,
-  { resetPassword: RESET_PASSWORD }
+  { resetPassword }
 )(translate('userSignUp')(ResetPassword));
diff --git a/modules/user/client-react/users/actions/addUser.ts b/modules/user/client-react/users/actions/addUser.ts
index 8b30ece..dc50692 100644
--- a/modules/user/client-react/users/actions/addUser.ts
+++ b/modules/user/client-react/users/actions/addUser.ts
@@ -2,9 +2,9 @@ import axios from 'axios';
 import { User } from '../../types';
 import { ActionType, ActionFunction } from '.';
 
-const ADD_USER: ActionFunction<ActionType, User> = user => ({
+const addUser: ActionFunction<ActionType, User> = user => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/addUser`, { ...user })
 });
 
-export default ADD_USER;
+export default addUser;
diff --git a/modules/user/client-react/users/actions/deleteUser.ts b/modules/user/client-react/users/actions/deleteUser.ts
index 70f72a2..e74fc52 100644
--- a/modules/user/client-react/users/actions/deleteUser.ts
+++ b/modules/user/client-react/users/actions/deleteUser.ts
@@ -1,11 +1,11 @@
 import axios from 'axios';
 import { ActionType, ActionFunction } from '.';
 
-const DELETE_USER: ActionFunction<ActionType, number> = id => ({
+const deleteUser: ActionFunction<ActionType, number> = id => ({
   types: {
     SUCCESS: ActionType.DELETE_USER
   },
   APICall: () => axios.delete(`${__API_URL__}/deleteUser`, { data: { id } })
 });
 
-export default DELETE_USER;
+export default deleteUser;
diff --git a/modules/user/client-react/users/actions/editUser.ts b/modules/user/client-react/users/actions/editUser.ts
index 339e6a6..f75cfd3 100644
--- a/modules/user/client-react/users/actions/editUser.ts
+++ b/modules/user/client-react/users/actions/editUser.ts
@@ -2,9 +2,9 @@ import axios from 'axios';
 import { ActionType, ActionFunction } from '.';
 import { User } from '../../types';
 
-const EDIT_USER: ActionFunction<ActionType, User> = user => ({
+const editUser: ActionFunction<ActionType, User> = user => ({
   types: {},
   APICall: () => axios.post(`${__API_URL__}/editUser`, { ...user })
 });
 
-export default EDIT_USER;
+export default editUser;
diff --git a/modules/user/client-react/users/actions/index.ts b/modules/user/client-react/users/actions/index.ts
index b1f91e0..ded0962 100644
--- a/modules/user/client-react/users/actions/index.ts
+++ b/modules/user/client-react/users/actions/index.ts
@@ -1,8 +1,8 @@
-export { default as ADD_USER } from './addUser';
-export { default as EDIT_USER } from './editUser';
-export { default as DELETE_USER } from './deleteUser';
-export { default as USER } from './user';
-export { default as USERS } from './users';
+export { default as addUser } from './addUser';
+export { default as editUser } from './editUser';
+export { default as deleteUser } from './deleteUser';
+export { default as user } from './user';
+export { default as users } from './users';
 
 export * from '../../actions';
 export { ActionType } from '../reducers';
diff --git a/modules/user/client-react/users/actions/user.ts b/modules/user/client-react/users/actions/user.ts
index f652e77..16ee395 100644
--- a/modules/user/client-react/users/actions/user.ts
+++ b/modules/user/client-react/users/actions/user.ts
@@ -1,11 +1,11 @@
 import axios from 'axios';
 import { ActionFunction, ActionType } from '.';
 
-const USER: ActionFunction<ActionType, number> = id => ({
+const user: ActionFunction<ActionType, number> = id => ({
   types: {
     SUCCESS: ActionType.SET_USER
   },
   APICall: () => axios.get(`${__API_URL__}/user/${id}`)
 });
 
-export default USER;
+export default user;
diff --git a/modules/user/client-react/users/actions/users.ts b/modules/user/client-react/users/actions/users.ts
index 470088f..56f6ffc 100644
--- a/modules/user/client-react/users/actions/users.ts
+++ b/modules/user/client-react/users/actions/users.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { ActionType, ActionFunction } from '.';
 import { OrderBy, Filter } from '../types';
 
-const USERS: ActionFunction<ActionType, OrderBy, Filter, ActionType> = (
+const users: ActionFunction<ActionType, OrderBy, Filter, ActionType> = (
   orderBy: OrderBy,
   filter: Filter,
   type: ActionType
@@ -16,4 +16,4 @@ const USERS: ActionFunction<ActionType, OrderBy, Filter, ActionType> = (
   APICall: () => axios.post(`${__API_URL__}/users`, { filter, orderBy })
 });
 
-export default USERS;
+export default users;
diff --git a/modules/user/client-react/users/containers/UserAdd.tsx b/modules/user/client-react/users/containers/UserAdd.tsx
index 737ab1b..f921bcd 100644
--- a/modules/user/client-react/users/containers/UserAdd.tsx
+++ b/modules/user/client-react/users/containers/UserAdd.tsx
@@ -8,14 +8,14 @@ import { FormError } from '@restapp/forms-client-react';
 import UserAddView from '../components/UserAddView';
 import UserFormatter from '../../helpers/UserFormatter';
 import { User, CommonProps } from '../../types';
-import { ADD_USER } from '../actions';
+import { addUser } from '../actions';
 
 interface UserAddProps extends CommonProps {
   addUser?: (values: User) => any;
 }
 
 const UserAdd: React.FunctionComponent<UserAddProps> = props => {
-  const { addUser, t, history, navigation } = props;
+  const { addUser: actionAddUser, t, history, navigation } = props;
 
   const onSubmit = async (values: User) => {
     let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
@@ -23,7 +23,7 @@ const UserAdd: React.FunctionComponent<UserAddProps> = props => {
     userValues = UserFormatter.trimExtraSpaces(userValues);
 
     try {
-      await addUser(userValues as User);
+      await actionAddUser(userValues as User);
     } catch (e) {
       const data = e.response && e.response.data;
       throw new FormError(t('userAdd.errorMsg'), data);
@@ -42,5 +42,5 @@ const UserAdd: React.FunctionComponent<UserAddProps> = props => {
 
 export default connect<{}, {}, UserAddProps>(
   null,
-  { addUser: ADD_USER }
+  { addUser }
 )(translate('userUsers')(UserAdd));
diff --git a/modules/user/client-react/users/containers/UserEdit.native.tsx b/modules/user/client-react/users/containers/UserEdit.native.tsx
index 8e337d3..ee1f49f 100644
--- a/modules/user/client-react/users/containers/UserEdit.native.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.native.tsx
@@ -8,10 +8,10 @@ import { FormError } from '@restapp/forms-client-react';
 import UserEditView from '../components/UserEditView.native';
 import UserFormatter from '../../helpers/UserFormatter';
 import { CommonProps, User } from '../../types/';
-import { USER, EDIT_USER } from '../actions';
+import { user, editUser } from '../actions';
 
 interface UserEditProps extends CommonProps {
-  user?: User;
+  editableUser?: User;
   currentUser?: User;
   loading?: boolean;
   editUser?: (value: User) => any;
@@ -29,14 +29,14 @@ class UserEdit extends React.Component<UserEditProps> {
     this.setState({ ready: true });
   }
   public onSubmit = async (values: User) => {
-    const { user, editUser, t, navigation } = this.props;
+    const { editableUser, editUser: actionEditUser, t, navigation } = this.props;
 
     let userValues = pick(values, ['username', 'email', 'role', 'isActive', 'password', 'firstName', 'lastName']);
 
     userValues = UserFormatter.trimExtraSpaces(userValues);
 
     try {
-      await editUser({ id: user.id, ...userValues } as any);
+      await actionEditUser({ id: editableUser.id, ...userValues } as any);
     } catch (e) {
       const data = e.response && e.response.data;
       throw new FormError(t('userEdit.errorMsg'), data);
@@ -48,15 +48,17 @@ class UserEdit extends React.Component<UserEditProps> {
   };
 
   public render() {
-    return this.state.ready ? <UserEditView onSubmit={this.onSubmit} {...this.props} /> : null;
+    return this.state.ready ? (
+      <UserEditView onSubmit={this.onSubmit} {...this.props} user={this.props.editableUser} />
+    ) : null;
   }
 }
 
 export default connect<{}, {}, UserEditProps>(
-  ({ usersReducer: { user }, signUpReducer: { currentUser, loading } }: any) => ({
-    user,
+  ({ usersReducer: { user: editableUser }, signUpReducer: { currentUser, loading } }: any) => ({
+    editableUser,
     currentUser,
     loading
   }),
-  { getUser: USER, editUser: EDIT_USER }
+  { getUser: user, editUser }
 )(translate('userUsers')(UserEdit));
diff --git a/modules/user/client-react/users/containers/UserEdit.tsx b/modules/user/client-react/users/containers/UserEdit.tsx
index abb842b..7463511 100644
--- a/modules/user/client-react/users/containers/UserEdit.tsx
+++ b/modules/user/client-react/users/containers/UserEdit.tsx
@@ -8,10 +8,10 @@ import { FormError } from '@restapp/forms-client-react';
 import UserEditView from '../components/UserEditView';
 import UserFormatter from '../../helpers/UserFormatter';
 import { User, CommonProps } from '../../types';
-import { USER, EDIT_USER } from '../actions';
+import { user, editUser } from '../actions';
 
 interface UserEditProps extends CommonProps {
-  user?: User;
+  editableUser?: User;
   editUser?: (value: User) => any;
   location?: any;
   match?: any;
@@ -19,7 +19,7 @@ interface UserEditProps extends CommonProps {
 }
 
 const UserEdit: React.FunctionComponent<UserEditProps> = props => {
-  const { user, editUser, t, history, match, getUser } = props;
+  const { editableUser, editUser: actionEditUser, t, history, match, getUser } = props;
   const [ready, setReady] = useState(false);
   useEffect(() => {
     (async () => {
@@ -38,7 +38,7 @@ const UserEdit: React.FunctionComponent<UserEditProps> = props => {
     userValues = UserFormatter.trimExtraSpaces(userValues);
 
     try {
-      await editUser({ id: user.id, ...userValues } as any);
+      await actionEditUser({ id: editableUser.id, ...userValues } as any);
     } catch (e) {
       const data = e.response && e.response.data;
       throw new FormError(t('userEdit.errorMsg'), data);
@@ -49,12 +49,12 @@ const UserEdit: React.FunctionComponent<UserEditProps> = props => {
     }
   };
 
-  return ready ? <UserEditView onSubmit={onSubmit} {...props} /> : null;
+  return ready ? <UserEditView onSubmit={onSubmit} {...props} user={editableUser} /> : null;
 };
 
 export default connect(
-  ({ usersReducer: { user } }: any) => ({
-    user
+  ({ usersReducer: { user: editableUser } }: any) => ({
+    editableUser
   }),
-  { getUser: USER, editUser: EDIT_USER }
+  { getUser: user, editUser }
 )(translate('userUsers')(UserEdit));
diff --git a/modules/user/client-react/users/containers/UserOperations.tsx b/modules/user/client-react/users/containers/UserOperations.tsx
index f27dd29..99e1960 100644
--- a/modules/user/client-react/users/containers/UserOperations.tsx
+++ b/modules/user/client-react/users/containers/UserOperations.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { USERS, DELETE_USER } from '../actions';
+import { users, deleteUser } from '../actions';
 import { UserRole } from '../../types';
 import { OrderBy } from '../types';
 
@@ -25,18 +25,18 @@ const withUsers = (Component: React.ComponentType<any>) => {
     }
   }
   return connect(
-    ({ usersReducer: { usersLoading, users } }: any) => ({
+    ({ usersReducer: { usersLoading, users: usersList } }: any) => ({
       loading: usersLoading,
-      users
+      users: usersList
     }),
-    { getUsers: USERS }
+    { getUsers: users }
   )(WithUsers);
 };
 
 const withUsersDeleting = (Component: React.ComponentType<any>) =>
   connect(
     null,
-    { deleteUser: DELETE_USER }
+    { deleteUser }
   )(Component);
 
 const withSortAndFilter = (Component: React.ComponentType<any>) => {
@@ -64,7 +64,7 @@ const withSortAndFilter = (Component: React.ComponentType<any>) => {
       orderBy,
       filter
     }),
-    { sortAndFilter: USERS }
+    { sortAndFilter: users }
   )(WithFilterUpdating);
 };
 

From 83f442b1cd5937fcae77763ea0f84c33c9fa5905 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 7 Jun 2019 12:45:50 +0300
Subject: [PATCH 094/104] Fix prew commit

---
 .eslintrc.base.json                           |    2 +-
 .travis.yml                                   |    2 +-
 config/app.js                                 |    2 +-
 jest-transform-i18next.js                     |   24 -
 modules/core/client-react-native/App.tsx      |    5 +-
 .../{Intro.test.native.tsx => Intro.jest.tsx} |    0
 modules/core/client-react/Main.tsx            |   12 +-
 modules/core/client-react/RedBox.tsx          |    2 +-
 modules/core/client-react/app.tsx             |    4 +-
 modules/core/common/log.ts                    |    2 +-
 modules/core/server-ts/app.ts                 |    9 +-
 modules/favicon/common/index.js               |   13 +-
 .../client-react-native/ClientModule.ts       |    2 +-
 modules/module/client-react/BaseModule.ts     |    2 +-
 modules/module/client-react/ClientModule.ts   |   32 +-
 modules/module/common/CommonModule.ts         |    2 +-
 modules/module/server-ts/ServerModule.ts      |    2 +-
 ...eNotFound.test.ts => PageNotFound.spec.js} |    3 +-
 modules/testing/client-react/Renderer.tsx     |   21 +-
 modules/testing/server-ts/integrationSetup.ts |   15 +-
 ...{Validation.test.ts => Validation.spec.ts} |   33 +-
 package.json                                  |   12 +-
 packages/client/.zenrc.js                     |    1 +
 packages/client/babel.config.js               |   52 +-
 packages/client/jest.config.js                |   22 -
 packages/client/package.json                  |    6 +-
 packages/client/src/index.ts                  |    4 +-
 packages/common/.zenrc.js                     |   16 +-
 packages/common/package.json                  |    4 +-
 packages/mobile/.zenrc.js                     |    5 +
 packages/mobile/babel.config.js               |   62 +-
 packages/mobile/jest.config.js                |   21 -
 packages/mobile/package.json                  |   42 +-
 packages/mobile/src/index.ts                  |    4 +-
 packages/server/babel.config.js               |   50 +-
 packages/server/jest.config.js                |   27 -
 packages/server/jest.resolver.js              |   28 -
 packages/server/knexfile.js                   |   12 +-
 packages/server/package.json                  |    5 +-
 packages/server/src/__tests__/entry.ts        |    1 +
 packages/server/src/__tests__/jestSetup.js    |   26 -
 packages/server/src/index.ts                  |    4 +-
 tools/babel.config.js                         |   21 -
 tools/cli.js                                  |   11 +-
 .../client-react/__tests__/Module.spec.ts     |    4 +-
 typings/typings.d.ts                          |    5 +
 yarn.lock                                     | 4503 +++++++----------
 47 files changed, 1935 insertions(+), 3202 deletions(-)
 delete mode 100644 jest-transform-i18next.js
 rename modules/core/client-react-native/__tests__/{Intro.test.native.tsx => Intro.jest.tsx} (100%)
 rename modules/page-not-found/client-react/__tests__/{PageNotFound.test.ts => PageNotFound.spec.js} (82%)
 rename modules/validation/common-react/__tests__/{Validation.test.ts => Validation.spec.ts} (83%)
 delete mode 100644 packages/client/jest.config.js
 delete mode 100644 packages/mobile/jest.config.js
 delete mode 100644 packages/server/jest.config.js
 delete mode 100644 packages/server/jest.resolver.js
 create mode 100644 packages/server/src/__tests__/entry.ts
 delete mode 100644 packages/server/src/__tests__/jestSetup.js
 delete mode 100644 tools/babel.config.js

diff --git a/.eslintrc.base.json b/.eslintrc.base.json
index 6a4e909..7ba5122 100644
--- a/.eslintrc.base.json
+++ b/.eslintrc.base.json
@@ -31,7 +31,7 @@
     ]
   },
   "env": {
-    "jest": true
+    "mocha": true
   },
   "globals": {
     "fetch": true,
diff --git a/.travis.yml b/.travis.yml
index ceee7d7..ae2c30b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '10'
+- '9'
 cache:
   directories:
   - "$HOME/.cache/yarn"
diff --git a/config/app.js b/config/app.js
index cb8c9b8..9e590e4 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,7 +1,7 @@
 export default {
   name: 'REST App',
   logging: {
-    level: (process.env.npm_config_argv || '').search(/(watch|start)/) >= 0 ? 'debug' : 'info',
+    level: ['production'].indexOf(process.env.NODE_ENV) < 0 ? 'debug' : 'info',
     debugSQL: false
   },
   // Check here for Windows and Mac OS X: https://code.visualstudio.com/docs/editor/command-line#_opening-vs-code-with-urls
diff --git a/jest-transform-i18next.js b/jest-transform-i18next.js
deleted file mode 100644
index 4ebc274..0000000
--- a/jest-transform-i18next.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-module.exports = {
-  process: function() {
-    const pathname = arguments[1];
-    const dir = path.dirname(pathname);
-    const locales = fs.readdirSync(dir);
-    const result = {};
-    for (const locale of locales) {
-      if (fs.statSync(path.join(dir, locale)).isDirectory()) {
-        const localeFiles = fs.readdirSync(path.join(dir, locale));
-        for (const localeFile of localeFiles) {
-          if (localeFile.indexOf('.json') >= 0) {
-            result[locale] = JSON.parse(fs.readFileSync(path.join(dir, locale, localeFile), 'utf8'));
-          }
-        }
-      }
-    }
-    return {
-      code: `module.exports = ${JSON.stringify(result)};`
-    };
-  }
-};
diff --git a/modules/core/client-react-native/App.tsx b/modules/core/client-react-native/App.tsx
index 5cabe84..2603844 100644
--- a/modules/core/client-react-native/App.tsx
+++ b/modules/core/client-react-native/App.tsx
@@ -3,7 +3,6 @@ import { Provider } from 'react-redux';
 import url from 'url';
 
 import ClientModule from '@restapp/module-client-react-native';
-import settings from '../../../settings';
 import createReduxStore from '../../../packages/common/createReduxStore';
 import log from '../../../packages/common/log';
 const { protocol, pathname, port } = url.parse(__API_URL__);
@@ -31,9 +30,7 @@ export default class Main extends React.Component<MainProps> {
       modules.reduxMiddlewares
     );
 
-    if (!__TEST__ || settings.app.logging.level === 'debug') {
-      log.info(`Connecting to REST backend at: ${apiUrl}`);
-    }
+    log.info(`Connecting to REST backend at: ${apiUrl}`);
 
     return modules.getWrappedRoot(<Provider store={store}>{modules.getDataRoot(modules.router)}</Provider>);
   }
diff --git a/modules/core/client-react-native/__tests__/Intro.test.native.tsx b/modules/core/client-react-native/__tests__/Intro.jest.tsx
similarity index 100%
rename from modules/core/client-react-native/__tests__/Intro.test.native.tsx
rename to modules/core/client-react-native/__tests__/Intro.jest.tsx
diff --git a/modules/core/client-react/Main.tsx b/modules/core/client-react/Main.tsx
index 4af0ba8..479b27d 100644
--- a/modules/core/client-react/Main.tsx
+++ b/modules/core/client-react/Main.tsx
@@ -12,9 +12,7 @@ import createReduxStore, { getStoreReducer } from '../../../packages/common/crea
 import log from '../../../packages/common/log';
 import settings from '../../../settings';
 
-if (!__TEST__ || settings.app.logging.level === 'debug') {
-  log.info(`Connecting to REST backend at: ${apiUrl}`);
-}
+log.info(`Connecting to REST backend at: ${apiUrl}`);
 
 const ref: { modules: ClientModule; store: Store } = {
   modules: null,
@@ -37,11 +35,9 @@ const logPageView = (location: any) => {
   ReactGA.pageview(location.pathname);
 };
 
-if (!__TEST__) {
-  // Initialize Google Analytics and send events on each location change
-  ReactGA.initialize(settings.analytics.ga.trackingId);
-  logPageView(window.location);
-}
+// Initialize Google Analytics and send events on each location change
+ReactGA.initialize(settings.analytics.ga.trackingId);
+logPageView(window.location);
 
 history.listen(location => logPageView(location));
 
diff --git a/modules/core/client-react/RedBox.tsx b/modules/core/client-react/RedBox.tsx
index 91bad2f..cb19e6b 100644
--- a/modules/core/client-react/RedBox.tsx
+++ b/modules/core/client-react/RedBox.tsx
@@ -23,7 +23,7 @@ export default class RedBox extends React.Component<RedBoxProps, RedBoxState> {
   }
 
   public componentDidMount() {
-    if (!this.state.mapped && !__TEST__) {
+    if (!this.state.mapped) {
       mapStackTrace(this.props.error.stack, (mappedStack: string[]) => {
         const processStack = __DEV__
           ? fetch('/servdir')
diff --git a/modules/core/client-react/app.tsx b/modules/core/client-react/app.tsx
index 8a36f22..1da39a1 100644
--- a/modules/core/client-react/app.tsx
+++ b/modules/core/client-react/app.tsx
@@ -4,13 +4,13 @@ import ClientModule from '@restapp/module-client-react';
 
 // Virtual module, generated in-memory by @larix/zen, contains count of backend rebuilds
 // tslint:disable-next-line
-import 'backend_reload';
+import "backend_reload";
 
 import log from '../../../packages/common/log';
 import { onAppCreate as onCreateMain, Main, onAppDispose } from './Main';
 
 const renderFunc = __SSR__ ? hydrate : render;
-const root = __TEST__ ? document.createElement('div') : document.getElementById('root');
+const root = document.getElementById('root');
 
 let frontendReloadCount = 0;
 
diff --git a/modules/core/common/log.ts b/modules/core/common/log.ts
index 4920e80..4b28bb4 100644
--- a/modules/core/common/log.ts
+++ b/modules/core/common/log.ts
@@ -9,7 +9,7 @@ const log = minilog(loggerName);
 (log as any).suggest.defaultResult = false;
 (log as any).suggest.clear().allow(loggerName, settings.app.logging.level);
 
-if (__DEV__ && __SERVER__ && !__TEST__) {
+if (__DEV__ && __SERVER__) {
   const consoleLog = global.console.log;
   global.console.log = (...args: any[]) => {
     if (args.length === 1 && typeof args[0] === 'string' && args[0].match(/^\[(HMR|WDS)\]/)) {
diff --git a/modules/core/server-ts/app.ts b/modules/core/server-ts/app.ts
index ae2b214..bfb733d 100644
--- a/modules/core/server-ts/app.ts
+++ b/modules/core/server-ts/app.ts
@@ -14,9 +14,12 @@ const createServerApp = (modules: ServerModule) => {
   // Don't rate limit heroku
   app.enable('trust proxy');
 
-  (modules.beforeware || []).forEach(applyBeforeware => applyBeforeware(app, modules.appContext));
-
-  (modules.middleware || []).forEach(applyMiddleware => applyMiddleware(app, modules.appContext));
+  if (modules.beforeware) {
+    modules.beforeware.forEach(applyBeforeware => applyBeforeware(app, modules.appContext));
+  }
+  if (modules.middleware) {
+    modules.middleware.forEach(applyMiddleware => applyMiddleware(app, modules.appContext));
+  }
 
   if (__DEV__) {
     app.get('/servdir', (req, res) => res.send(process.cwd() + path.sep));
diff --git a/modules/favicon/common/index.js b/modules/favicon/common/index.js
index 6557286..b1729b3 100644
--- a/modules/favicon/common/index.js
+++ b/modules/favicon/common/index.js
@@ -1,7 +1,6 @@
-if (!__TEST__) {
-  // Favicon.ico should not be hashed, since some browsers expect it to be exactly on /favicon.ico URL
-  require('!file-loader?name=[name].[ext]!./assets/favicon.ico'); // eslint-disable-line
-  // Require all files from assets dir recursively addding them into assets.json
-  let req = require.context('!file-loader?name=[hash].[ext]!./assets', true, /.*/);
-  req.keys().map(req);
-}
+// Favicon.ico should not be hashed, since some browsers expect it to be exactly on /favicon.ico URL
+require('!file-loader?name=[name].[ext]!./assets/favicon.ico'); // eslint-disable-line
+
+// Require all files from assets dir recursively adding them into assets.json
+let req = require.context('!file-loader?name=[hash].[ext]!./assets', true, /.*/);
+req.keys().map(req);
diff --git a/modules/module/client-react-native/ClientModule.ts b/modules/module/client-react-native/ClientModule.ts
index cd141b6..56357dd 100644
--- a/modules/module/client-react-native/ClientModule.ts
+++ b/modules/module/client-react-native/ClientModule.ts
@@ -32,7 +32,7 @@ class ClientModule extends BaseModule {
    * @returns item list for React Navigation drawer.
    */
   get drawerItems() {
-    return merge({}, ...(this.drawerItem || []));
+    return merge({}, ...this.drawerItem);
   }
 }
 
diff --git a/modules/module/client-react/BaseModule.ts b/modules/module/client-react/BaseModule.ts
index 2236c76..8fd9aca 100644
--- a/modules/module/client-react/BaseModule.ts
+++ b/modules/module/client-react/BaseModule.ts
@@ -48,7 +48,7 @@ class BaseModule extends CommonModule {
    * @returns Redux reducers
    */
   get reducers() {
-    return merge({}, ...(this.reducer || []));
+    return merge({}, ...this.reducer);
   }
 
   /**
diff --git a/modules/module/client-react/ClientModule.ts b/modules/module/client-react/ClientModule.ts
index d8c9216..f19cb31 100644
--- a/modules/module/client-react/ClientModule.ts
+++ b/modules/module/client-react/ClientModule.ts
@@ -40,9 +40,8 @@ class ClientModule extends BaseModule {
    * @returns client-side React route components list
    */
   get routes() {
-    return (this.route || []).map(
-      (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
-        React.cloneElement(component, { key: component.key || idx + items.length })
+    return this.route.map((component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
+      React.cloneElement(component, { key: component.key || idx + items.length })
     );
   }
 
@@ -50,24 +49,27 @@ class ClientModule extends BaseModule {
    * @returns client-side top left navbar link component list
    */
   get navItems() {
-    return (this.navItem || []).map(
-      (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
-        React.cloneElement(component, {
-          key: component.key || idx + items.length
-        })
-    );
+    return this.navItem
+      ? this.navItem.map((component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
+          React.cloneElement(component, {
+            key: component.key || idx + items.length
+          })
+        )
+      : [];
   }
 
   /**
    * @returns client-side top right navbar link component list
    */
   get navItemsRight() {
-    return (this.navItemRight || []).map(
-      (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
-        React.cloneElement(component, {
-          key: component.key || idx + items.length
-        })
-    );
+    return this.navItemRight
+      ? this.navItemRight.map(
+          (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
+            React.cloneElement(component, {
+              key: component.key || idx + items.length
+            })
+        )
+      : [];
   }
 
   /**
diff --git a/modules/module/common/CommonModule.ts b/modules/module/common/CommonModule.ts
index b08a3c4..ea03668 100644
--- a/modules/module/common/CommonModule.ts
+++ b/modules/module/common/CommonModule.ts
@@ -32,7 +32,7 @@ class CommonModule extends Module {
    * @returns localization for i18next library
    */
   get localizations() {
-    return this.localization || [];
+    return this.localization;
   }
 }
 
diff --git a/modules/module/server-ts/ServerModule.ts b/modules/module/server-ts/ServerModule.ts
index fd07c5e..7d6d8a3 100644
--- a/modules/module/server-ts/ServerModule.ts
+++ b/modules/module/server-ts/ServerModule.ts
@@ -113,7 +113,7 @@ class ServerModule extends CommonModule {
     const appContext = this.appContext;
     let context = {};
 
-    for (const createContextFunc of this.createContextFunc || []) {
+    for (const createContextFunc of this.createContextFunc) {
       context = merge(context, await createContextFunc({ req, res, appContext }));
     }
     return context;
diff --git a/modules/page-not-found/client-react/__tests__/PageNotFound.test.ts b/modules/page-not-found/client-react/__tests__/PageNotFound.spec.js
similarity index 82%
rename from modules/page-not-found/client-react/__tests__/PageNotFound.test.ts
rename to modules/page-not-found/client-react/__tests__/PageNotFound.spec.js
index 260a5c6..0c34aba 100644
--- a/modules/page-not-found/client-react/__tests__/PageNotFound.test.ts
+++ b/modules/page-not-found/client-react/__tests__/PageNotFound.spec.js
@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import { step } from 'mocha-steps';
 import { Renderer, updateContent } from '@restapp/testing-client-react';
 
 describe('Page not found example UI works', () => {
@@ -6,7 +7,7 @@ describe('Page not found example UI works', () => {
   let app;
   let content;
 
-  it('404 page renders with sample text', () => {
+  step('404 page renders with sample text', () => {
     app = renderer.mount();
     renderer.history.push('/non-existing-page');
     content = updateContent(app.container);
diff --git a/modules/testing/client-react/Renderer.tsx b/modules/testing/client-react/Renderer.tsx
index c482e24..9289ebb 100644
--- a/modules/testing/client-react/Renderer.tsx
+++ b/modules/testing/client-react/Renderer.tsx
@@ -7,21 +7,20 @@ import { Provider } from 'react-redux';
 
 import ClientModule from '@restapp/module-client-react';
 
-if (!process.env.JEST_WORKER_ID) {
-  const dom = new JSDOM('<!doctype html><html><body><div id="root"><div></body></html>');
-  (global as any).document = dom.window.document;
-  (global as any).window = dom.window;
-  // Needed by Formik >= 1.x
-  (global as any).HTMLButtonElement = dom.window.HTMLButtonElement;
-  (global as any).navigator = dom.window.navigator;
-  process.on('uncaughtException', ex => {
-    console.error('Uncaught error', ex.stack);
-  });
-}
+const dom = new JSDOM('<!doctype html><html><body><div id="root"><div></body></html>');
+(global as any).document = dom.window.document;
+(global as any).window = dom.window;
+// Needed by Formik >= 1.x
+(global as any).HTMLButtonElement = dom.window.HTMLButtonElement;
+(global as any).navigator = dom.window.navigator;
 
 // tslint:disable-next-line
 const { render } = require('./testUtils');
 
+process.on('uncaughtException', ex => {
+  console.error('Uncaught error', ex.stack);
+});
+
 const ref: { clientModules: ClientModule } = { clientModules: null };
 
 export const initRenderer = (clientModules: ClientModule) => {
diff --git a/modules/testing/server-ts/integrationSetup.ts b/modules/testing/server-ts/integrationSetup.ts
index fac70c8..321de47 100644
--- a/modules/testing/server-ts/integrationSetup.ts
+++ b/modules/testing/server-ts/integrationSetup.ts
@@ -1,31 +1,34 @@
 import chai from 'chai';
 import { Server } from 'http';
 import chaiHttp from 'chai-http';
+import WebSocket from 'ws';
 
 import { serverPromise } from '@restapp/core-server-ts';
-import { populateTestDb, knex } from '@restapp/database-server-ts';
+import { populateTestDb } from '@restapp/database-server-ts';
 
 chai.use(chaiHttp);
 chai.should();
 
 let server: Server;
 
-export const setup = async () => {
+before(async () => {
   if (!global._babelPolyfill) {
     // tslint:disable-next-line
+    require('@babel/register')({ cwd: __dirname + '/../../..', extensions: ['.js', '.ts'], ignore: [ /build\/main.js/ ] });
     require('@babel/polyfill');
   }
   await populateTestDb();
 
   server = await serverPromise;
-};
 
-export const cleanup = () => {
-  knex.destroy();
+  global.WebSocket = WebSocket;
+});
+
+after(() => {
   if (server) {
     server.close();
     delete global.__TEST_SESSION__;
   }
-};
+});
 
 export const getServer = () => server;
diff --git a/modules/validation/common-react/__tests__/Validation.test.ts b/modules/validation/common-react/__tests__/Validation.spec.ts
similarity index 83%
rename from modules/validation/common-react/__tests__/Validation.test.ts
rename to modules/validation/common-react/__tests__/Validation.spec.ts
index fa5ff89..dd9b277 100644
--- a/modules/validation/common-react/__tests__/Validation.test.ts
+++ b/modules/validation/common-react/__tests__/Validation.spec.ts
@@ -1,8 +1,9 @@
 // tslint:disable:no-unused-expression
 import { expect } from 'chai';
+import { step } from 'mocha-steps';
+import i18next from 'i18next';
 import CommonModule from '@restapp/module-common';
 import i18n from '@restapp/i18n-common-react';
-import i18next from 'i18next';
 import validation from '..';
 
 import {
@@ -20,33 +21,31 @@ import {
   Schema
 } from '../validation';
 
-(async () => {
-  await new CommonModule(i18n, validation).createApp(module);
-})();
+new CommonModule(i18n, validation).createApp(module);
 
 describe('Check if validation works', () => {
-  it('Validator "required"  works correctly', () => {
+  step('Validator "required"  works correctly', () => {
     expect(required('')).to.be.a('string');
     expect(required('work')).to.be.equal(undefined);
   });
 
-  it('Validator "match" works correctly', () => {
+  step('Validator "match" works correctly', () => {
     expect(match('name')('Login', { name: 'Login' })).to.be.an('undefined');
     expect(match('name')('Login', { name: 'Loginnn' })).to.be.a('string');
     expect(match('name')('Login', {})).to.be.a('string');
   });
 
-  it('Validator "maxLength" works correctly', () => {
+  step('Validator "maxLength" works correctly', () => {
     expect(maxLength(5)('Login')).to.be.an('undefined');
     expect(maxLength(5)('Loginn')).to.be.a('string');
   });
 
-  it('Validator "maxLength" works correctly', () => {
+  step('Validator "maxLength" works correctly', () => {
     expect(minLength(5)('Login')).to.be.an('undefined');
     expect(minLength(5)('Logi')).to.be.a('string');
   });
 
-  it('Validator "number" works correctly', () => {
+  step('Validator "number" works correctly', () => {
     expect(number(5)).to.be.an('undefined');
     expect(number('5')).to.be.an('undefined');
     expect(number('0')).to.be.an('undefined');
@@ -55,7 +54,7 @@ describe('Check if validation works', () => {
     expect(number('..11')).to.be.a('string');
   });
 
-  it('Validator "string" works correctly', () => {
+  step('Validator "string" works correctly', () => {
     expect(string('string')).to.be.an('undefined');
     expect(string('&*(&*(')).to.be.an('undefined');
     expect(string('!')).to.be.an('undefined');
@@ -66,19 +65,19 @@ describe('Check if validation works', () => {
     expect(string(/^[A-Z0-9._%+-]{2,4}$/)).to.be.a('string');
   });
 
-  it('Validator "minValue" works correctly', () => {
+  step('Validator "minValue" works correctly', () => {
     expect(minValue(5)(5)).to.be.an('undefined');
     expect(minValue(5)(4)).to.be.a('string');
   });
 
-  it('Validator "email" works correctly', () => {
+  step('Validator "email" works correctly', () => {
     expect(email('test@test.ru')).to.be.an('undefined');
     expect(email('te234st@te32st.com')).to.be.an('undefined');
     expect(email('te-234st@te32st.c')).to.be.a('string');
     expect(email('test*@te32st.com')).to.be.a('string');
   });
 
-  it('Validator "alphaNumeric" works correctly', () => {
+  step('Validator "alphaNumeric" works correctly', () => {
     expect(alphaNumeric('d')).to.be.an('undefined');
     expect(alphaNumeric('2')).to.be.an('undefined');
     expect(alphaNumeric('*')).to.be.a('string');
@@ -86,14 +85,14 @@ describe('Check if validation works', () => {
     expect(alphaNumeric('`')).to.be.a('string');
   });
 
-  it('Validator "phoneNumber" works correctly', () => {
+  step('Validator "phoneNumber" works correctly', () => {
     expect(phoneNumber('0639991122')).to.be.an('undefined');
     expect(phoneNumber('+380639991122')).to.be.an('undefined');
     expect(phoneNumber('+38 063 999 11 22')).to.be.an('undefined');
     expect(phoneNumber('639991122')).to.be.a('string');
   });
 
-  it('"validate" should compare the simple input object to input schema ', () => {
+  step('"validate" should compare the simple input object to input schema ', () => {
     let schema: Schema = { name: [required, minLength(5), maxLength(7)] };
     let dataToValidate: { [key: string]: any } = { name: 'login' };
     expect(validate(dataToValidate, schema)).to.be.an('undefined');
@@ -132,7 +131,7 @@ describe('Check if validation works', () => {
       .to.be.a('string');
   });
 
-  it('"validate" should compare the input object with nested objects to the input schema', () => {
+  step('"validate" should compare the input object with nested objects to the input schema', () => {
     let schema: Schema = { name: { firstName: [required, minLength(5), maxLength(8)] } };
     let dataToValidate: { [key: string]: any } = { name: { firstName: 'GoodName' } };
     expect(validate(dataToValidate, schema)).to.be.an('undefined');
@@ -145,7 +144,7 @@ describe('Check if validation works', () => {
       .to.be.a('string');
   });
 
-  it('Should change the language of the validation message from English to Russian and vice versa', () => {
+  step('Should change the language of the validation message from English to Russian and vice versa', () => {
     expect(required('')).to.match(/[a-zA-Z]/g);
     i18next.changeLanguage('ru-RU');
     expect(required('')).to.match(/[а-яА-Я]/g);
diff --git a/package.json b/package.json
index 85b4a98..a658d38 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,10 @@
     "rollback": "lerna run --scope=server rollback",
     "exp": "yarn --cwd packages/mobile exp",
     "exp-publish": "lerna run --scope=mobile exp-publish --stream",
+    "jest": "lerna run jest --stream",
     "test": "yarn tests && yarn lint",
-    "tests": "lerna run --parallel tests --stream",
-    "tests:watch": "lerna run --parallel tests:watch --stream",
+    "tests": "lerna run tests --stream",
+    "tests:watch": "lerna run tests:watch --stream",
     "lint": "yarn eslint && yarn tslint",
     "eslint": "eslint --fix --ext js --ext jsx --ext json .",
     "tslint": "tslint --fix -p tsconfig.json -c tslint.json",
@@ -82,11 +83,10 @@
     "@babel/preset-typescript": "^7.0.0",
     "@babel/register": "^7.0.0",
     "@babel/runtime": "^7.0.0",
-    "@larix/zen": "^0.1.20",
+    "@larix/zen": "^0.1.9",
     "autoprefixer": "^9.5.0",
     "babel-core": "^7.0.0-0",
     "babel-eslint": "^8.2.6",
-    "babel-jest": "^24.8.0",
     "babel-plugin-import": "^1.7.0",
     "babel-plugin-styled-components": "^1.3.0",
     "babel-preset-minify": "^0.5.0-alpha.5a128fd5",
@@ -96,7 +96,6 @@
     "eslint-config-airbnb": "^16.1.0",
     "eslint-import-resolver-webpack": "^0.9.0",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^22.6.4",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-mocha": "^5.0.0",
@@ -111,8 +110,6 @@
     "husky": "^1.1.2",
     "ignore-loader": "^0.1.2",
     "isomorphic-style-loader": "^4.0.0",
-    "jest": "^24.8.0",
-    "jest-transform-stub": "^2.0.0",
     "lerna": "^3.4.0",
     "less": "^3.0.2",
     "less-loader": "^4.1.0",
@@ -130,7 +127,6 @@
     "style-loader": "^0.23.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
-    "ts-jest": "^24.0.2",
     "ts-loader": "^4.5.0",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.5.0",
diff --git a/packages/client/.zenrc.js b/packages/client/.zenrc.js
index b5e8078..b7889a9 100644
--- a/packages/client/.zenrc.js
+++ b/packages/client/.zenrc.js
@@ -3,6 +3,7 @@ const url = require('url');
 const config = {
   builders: {
     web: {
+      openBrowser: true,
       dllExcludes: ['bootstrap'],
       dllBuildDir: '../../.cache/dll',
       defines: {
diff --git a/packages/client/babel.config.js b/packages/client/babel.config.js
index 76434f5..6dac98d 100644
--- a/packages/client/babel.config.js
+++ b/packages/client/babel.config.js
@@ -1,38 +1,18 @@
-module.exports = api => {
-  const isTest = api.env('test');
-  api.cache(true);
-  if (isTest) {
-    return {
-      compact: false,
-      presets: ['@babel/preset-typescript', '@babel/preset-react', ['@babel/preset-env', { modules: 'commonjs' }]],
-      plugins: [
-        '@babel/plugin-transform-destructuring',
-        '@babel/plugin-transform-regenerator',
-        '@babel/plugin-transform-runtime',
-        ['@babel/plugin-proposal-decorators', { legacy: true }],
-        ['@babel/plugin-proposal-class-properties', { loose: true }],
-        '@babel/plugin-proposal-object-rest-spread',
-        ['styled-components', { ssr: true }]
-      ]
-    };
-  } else {
-    return {
-      compact: false,
-      presets: ['@babel/preset-react', ['@babel/preset-env', { modules: false }]],
-      plugins: [
-        '@babel/plugin-transform-destructuring',
-        '@babel/plugin-transform-regenerator',
-        '@babel/plugin-transform-runtime',
-        ['@babel/plugin-proposal-decorators', { legacy: true }],
-        ['@babel/plugin-proposal-class-properties', { loose: true }],
-        '@babel/plugin-proposal-object-rest-spread',
-        ['styled-components', { ssr: true }]
-      ],
-      env: {
-        production: {
-          compact: true
-        }
-      }
-    };
+module.exports = {
+  compact: false,
+  presets: ['@babel/preset-react', ['@babel/preset-env', { modules: false }]],
+  plugins: [
+    '@babel/plugin-transform-destructuring',
+    '@babel/plugin-transform-regenerator',
+    '@babel/plugin-transform-runtime',
+    ['@babel/plugin-proposal-decorators', { legacy: true }],
+    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    '@babel/plugin-proposal-object-rest-spread',
+    ['styled-components', { ssr: true }]
+  ],
+  env: {
+    production: {
+      compact: true
+    }
   }
 };
diff --git a/packages/client/jest.config.js b/packages/client/jest.config.js
deleted file mode 100644
index cdba092..0000000
--- a/packages/client/jest.config.js
+++ /dev/null
@@ -1,22 +0,0 @@
-module.exports = {
-  testMatch: ['<rootDir>/modules/**/client-react/**/*.test.[jt]s?(x)'],
-  setupFilesAfterEnv: ['<rootDir>/packages/client/src/__tests__/entry.ts'],
-  moduleFileExtensions: ['js', 'web.js', 'json', 'jsx', 'web.jsx', 'ts', 'tsx', 'node'],
-  rootDir: '../..',
-  transform: {
-    'locales[\\/]index.[jt]s': '<rootDir>/jest-transform-i18next',
-    '.*': 'babel-jest'
-  },
-  moduleNameMapper: {
-    backend_reload: 'jest-transform-stub',
-    '^.+\\.(css|less|scss)$': 'babel-jest'
-  },
-  globals: {
-    __CLIENT__: true,
-    __SERVER__: false,
-    __DEV__: true,
-    __TEST__: true,
-    __SSR__: false,
-    __API_URL__: '/api'
-  }
-};
diff --git a/packages/client/package.json b/packages/client/package.json
index b223dfd..8375cb5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -10,10 +10,10 @@
   "scripts": {
     "build": "cross-env NODE_ENV=production zen build",
     "clean": "rimraf build .tmp",
-    "tests": "jest",
-    "tests:watch": "jest --watch",
+    "tests": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace \"src/**/*.spec.*\" \"../../modules/**/client-react/**/*.spec.*\"",
+    "tests:watch": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace --watch \"src/**/*.spec.*\" \"../../modules/**/client-react/**/*.spec.*\"",
     "test": "yarn tests && yarn lint",
-    "eslint": "eslint --fix --ext js --ext jsx --ext json .",
+    "eslint": "eslint --fix --ext js --ext jsx --ext json src",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
     "lint": "yarn eslint && yarn tslint",
     "watch": "zen -v watch",
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index dcdb9e3..14824c0 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,7 +1,5 @@
 import modules from './modules';
 
-(async () => {
-  await modules.createApp(module);
-})();
+modules.createApp(module);
 
 export default modules;
diff --git a/packages/common/.zenrc.js b/packages/common/.zenrc.js
index 8db975e..cf45d00 100644
--- a/packages/common/.zenrc.js
+++ b/packages/common/.zenrc.js
@@ -1,7 +1,19 @@
 const config = {
+  builders: {
+    test: {
+      stack: ['server'],
+      roles: ['test'],
+      defines: {
+        __DEV__: false,
+        __API_URL__: '"/api"',
+        __TEST__: true
+      }
+    }
+  },
   options: {
-    cache: '../../.cache'
+    cache: '../../.cache',
+    stack: ['ts', 'webpack', 'i18next'],
   }
 };
 
-module.exports = config;
+module.exports = config;
\ No newline at end of file
diff --git a/packages/common/package.json b/packages/common/package.json
index 1aae558..7629d26 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -5,7 +5,9 @@
   "scripts": {
     "eslint": "eslint --fix --ext js --ext jsx --ext json .",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
-    "lint": "yarn eslint && yarn tslint"
+    "lint": "yarn eslint && yarn tslint",
+    "tests": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --full-trace \"../../modules/**/common-react/**/*.spec.*\"",
+    "tests:watch": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --full-trace --watch \"../../modules/**/common-react/**/*.spec.*\""
   },
   "dependencies": {
     "i18next": "^11.2.3",
diff --git a/packages/mobile/.zenrc.js b/packages/mobile/.zenrc.js
index 2c099e0..ffcfb00 100644
--- a/packages/mobile/.zenrc.js
+++ b/packages/mobile/.zenrc.js
@@ -4,6 +4,7 @@ const config = {
   builders: {
     android: {
       buildDir: 'build/android',
+      dllBuildDir: '../../.cache/dll',
       defines: {
         __CLIENT__: true
       },
@@ -11,6 +12,7 @@ const config = {
     },
     ios: {
       buildDir: 'build/ios',
+      dllBuildDir: '../../.cache/dll',
       defines: {
         __CLIENT__: true
       },
@@ -19,6 +21,7 @@ const config = {
   },
   options: {
     cache: '../../.cache',
+    webpackDll: true,
     defines: {
       __DEV__: process.env.NODE_ENV !== 'production',
       __API_URL__: '"http://localhost:8080/api"',
@@ -32,6 +35,8 @@ if (process.env.NODE_ENV === 'production') {
   config.builders.ios.enabled = true;
   config.options.defines.__API_URL__ = '"https://restapp.herokuapp.com/api"';
   config.options.defines.__WEBSITE_URL__ = '"https://restapp.herokuapp.com"';
+  // Generating source maps for production will slowdown compilation for roughly 25%
+  config.options.sourceMap = false;
 }
 
 const extraDefines = {};
diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js
index 055ef22..34ddbe4 100644
--- a/packages/mobile/babel.config.js
+++ b/packages/mobile/babel.config.js
@@ -1,47 +1,23 @@
-module.exports = api => {
-  const isTest = api.env('test');
-  api.cache(true);
-  if (isTest) {
-    return {
-      compact: false,
-      presets: [
-        '@babel/preset-typescript',
-        'module:metro-react-native-babel-preset',
-        ['@babel/preset-env', { modules: 'commonjs' }]
-      ],
-      plugins: [
-        '@babel/plugin-transform-destructuring',
-        '@babel/plugin-transform-regenerator',
-        '@babel/plugin-transform-runtime',
-        ['@babel/plugin-proposal-decorators', { legacy: true }],
-        ['@babel/plugin-proposal-class-properties', { loose: true }],
-        '@babel/plugin-proposal-object-rest-spread',
-        ['styled-components', { ssr: true }]
-      ]
-    };
-  } else {
-    return {
-      compact: false,
-      presets: ['module:metro-react-native-babel-preset'],
-      plugins: [
-        'haul/src/utils/fixRequireIssues',
-        ['styled-components', { ssr: true }],
-        ['import', { libraryName: 'antd-mobile' }],
-        [
-          'babel-plugin-module-resolver',
-          {
-            alias: {
-              'react-native-vector-icons': '@expo/vector-icons'
-            }
-          }
-        ],
-        ['@babel/plugin-proposal-decorators', { legacy: true }]
-      ],
-      env: {
-        production: {
-          compact: true
+module.exports = {
+  compact: false,
+  presets: ['module:metro-react-native-babel-preset'],
+  plugins: [
+    'haul/src/utils/fixRequireIssues',
+    ['styled-components', { ssr: true }],
+    ['import', { libraryName: 'antd-mobile' }],
+    [
+      'babel-plugin-module-resolver',
+      {
+        alias: {
+          'react-native-vector-icons': '@expo/vector-icons'
         }
       }
-    };
+    ],
+    ['@babel/plugin-proposal-decorators', { legacy: true }]
+  ],
+  env: {
+    production: {
+      compact: true
+    }
   }
 };
diff --git a/packages/mobile/jest.config.js b/packages/mobile/jest.config.js
deleted file mode 100644
index 0efe50a..0000000
--- a/packages/mobile/jest.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
-  verbose: true,
-  preset: 'jest-expo',
-  testPathIgnorePatterns: ['node_modules', '.history'],
-  testMatch: ['<rootDir>/modules/**/client-react/**/*.test.native.[jt]s?(x)'],
-  rootDir: '../..',
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  modulePathIgnorePatterns: [
-    '<rootDir>/node_modules/react-native/Libraries/react-native/',
-    '<rootDir>/node_modules/react-native/Libraries/vendor/core/whatwg-fetch.js',
-    '<rootDir>/node_modules/react-native/jest/',
-    '<rootDir>/node_modules/haul/',
-    '<rootDir>/packages/mobile/.expo/',
-    '<rootDir>/packages/mobile/node_modules/'
-  ],
-  globals: {
-    __CLIENT__: true,
-    __SERVER__: false,
-    __TEST__: true
-  }
-};
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index 7bb2993..8751d3e 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -13,8 +13,8 @@
     "exp": "cross-env NODE_ENV=production zen exp",
     "exp-login": "cross-env NODE_ENV=production zen exp login -u $EXP_USERNAME -p $EXP_PASSWORD --non-interactive",
     "exp-publish": "yarn exp-login && yarn exp -- p --non-interactive",
-    "tests": "jest",
-    "tests:watch": "jest --watch",
+    "jest": "cross-env NODE_ENV=jest PORT=7070 jest",
+    "jest:watch": "cross-env NODE_ENV=jest PORT=7070 jest --watch",
     "test": "yarn tests && yarn lint",
     "eslint": "eslint --fix --ext js --ext jsx --ext json src",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
@@ -51,7 +51,7 @@
     "filesize": "^3.5.11",
     "i18next": "^11.2.3",
     "immutability-helper": "^2.6.2",
-    "jest-expo": "^32.0.0",
+    "jest-expo": "^31.0.0",
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
     "native-base": "^2.3.5",
@@ -74,7 +74,7 @@
   "devDependencies": {
     "@types/expo": "^30.0.0",
     "@types/expo__vector-icons": "^6.2.3",
-    "@types/jest": "^24.0.13",
+    "@types/jest": "^23.3.1",
     "@types/react-native-keyboard-spacer": "^0.4.1",
     "@types/react-test-renderer": "^16.0.2",
     "apollo-utilities": "^1.0.3",
@@ -106,5 +106,39 @@
   },
   "peerDependencies": {
     "@larix/zen": "^0.1.0"
+  },
+  "jest": {
+    "verbose": true,
+    "preset": "jest-expo",
+    "testPathIgnorePatterns": [
+      "node_modules",
+      ".history"
+    ],
+    "testRegex": ".*/__tests__/.*\\.jest\\.(js|jsx|ts|tsx)$",
+    "rootDir": "../../modules",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "jsx"
+    ],
+    "transform": {
+      "^.+\\.jsx?$": "babel-jest",
+      "^.+\\.tsx?$": "ts-jest"
+    },
+    "modulePathIgnorePatterns": [
+      "<rootDir>/node_modules/react-native/Libraries/react-native/",
+      "<rootDir>/node_modules/react-native/jest/",
+      "<rootDir>/node_modules/haul/",
+      "<rootDir>/packages/mobile/.expo/"
+    ],
+    "globals": {
+      "__CLIENT__": true,
+      "__SERVER__": false,
+      "__TEST__": true,
+      "ts-jest": {
+        "tsConfig": "tsconfig.jest.json"
+      }
+    }
   }
 }
diff --git a/packages/mobile/src/index.ts b/packages/mobile/src/index.ts
index 2ab9843..d61c589 100644
--- a/packages/mobile/src/index.ts
+++ b/packages/mobile/src/index.ts
@@ -1,9 +1,7 @@
 try {
   // tslint:disable-next-line
   const modules = require('./modules').default;
-  (async () => {
-    await modules.createApp(module);
-  })();
+  modules.createApp(module);
 } catch (e) {
   if (typeof ErrorUtils !== 'undefined') {
     (ErrorUtils as any).reportFatalError(e);
diff --git a/packages/server/babel.config.js b/packages/server/babel.config.js
index 072a1a6..d073718 100644
--- a/packages/server/babel.config.js
+++ b/packages/server/babel.config.js
@@ -1,35 +1,19 @@
-module.exports = api => {
-  const isBabelRegister = api.caller(caller => caller.name === '@babel/register');
-  const isTest = api.env('test');
-  api.cache(true);
-  if (isTest || isBabelRegister) {
-    return {
-      presets: [
-        '@babel/preset-typescript',
-        '@babel/preset-react',
-        ['@babel/preset-env', { targets: { node: true }, modules: 'commonjs' }]
-      ],
-      plugins: [['@babel/plugin-proposal-class-properties', { loose: true }]]
-    };
-  } else {
-    return {
-      compact: false,
-      presets: ['@babel/preset-react', ['@babel/preset-env', { targets: { node: true }, modules: false }]],
-      plugins: [
-        '@babel/plugin-transform-destructuring',
-        '@babel/plugin-transform-regenerator',
-        '@babel/plugin-transform-runtime',
-        ['@babel/plugin-proposal-decorators', { legacy: true }],
-        '@babel/plugin-proposal-class-properties',
-        '@babel/plugin-proposal-object-rest-spread',
-        ['styled-components', { ssr: true }],
-        ['import', { libraryName: 'antd-mobile' }]
-      ],
-      env: {
-        production: {
-          compact: true
-        }
-      }
-    };
+module.exports = {
+  compact: false,
+  presets: ['@babel/preset-react', ['@babel/preset-env', { modules: false }]],
+  plugins: [
+    '@babel/plugin-transform-destructuring',
+    '@babel/plugin-transform-regenerator',
+    '@babel/plugin-transform-runtime',
+    ['@babel/plugin-proposal-decorators', { legacy: true }],
+    '@babel/plugin-proposal-class-properties',
+    '@babel/plugin-proposal-object-rest-spread',
+    ['styled-components', { ssr: true }],
+    ['import', { libraryName: 'antd-mobile' }]
+  ],
+  env: {
+    production: {
+      compact: true
+    }
   }
 };
diff --git a/packages/server/jest.config.js b/packages/server/jest.config.js
deleted file mode 100644
index e5a7d2f..0000000
--- a/packages/server/jest.config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-module.exports = {
-  testMatch: [
-    '<rootDir>/modules/**/server-ts/**/*.test.[jt]s?(x)',
-    '<rootDir>/modules/**/common-react/**/*.test.[jt]s?(x)'
-  ],
-  globalSetup: '<rootDir>/packages/server/src/__tests__/jestSetup.js',
-  rootDir: '../..',
-  resolver: './packages/server/jest.resolver',
-  transform: {
-    'locales[\\/]index.[jt]s': '<rootDir>/jest-transform-i18next',
-    '.*': 'babel-jest'
-  },
-  moduleNameMapper: {
-    '^.+\\.(css|less|scss)$': 'babel-jest'
-  },
-  globals: {
-    __CLIENT__: false,
-    __SERVER__: true,
-    __DEV__: true,
-    __TEST__: true,
-    __SSR__: false,
-    __FRONTEND_BUILD_DIR__: __dirname + '/../client/build',
-    __DLL_BUILD_DIR__: __dirname + '/../../.cache/dll',
-    __API_URL__: '/api'
-  },
-  testEnvironment: 'node'
-};
diff --git a/packages/server/jest.resolver.js b/packages/server/jest.resolver.js
deleted file mode 100644
index 0126e56..0000000
--- a/packages/server/jest.resolver.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const fs = require('fs');
-const glob = require('glob');
-const path = require('path');
-
-const modulesDir = __dirname + '/../../modules';
-const virtualDirs = {
-  [path.resolve('/module-migrations')]: glob.sync(path.join(modulesDir, '**/migrations')),
-  [path.resolve('/module-seeds')]: glob.sync(path.join(modulesDir, '**/seeds'))
-};
-const virtualFiles = {};
-
-for (const virtualDir of Object.keys(virtualDirs)) {
-  const realDirs = virtualDirs[virtualDir];
-  for (const realDir of realDirs) {
-    const realFiles = fs.readdirSync(realDir);
-    for (const file of realFiles) {
-      virtualFiles[path.join(virtualDir, file).replace(/\\/g, '/')] = path.join(realDir, file);
-    }
-  }
-}
-
-module.exports = (modPath, options) => {
-  if (modPath.indexOf('module-migrations') >= 0 || modPath.indexOf('module-seeds') >= 0) {
-    return virtualFiles[modPath];
-  } else {
-    return options.defaultResolver(modPath, options);
-  }
-};
diff --git a/packages/server/knexfile.js b/packages/server/knexfile.js
index 9b8f0cd..5a3c5ba 100644
--- a/packages/server/knexfile.js
+++ b/packages/server/knexfile.js
@@ -1,15 +1,5 @@
-const path = require('path');
-
-const root = path.resolve(__dirname + '/../..');
-
-require('@babel/register')({
-  root,
-  cwd: root,
-  configFile: root + '/packages/server/babel.config.js',
-  extensions: ['.js', '.jsx', '.ts', '.tsx']
-});
-
 require('dotenv/config');
+require('@babel/register')({ cwd: __dirname + '/../..', extensions: ['.js', '.ts'] });
 require('@babel/polyfill');
 
 module.exports = require('@restapp/database-server-ts/knexdata');
diff --git a/packages/server/package.json b/packages/server/package.json
index c068b48..9f62278 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -11,9 +11,9 @@
     "build": "cross-env NODE_ENV=production zen build",
     "clean": "rimraf build .tmp",
     "start": "node --harmony build",
+    "tests": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace \"src/**/*.spec.*\" \"../../modules/**/server-ts/**/*.spec.*\"",
+    "tests:watch": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace --watch \"src/**/*.spec.*\" \"../../modules/**/server-ts/**/*.spec.*\"",
     "test": "yarn tests && yarn lint",
-    "tests": "cross-env PORT=7070 jest --forceExit",
-    "tests:watch": "cross-env PORT=7070 jest --watch",
     "eslint": "eslint --fix --ext js --ext jsx --ext json src",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
     "lint": "yarn eslint && yarn tslint",
@@ -66,7 +66,6 @@
     "express": "^4.16.2",
     "express-session": "^1.16.1",
     "filesize": "^3.5.11",
-    "glob": "^7.1.4",
     "humps": "^2.0.1",
     "i18next": "^11.3.3",
     "i18next-express-middleware": "^1.1.1",
diff --git a/packages/server/src/__tests__/entry.ts b/packages/server/src/__tests__/entry.ts
new file mode 100644
index 0000000..bdeb683
--- /dev/null
+++ b/packages/server/src/__tests__/entry.ts
@@ -0,0 +1 @@
+import '..';
diff --git a/packages/server/src/__tests__/jestSetup.js b/packages/server/src/__tests__/jestSetup.js
deleted file mode 100644
index 3f5895a..0000000
--- a/packages/server/src/__tests__/jestSetup.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const root = __dirname + '/../../../..';
-
-require('@babel/register')({
-  root,
-  cwd: root,
-  configFile: root + '/packages/server/babel.config.js',
-  extensions: ['.js', '.jsx', '.ts', '.tsx']
-});
-
-require.extensions['.scss'] = () => {};
-
-Object.assign(global, {
-  __CLIENT__: false,
-  __SERVER__: true,
-  __DEV__: true,
-  __TEST__: true,
-  __SSR__: false,
-  __FRONTEND_BUILD_DIR__: __dirname + '/../client/build',
-  __DLL_BUILD_DIR__: __dirname + '/../../.cache/dll',
-  __API_URL__: '/api'
-});
-
-const { setup } = require('@restapp/testing-server-ts');
-require('..');
-
-module.exports = setup;
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 8f89200..406e9ed 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -1,8 +1,6 @@
 import 'dotenv/config';
 import modules from './modules';
 
-(async () => {
-  await modules.createApp(module);
-})();
+modules.createApp(module);
 
 export default modules;
diff --git a/tools/babel.config.js b/tools/babel.config.js
deleted file mode 100644
index 563c2d8..0000000
--- a/tools/babel.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = api => {
-  api.cache(true);
-  return {
-    compact: false,
-    presets: ['@babel/preset-typescript', '@babel/preset-react', ['@babel/preset-env', { modules: 'commonjs' }]],
-    plugins: [
-      '@babel/plugin-transform-modules-commonjs',
-      '@babel/plugin-transform-destructuring',
-      '@babel/plugin-transform-regenerator',
-      '@babel/plugin-transform-runtime',
-      ['@babel/plugin-proposal-decorators', { legacy: true }],
-      ['@babel/plugin-proposal-class-properties', { loose: true }],
-      '@babel/plugin-proposal-object-rest-spread'
-    ],
-    env: {
-      production: {
-        compact: true
-      }
-    }
-  };
-};
diff --git a/tools/cli.js b/tools/cli.js
index 8bd0bbd..128accd 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -1,12 +1,5 @@
-const root = __dirname + '/..';
-
-require('@babel/register')({
-  root,
-  cwd: root,
-  configFile: root + '/tools/babel.config.js',
-  extensions: ['.js', '.jsx', '.ts', '.tsx']
-});
-
+require('@babel/register')({ cwd: __dirname + '/..' });
+require('@babel/polyfill');
 const prog = require('caporal');
 
 const addModuleCommand = require('./cli/commands/addModule');
diff --git a/tools/templates/module/client-react/__tests__/Module.spec.ts b/tools/templates/module/client-react/__tests__/Module.spec.ts
index c30b8fa..cb749ef 100644
--- a/tools/templates/module/client-react/__tests__/Module.spec.ts
+++ b/tools/templates/module/client-react/__tests__/Module.spec.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { step } from 'mocha-steps';
 
-import Renderer from '../../../../../packages/client/src/testHelpers/Renderer';
-import { updateContent } from '@restapp/testing-client-react';
+import Renderer from '../../../../packages/client/src/testHelpers/Renderer';
+import { updateContent } from '../../../../packages/client/src/testHelpers/testUtils';
 
 describe('$Module$ UI works', () => {
   const renderer = new Renderer({});
diff --git a/typings/typings.d.ts b/typings/typings.d.ts
index 5c40a44..5c0af6b 100644
--- a/typings/typings.d.ts
+++ b/typings/typings.d.ts
@@ -9,3 +9,8 @@ declare module '*.scss' {
   const value: any;
   export = value;
 }
+
+declare module 'mocha-steps' {
+  const step: Mocha.TestFunction;
+  const xstep: Mocha.TestFunction;
+}
diff --git a/yarn.lock b/yarn.lock
index 055c1b4..fb24521 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,50 +12,35 @@
     loader-utils "^1.1.0"
     lodash "^4.17.11"
 
-"@ant-design/colors@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-3.1.0.tgz#b7e2cc61a4e86d3d109494034acfb1222dacaa3c"
-  integrity sha512-Td7g1P53sNFyT4Gya6836e70TrhoVZ+HjZs6mpWIHrxl4/VqsjjOyzj/8ktOuw0lCx+BfYu9UO1CiJ0MoYYfhg==
-  dependencies:
-    tinycolor2 "^1.4.1"
-
-"@ant-design/create-react-context@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@ant-design/create-react-context/-/create-react-context-0.2.4.tgz#0fe9adad030350c0c9bb296dd6dcf5a8a36bd425"
-  integrity sha512-8sw+/w6r+aEbd+OJ62ojoSE4zDt/3yfQydmbWFznoftjr8v/opOswGjM+/MU0rSaREbluqzOmZ6xdecHpSaS2w==
-  dependencies:
-    gud "^1.0.0"
-    warning "^4.0.3"
-
-"@ant-design/icons-react@~2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons-react/-/icons-react-2.0.1.tgz#17a2513571ab317aca2927e58cea25dd31e536fb"
-  integrity sha512-r1QfoltMuruJZqdiKcbPim3d8LNsVPB733U0gZEUSxBLuqilwsW28K2rCTWSMTjmFX7Mfpf+v/wdiFe/XCqThw==
+"@ant-design/icons-react@~1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons-react/-/icons-react-1.1.2.tgz#df25c4560864f8a3b687b305c3238daff048ed72"
+  integrity sha512-7Fgt9d8ABgxrhZxsFjHk/VpPcxodQJJhbJO8Lsh7u58pGN4NoxxW++92naeGTXCyqZsbDPBReP+SC0bdBtbsGQ==
   dependencies:
-    "@ant-design/colors" "^3.1.0"
+    ant-design-palettes "^1.1.3"
     babel-runtime "^6.26.0"
 
-"@ant-design/icons@~2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-2.0.1.tgz#021c3f5c1df8b1d01c25b705366c597e7cbb3ca5"
-  integrity sha512-SqiNhgoivKczEqIJc/9hntgtvmq4R3Ef73ehibqDPAT059IjsXXM7nze0S5P8F4HP76jgPiv5od+2JUhQl/nig==
+"@ant-design/icons@~1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-1.2.1.tgz#8e19301b1433ec67d6bbd0e892782e2ade561ff9"
+  integrity sha512-gQx3nH6m1xvebOWh5xibhzVK02aoqHY7JUXUS4doAidSDRWsj5iwKC8Gq9DemDZ4T+bW6xO7jJZN1UsbvcW7Uw==
 
 "@babel/cli@^7.0.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.4.4.tgz#5454bb7112f29026a4069d8e6f0e1794e651966c"
-  integrity sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.2.3.tgz#1b262e42a3e959d28ab3d205ba2718e1923cfee6"
+  integrity sha512-bfna97nmJV6nDJhXNPeEfxyMjWnt6+IjUAaDPiYRTBlm8L41n8nvw6UAqUCbvpFfU246gHPxW7sfWwqtF4FcYA==
   dependencies:
     commander "^2.8.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.10"
     mkdirp "^0.5.1"
     output-file-sync "^2.0.0"
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
-    chokidar "^2.0.4"
+    chokidar "^2.0.3"
 
 "@babel/code-frame@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -71,18 +56,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.0":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a"
-  integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==
+"@babel/core@^7.0.0", "@babel/core@^7.1.0":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.3.4.tgz#921a5a13746c21e32445bf0798680e9d11a6530b"
+  integrity sha512-jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.4"
-    "@babel/helpers" "^7.4.4"
-    "@babel/parser" "^7.4.5"
-    "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.4.5"
-    "@babel/types" "^7.4.4"
+    "@babel/generator" "^7.3.4"
+    "@babel/helpers" "^7.2.0"
+    "@babel/parser" "^7.3.4"
+    "@babel/template" "^7.2.2"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -102,12 +87,12 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.4.0", "@babel/generator@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
-  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
+"@babel/generator@^7.0.0", "@babel/generator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.4.tgz#9aa48c1989257877a9d971296e5b73bfe72e446e"
+  integrity sha512-8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.3.4"
     jsesc "^2.5.1"
     lodash "^4.17.11"
     source-map "^0.5.0"
@@ -136,35 +121,35 @@
     "@babel/types" "^7.3.0"
     esutils "^2.0.0"
 
-"@babel/helper-call-delegate@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
-  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
+"@babel/helper-call-delegate@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
+  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@babel/helper-create-class-features-plugin@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
-  integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
+"@babel/helper-create-class-features-plugin@^7.3.0", "@babel/helper-create-class-features-plugin@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.4.tgz#092711a7a3ad8ea34de3e541644c2ce6af1f6f0c"
+  integrity sha512-uFpzw6L2omjibjxa8VGZsJUPL5wJH0zzGKpoz0ccBkzIa6C8kWNUbiBmQ0rgOKWlHJ6qzmfa6lTiGchiV8SC+g==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.4.4"
-    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/helper-replace-supers" "^7.3.4"
+    "@babel/helper-split-export-declaration" "^7.0.0"
 
-"@babel/helper-define-map@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz#6969d1f570b46bdc900d1eba8e5d59c48ba2c12a"
-  integrity sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==
+"@babel/helper-define-map@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
+  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.4.4"
-    lodash "^4.17.11"
+    "@babel/types" "^7.0.0"
+    lodash "^4.17.10"
 
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
@@ -206,12 +191,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-hoist-variables@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
-  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
+"@babel/helper-hoist-variables@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.0.0"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
@@ -227,17 +212,17 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz#96115ea42a2f139e619e98ed46df6019b94414b8"
-  integrity sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==
+"@babel/helper-module-transforms@^7.1.0":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
+  integrity sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/template" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    lodash "^4.17.11"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/template" "^7.2.2"
+    "@babel/types" "^7.2.2"
+    lodash "^4.17.10"
 
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
@@ -251,12 +236,12 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
   integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
-"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.4.tgz#a47e02bc91fb259d2e6727c2a30013e3ac13c4a2"
-  integrity sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==
+"@babel/helper-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
   dependencies:
-    lodash "^4.17.11"
+    lodash "^4.17.10"
 
 "@babel/helper-remap-async-to-generator@^7.1.0":
   version "7.1.0"
@@ -269,15 +254,15 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz#aee41783ebe4f2d3ab3ae775e1cc6f1a90cefa27"
-  integrity sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz#a795208e9b911a6eeb08e5891faacf06e7013e13"
+  integrity sha512-pvObL9WVf2ADs+ePg0jrqlhHoxRXlOa+SHRHzAXIz2xkYuOHfGl+fKxPMaS4Fq+uje8JQPobnertBBvyrWnQ1A==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
 
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
@@ -294,12 +279,12 @@
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
-"@babel/helper-split-export-declaration@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
-  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
+"@babel/helper-split-export-declaration@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.0.0"
 
 "@babel/helper-wrap-function@^7.1.0":
   version "7.2.0"
@@ -311,14 +296,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
-  integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
+"@babel/helpers@^7.2.0":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
+  integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==
   dependencies:
-    "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/template" "^7.1.2"
+    "@babel/traverse" "^7.1.5"
+    "@babel/types" "^7.3.0"
 
 "@babel/highlight@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -338,10 +323,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
-  integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
+"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.4.tgz#a43357e4bbf4b92a437fb9e465c192848287f27c"
+  integrity sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==
 
 "@babel/plugin-external-helpers@^7.0.0":
   version "7.2.0"
@@ -359,20 +344,20 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.4.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce"
-  integrity sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==
+"@babel/plugin-proposal-class-properties@^7.0.0":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.4.tgz#410f5173b3dc45939f9ab30ca26684d72901405e"
+  integrity sha512-lUf8D3HLs4yYlAo8zjuneLvfxN7qfKv1Yzbj5vjqaqMJxgJA3Ipwp4VUJ+OrOdz53Wbww6ahwB8UhB2HQyLotA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.4.4"
+    "@babel/helper-create-class-features-plugin" "^7.3.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-decorators@^7.0.0", "@babel/plugin-proposal-decorators@^7.1.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
-  integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.3.0.tgz#637ba075fa780b1f75d08186e8fb4357d03a72a7"
+  integrity sha512-3W/oCUmsO43FmZIqermmq6TKaRSYhmh/vybPfVFwQWdSb8xwki38uAIvknCRzuyHRuYfCYmJzL9or1v0AffPjg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.4.4"
+    "@babel/helper-create-class-features-plugin" "^7.3.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-decorators" "^7.2.0"
 
@@ -393,17 +378,17 @@
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz#41c360d59481d88e0ce3a3f837df10121a769b39"
-  integrity sha512-Amph7Epui1Dh/xxUxS2+K22/MUi6+6JVTvy3P58tja3B6yKTSjwwx0/d83rF7551D6PVSSoplQb8GCwqec7HRw==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.2.0.tgz#c3fda766187b2f2162657354407247a758ee9cf9"
+  integrity sha512-QXj/YjFuFJd68oDvoc1e8aqLr2wz7Kofzvp6Ekd/o7MWZl+nZ0/cpStxND+hlZ7DpRWAp7OmuyT2areZ2V3YUA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.4.0", "@babel/plugin-proposal-object-rest-spread@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005"
-  integrity sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==
+"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz#47f73cf7f2a721aad5c0261205405c642e424654"
+  integrity sha512-j7VQmbbkA+qrzNqbKHrBsW3ddFnOeva6wzSe/zB7T+xaxGc+RCpwo44wCmRixAIGRoIpmVgvzFzNJqQcO3/9RA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -424,14 +409,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-chaining" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
-  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
+"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
+  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.2.0"
 
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
@@ -489,7 +474,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
+"@babel/plugin-syntax-object-rest-spread@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
   integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
@@ -524,10 +509,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.0.0", "@babel/plugin-transform-async-to-generator@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz#a3f1d01f2f21cadab20b33a82133116f14fb5894"
-  integrity sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==
+"@babel/plugin-transform-async-to-generator@^7.0.0", "@babel/plugin-transform-async-to-generator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz#4e45408d3c3da231c0e7b823f407a53a7eb3048c"
+  integrity sha512-Y7nCzv2fw/jEZ9f678MuKdMo99MFDJMT/PvD9LisrR5JDFcJH6vYeH6RnjVt3p5tceyGRvTtEN0VOlU+rgHZjA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -540,26 +525,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz#c13279fabf6b916661531841a23c4b7dae29646d"
-  integrity sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==
+"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz#5c22c339de234076eee96c8783b2fed61202c5c4"
+  integrity sha512-blRr2O8IOZLAOJklXLV4WhcEzpYafYQKSGT3+R26lWG41u/FODJuBggehtOwilVAcFu393v3OFj+HmaE6tVjhA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz#0ce4094cdafd709721076d3b9c38ad31ca715eb6"
-  integrity sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==
+"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz#dc173cb999c6c5297e0b5f2277fdaaec3739d0cc"
+  integrity sha512-J9fAvCFBkXEvBimgYxCjvaVDzL6thk0j0dBvCeZmIUDBwyt+nv6HfbImsSrWsYXfDNDivyANgJlFXDUWRTZBuA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.4.4"
+    "@babel/helper-define-map" "^7.1.0"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.4.4"
-    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/helper-replace-supers" "^7.3.4"
+    "@babel/helper-split-export-declaration" "^7.0.0"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.2.0":
@@ -569,21 +554,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz#9d964717829cc9e4b601fc82a26a71a4d8faf20f"
-  integrity sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==
+"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.2.0":
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz#f2f5520be055ba1c38c41c0e094d8a461dd78f2d"
+  integrity sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
-  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
+"@babel/plugin-transform-dotall-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
+  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.1.3"
 
 "@babel/plugin-transform-duplicate-keys@^7.2.0":
   version "7.2.0"
@@ -600,25 +585,25 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.4.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7"
-  integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==
+"@babel/plugin-transform-flow-strip-types@^7.0.0":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.3.4.tgz#00156236defb7dedddc2d3c9477dcc01a4494327"
+  integrity sha512-PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-flow" "^7.2.0"
 
-"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
-  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
+"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
+  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
-  integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
+"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
+  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -630,13 +615,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-member-expression-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
-  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-modules-amd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
@@ -645,21 +623,21 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e"
-  integrity sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==
+"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
+  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.4.4"
+    "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz#dc83c5665b07d6c2a7b224c00ac63659ea36a405"
-  integrity sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==
+"@babel/plugin-transform-modules-systemjs@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz#813b34cd9acb6ba70a84939f3680be0eb2e58861"
+  integrity sha512-VZ4+jlGOF36S7TjKs8g4ojp4MEI+ebCQZdswWb/T9I4X84j8OtFAyjXjt/M16iIm5RIZn0UMQgg/VgIwo/87vw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
+    "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-umd@^7.2.0":
@@ -670,17 +648,17 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
-  integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
+  integrity sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==
   dependencies:
-    regexp-tree "^0.1.6"
+    regexp-tree "^0.1.0"
 
-"@babel/plugin-transform-new-target@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
-  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
+"@babel/plugin-transform-new-target@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
+  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -699,22 +677,15 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
 
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
-  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
+"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.2.0":
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz#3a873e07114e1a5bee17d04815662c8317f10e30"
+  integrity sha512-IrIP25VvXWu/VlBWTpsjGptpomtIkYrN/3aDp4UKm7xK6UxZY88kcJ1UwETbzHAlwN21MnNfwlar0u8y3KpiXw==
   dependencies:
-    "@babel/helper-call-delegate" "^7.4.4"
+    "@babel/helper-call-delegate" "^7.1.0"
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-property-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
-  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
@@ -738,7 +709,7 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.3.0":
+"@babel/plugin-transform-react-jsx@^7.0.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290"
   integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==
@@ -747,24 +718,17 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
-  integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
-  dependencies:
-    regenerator-transform "^0.14.0"
-
-"@babel/plugin-transform-reserved-words@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
-  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
+"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz#1601655c362f5b38eead6a52631f5106b29fa46a"
+  integrity sha512-hvJg8EReQvXT6G9H2MvNPXkv9zK36Vxa1+csAVTpE1J3j0zlHplw76uudEbJxgvqZzAq9Yh45FLD4pk5mKRFQA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    regenerator-transform "^0.13.4"
 
 "@babel/plugin-transform-runtime@^7.0.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz#a50f5d16e9c3a4ac18a1a9f9803c107c380bce08"
-  integrity sha512-aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q==
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz#57805ac8c1798d102ecd75c03b024a5b3ea9b431"
+  integrity sha512-PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -793,10 +757,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
-  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
+"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
+  integrity sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -809,83 +773,78 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-typescript@^7.0.0", "@babel/plugin-transform-typescript@^7.3.2":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
-  integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.3.2.tgz#59a7227163e55738842f043d9e5bd7c040447d96"
+  integrity sha512-Pvco0x0ZSCnexJnshMfaibQ5hnK8aUHSvjCQhC1JR8eeg+iBwt0AtCO7gWxJ358zZevuf9wPSO5rv+WJcbHPXQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-typescript" "^7.2.0"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0", "@babel/plugin-transform-unicode-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
-  integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
+"@babel/plugin-transform-unicode-regex@^7.0.0", "@babel/plugin-transform-unicode-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
+  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.1.3"
 
-"@babel/polyfill@^7.0.0", "@babel/polyfill@^7.4.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.4.4.tgz#78801cf3dbe657844eeabf31c1cae3828051e893"
-  integrity sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==
+"@babel/polyfill@^7.0.0":
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.2.5.tgz#6c54b964f71ad27edddc567d065e57e87ed7fa7d"
+  integrity sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==
   dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
+    core-js "^2.5.7"
+    regenerator-runtime "^0.12.0"
 
-"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.3.1", "@babel/preset-env@^7.4.0":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58"
-  integrity sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==
+"@babel/preset-env@^7.0.0":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.4.tgz#887cf38b6d23c82f19b5135298bdb160062e33e1"
+  integrity sha512-2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.4.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.3.4"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.4.4"
+    "@babel/plugin-transform-async-to-generator" "^7.3.4"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.4.4"
-    "@babel/plugin-transform-classes" "^7.4.4"
+    "@babel/plugin-transform-block-scoping" "^7.3.4"
+    "@babel/plugin-transform-classes" "^7.3.4"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/plugin-transform-destructuring" "^7.2.0"
+    "@babel/plugin-transform-dotall-regex" "^7.2.0"
     "@babel/plugin-transform-duplicate-keys" "^7.2.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.4.4"
-    "@babel/plugin-transform-function-name" "^7.4.4"
+    "@babel/plugin-transform-for-of" "^7.2.0"
+    "@babel/plugin-transform-function-name" "^7.2.0"
     "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.4.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.4.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.3.4"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
-    "@babel/plugin-transform-new-target" "^7.4.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
+    "@babel/plugin-transform-new-target" "^7.0.0"
     "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.4.4"
-    "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.4.5"
-    "@babel/plugin-transform-reserved-words" "^7.2.0"
+    "@babel/plugin-transform-parameters" "^7.2.0"
+    "@babel/plugin-transform-regenerator" "^7.3.4"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.2.0"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.4.4"
+    "@babel/plugin-transform-template-literals" "^7.2.0"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    browserslist "^4.6.0"
-    core-js-compat "^3.1.1"
+    "@babel/plugin-transform-unicode-regex" "^7.2.0"
+    browserslist "^4.3.4"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
-    semver "^5.5.0"
+    semver "^5.3.0"
 
 "@babel/preset-flow@^7.0.0":
   version "7.0.0"
@@ -914,24 +873,25 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-typescript" "^7.3.2"
 
-"@babel/register@^7.0.0", "@babel/register@^7.4.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.4.4.tgz#370a68ba36f08f015a8b35d4864176c6b65d7a23"
-  integrity sha512-sn51H88GRa00+ZoMqCVgOphmswG4b7mhf9VOB0LUBAieykq2GnRFerlN+JQkO/ntT7wz4jaHNSRPg9IdMPEUkA==
+"@babel/register@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0.tgz#fa634bae1bfa429f60615b754fc1f1d745edd827"
+  integrity sha512-f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g==
   dependencies:
-    core-js "^3.0.0"
-    find-cache-dir "^2.0.0"
-    lodash "^4.17.11"
+    core-js "^2.5.7"
+    find-cache-dir "^1.0.0"
+    home-or-tmp "^3.0.0"
+    lodash "^4.17.10"
     mkdirp "^0.5.1"
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.38", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.3":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
-  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.38", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
+  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.12.0"
 
 "@babel/template@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -943,14 +903,14 @@
     babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
-"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
-  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
+"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
+  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/parser" "^7.2.2"
+    "@babel/types" "^7.2.2"
 
 "@babel/traverse@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -968,17 +928,17 @@
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
-  integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.3.4.tgz#1330aab72234f8dea091b08c4f8b9d05c7119e06"
+  integrity sha512-TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.4"
+    "@babel/generator" "^7.3.4"
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.4.5"
-    "@babel/types" "^7.4.4"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/parser" "^7.3.4"
+    "@babel/types" "^7.3.4"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.11"
@@ -992,23 +952,15 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
-  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.4.tgz#bf482eaeaffb367a28abbf9357a94963235d90ed"
+  integrity sha512-WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
-"@cnakazawa/watch@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
-  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
-  dependencies:
-    exec-sh "^0.3.2"
-    minimist "^1.2.0"
-
 "@expo/bunyan@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-3.0.2.tgz#775680bd479a8b79ada4a5676936a58eef1579c9"
@@ -1031,12 +983,11 @@
     safe-json-stringify "~1"
 
 "@expo/json-file@^8.0.0", "@expo/json-file@^8.0.1", "@expo/json-file@^8.1.0":
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.1.4.tgz#160f68a2ad08a1c1a34e9edfef6e87293ce0a6ac"
-  integrity sha512-0M6Hq2+iNV+wqc9hSffa05NgTwqmg08TVhpUSSBuHjOscYw2gxMi8JbTJ1v6fg5NqRW1AOga8mZb6Py8SE/b+g==
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.1.1.tgz#10fd0e0a8dba81df851d099a0f6841327cbbc06a"
+  integrity sha512-cWTp9Ij9Mu3AYGt7MtWVZqz14vjj7HxvhjzZyA74TzLVfCSdsklSbihN+Wi6Jy00AC4nhkT4olRqxDZMS0JYpQ==
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.44"
-    fs-extra "^8.0.1"
     json5 "^1.0.1"
     lodash "^4.17.4"
     util.promisify "^1.0.0"
@@ -1127,9 +1078,9 @@
     uuid "^3.0.0"
 
 "@expo/osascript@^1.8.0", "@expo/osascript@^1.9.0":
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/@expo/osascript/-/osascript-1.9.2.tgz#09de523a07d38e5cefca0db55ac7984e5d5776ca"
-  integrity sha512-jsT+Nauqp+ZnWsTJEPSPYImJzGY1L22cQEmaOZvWzgc6MTdBgfWG9KoKVHvn3WvPYHio7sOMk1zGocM1CW95LQ==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@expo/osascript/-/osascript-1.9.1.tgz#120092657cece3c63430c7dedbdad3842ec64765"
+  integrity sha512-I/eACcarb7Bt7NKU+CQlPuk8uEvdOQ/N9oyE1FM8BkeZsXPnoO9RUrVAFEgPTxUNiksjY/7oTMLLBIdJu++aRQ==
   dependencies:
     "@expo/spawn-async" "^1.2.8"
     babel-runtime "^6.23.0"
@@ -1159,9 +1110,9 @@
     read-chunk "^2.0.0"
 
 "@expo/schemer@^1.2.1":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@expo/schemer/-/schemer-1.2.5.tgz#f2d457ee7aeae3edf29dd98d3dfa84af6b11dfc3"
-  integrity sha512-j74QDjk5gka5yeIgdiBFg1YQB3upnOedct6Ji8K1+iIQ1OErN4grf1YxCH/v81rhrsbBjKT5wgn0eKH7wqdsRw==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@expo/schemer/-/schemer-1.2.3.tgz#b45472a19a426fde23c74e75df08b4e2a4256894"
+  integrity sha512-SbxQ87T0uTSiwnpHQk5PZLvX/ZSO1kZ4NTYvy0ZBg5CHgch7XxR2IazpiZ1v7YkIlSVQs/CbIibMUm04xswB4w==
   dependencies:
     ajv "^5.2.2"
     babel-polyfill "^6.23.0"
@@ -1178,10 +1129,11 @@
   integrity sha1-sxRH3mDlECg3pO33AoOfzI9/MfM=
 
 "@expo/spawn-async@^1.2.8", "@expo/spawn-async@^1.3.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@expo/spawn-async/-/spawn-async-1.5.0.tgz#799827edd8c10ef07eb1a2ff9dcfe081d596a395"
-  integrity sha512-LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@expo/spawn-async/-/spawn-async-1.4.0.tgz#39f7777bdee22e1f48d03898c9ed2f150a7f4cbd"
+  integrity sha512-jE9zSZ14eOfKxXs+WJZofweKtsAeuQiOpntsb+zp8Ti9/wk+9ZjKkffdld7UfANr8asmzuJYnEoVyL+hMy3SWw==
   dependencies:
+    "@types/cross-spawn" "^6.0.0"
     cross-spawn "^6.0.5"
 
 "@expo/traveling-fastlane-darwin@1.5.0":
@@ -1252,161 +1204,18 @@
     humps "^2.0.1"
     prop-types "^15.5.10"
 
-"@improved/node@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@improved/node/-/node-1.0.0.tgz#50b1cc6804ffb3d9c86bf91ed1900baa3cd8dd59"
-  integrity sha512-8r6WN+Qp2EsZ6G2F1y0vpJjGFVtoCQQ1aCrvBJ1ofy7SG96nG8FfeXWalxsCbh7zMrieOF45McAb50bYCLCuBQ==
-
-"@jest/console@^24.7.1":
-  version "24.7.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
-  integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==
-  dependencies:
-    "@jest/source-map" "^24.3.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
-
-"@jest/core@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz#fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b"
-  integrity sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/reporters" "^24.8.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/transform" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    exit "^0.1.2"
-    graceful-fs "^4.1.15"
-    jest-changed-files "^24.8.0"
-    jest-config "^24.8.0"
-    jest-haste-map "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve-dependencies "^24.8.0"
-    jest-runner "^24.8.0"
-    jest-runtime "^24.8.0"
-    jest-snapshot "^24.8.0"
-    jest-util "^24.8.0"
-    jest-validate "^24.8.0"
-    jest-watcher "^24.8.0"
-    micromatch "^3.1.10"
-    p-each-series "^1.0.0"
-    pirates "^4.0.1"
-    realpath-native "^1.1.0"
-    rimraf "^2.5.4"
-    strip-ansi "^5.0.0"
-
-"@jest/environment@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz#0342261383c776bdd652168f68065ef144af0eac"
-  integrity sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==
-  dependencies:
-    "@jest/fake-timers" "^24.8.0"
-    "@jest/transform" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    jest-mock "^24.8.0"
-
-"@jest/fake-timers@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz#2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"
-  integrity sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-mock "^24.8.0"
-
-"@jest/reporters@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz#075169cd029bddec54b8f2c0fc489fd0b9e05729"
-  integrity sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==
-  dependencies:
-    "@jest/environment" "^24.8.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/transform" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    chalk "^2.0.1"
-    exit "^0.1.2"
-    glob "^7.1.2"
-    istanbul-lib-coverage "^2.0.2"
-    istanbul-lib-instrument "^3.0.1"
-    istanbul-lib-report "^2.0.4"
-    istanbul-lib-source-maps "^3.0.1"
-    istanbul-reports "^2.1.1"
-    jest-haste-map "^24.8.0"
-    jest-resolve "^24.8.0"
-    jest-runtime "^24.8.0"
-    jest-util "^24.8.0"
-    jest-worker "^24.6.0"
-    node-notifier "^5.2.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
-    string-length "^2.0.0"
-
-"@jest/source-map@^24.3.0":
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28"
-  integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==
-  dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
-
-"@jest/test-result@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3"
-  integrity sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==
+"@jest/types@^24.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.5.0.tgz#feee214a4d0167b0ca447284e95a57aa10b3ee95"
+  integrity sha512-kN7RFzNMf2R8UDadPOl6ReyI+MT8xfqRuAnuVL+i4gwjv/zubdDK+EDeLHYwq1j0CSSR2W/MmgaRlMZJzXdmVA==
   dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/types" "^24.8.0"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-
-"@jest/test-sequencer@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz#2f993bcf6ef5eb4e65e8233a95a3320248cf994b"
-  integrity sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==
-  dependencies:
-    "@jest/test-result" "^24.8.0"
-    jest-haste-map "^24.8.0"
-    jest-runner "^24.8.0"
-    jest-runtime "^24.8.0"
-
-"@jest/transform@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5"
-  integrity sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^24.8.0"
-    babel-plugin-istanbul "^5.1.0"
-    chalk "^2.0.1"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.15"
-    jest-haste-map "^24.8.0"
-    jest-regex-util "^24.3.0"
-    jest-util "^24.8.0"
-    micromatch "^3.1.10"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "2.4.1"
-
-"@jest/types@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
-  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
+    "@types/istanbul-lib-coverage" "^1.1.0"
     "@types/yargs" "^12.0.9"
 
-"@larix/zen@^0.1.20":
-  version "0.1.20"
-  resolved "https://registry.yarnpkg.com/@larix/zen/-/zen-0.1.20.tgz#d0d35eb0ecb83d7b923b6ef626d881612674659d"
-  integrity sha512-X7qZkBAmYc4LHpESRrMX5jG/HvZVeYCAk46sGfGR883UXiNplICqPTSYfv8aAf5lJJKzZTcnbyj3PAFG8AJ1CA==
+"@larix/zen@^0.1.9":
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@larix/zen/-/zen-0.1.9.tgz#1eaf21523b4f1049927c2420a46cdaeb21c3fd31"
+  integrity sha512-QSAbyLrycoOlRZ7Ec1b8qBy4pUu+6Ou+gS6um/PkmaKiPv76HZH68/SUDwfpTPM9Trj1Lm3BA0ETQkuDrWPWCg==
   dependencies:
     connect-cors "^0.5.6"
     debug "^3.1.0"
@@ -1429,14 +1238,14 @@
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-"@lerna/add@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.14.0.tgz#799d416e67d48c285967abf883be746557aefa48"
-  integrity sha512-Sa79Ju6HqF3heSVpBiYPNrGtuS56U/jMzVq4CcVvhNwB34USLrzJJncGFVcfnuUvsjKeFJv+jHxUycHeRE8XYw==
+"@lerna/add@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.13.1.tgz#2cd7838857edb3b43ed73e3c21f69a20beb9b702"
+  integrity sha512-cXk42YbuhzEnADCK8Qte5laC9Qo03eJLVnr0qKY85jQUM/T4URe3IIUemqpg0CpVATrB+Vz+iNdeqw9ng1iALw==
   dependencies:
-    "@lerna/bootstrap" "3.14.0"
-    "@lerna/command" "3.14.0"
-    "@lerna/filter-options" "3.14.0"
+    "@lerna/bootstrap" "3.13.1"
+    "@lerna/command" "3.13.1"
+    "@lerna/filter-options" "3.13.0"
     "@lerna/npm-conf" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
@@ -1445,31 +1254,32 @@
     pacote "^9.5.0"
     semver "^5.5.0"
 
-"@lerna/batch-packages@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.14.0.tgz#0208663bab3ddbf57956b370aaec4c9ebee6c800"
-  integrity sha512-RlBkQVNTqk1qvn6PFWiWNiskllUHh6tXbTVm43mZRNd+vhAyvrQC8RWJxH0ECVvnFAt9rSNGRIVbEJ31WnNQLg==
+"@lerna/batch-packages@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.13.0.tgz#697fde5be28822af9d9dca2f750250b90a89a000"
+  integrity sha512-TgLBTZ7ZlqilGnzJ3xh1KdAHcySfHytgNRTdG9YomfriTU6kVfp1HrXxKJYVGs7ClPUNt2CTFEOkw0tMBronjw==
   dependencies:
-    "@lerna/package-graph" "3.14.0"
+    "@lerna/package-graph" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/bootstrap@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.14.0.tgz#dde35eac0a912097033e1daea237a50e5c3cb75b"
-  integrity sha512-AvnuDp8b0kX4zZgqD3v7ItPABhUsN5CmTEvZBD2JqM+xkQKhzCfz5ABcHEwDwOPWnNQmtH+/2iQdwaD7xBcAXw==
-  dependencies:
-    "@lerna/batch-packages" "3.14.0"
-    "@lerna/command" "3.14.0"
-    "@lerna/filter-options" "3.14.0"
-    "@lerna/has-npm-version" "3.13.3"
-    "@lerna/npm-install" "3.13.3"
-    "@lerna/package-graph" "3.14.0"
+"@lerna/bootstrap@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.13.1.tgz#f2edd7c8093c8b139e78b0ca5f845f23efd01f08"
+  integrity sha512-mKdi5Ds5f82PZwEFyB9/W60I3iELobi1i87sTeVrbJh/um7GvqpSPy7kG/JPxyOdMpB2njX6LiJgw+7b6BEPWw==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/filter-options" "3.13.0"
+    "@lerna/has-npm-version" "3.13.0"
+    "@lerna/npm-install" "3.13.0"
+    "@lerna/package-graph" "3.13.0"
     "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/rimraf-dir" "3.13.3"
-    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/rimraf-dir" "3.13.0"
+    "@lerna/run-lifecycle" "3.13.0"
     "@lerna/run-parallel-batches" "3.13.0"
-    "@lerna/symlink-binary" "3.14.0"
-    "@lerna/symlink-dependencies" "3.14.0"
+    "@lerna/symlink-binary" "3.13.0"
+    "@lerna/symlink-dependencies" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
     get-port "^3.2.0"
@@ -1483,45 +1293,44 @@
     read-package-tree "^5.1.6"
     semver "^5.5.0"
 
-"@lerna/changed@3.14.1":
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.14.1.tgz#274fa67a34f234546925c139aabe20765f07a8e4"
-  integrity sha512-G0RgYL/WLTFzbezRBLUO2J0v39EvgZIO5bHHUtYt7zUFSfzapkPfvpdpBj+5JlMtf0B2xfxwTk+lSA4LVnbfmA==
+"@lerna/changed@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.13.1.tgz#dc92476aad43c932fe741969bbd0bcf6146a4c52"
+  integrity sha512-BRXitEJGOkoudbxEewW7WhjkLxFD+tTk4PrYpHLyCBk63pNTWtQLRE6dc1hqwh4emwyGncoyW6RgXfLgMZgryw==
   dependencies:
-    "@lerna/collect-updates" "3.14.0"
-    "@lerna/command" "3.14.0"
-    "@lerna/listable" "3.14.0"
+    "@lerna/collect-updates" "3.13.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/listable" "3.13.0"
     "@lerna/output" "3.13.0"
-    "@lerna/version" "3.14.1"
+    "@lerna/version" "3.13.1"
 
-"@lerna/check-working-tree@3.14.1":
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.14.1.tgz#4102681c31e4cebed3968db27567e3180e519822"
-  integrity sha512-ae/sdZPNh4SS+6c4UDuWP/QKbtIFAn/TvKsPncA1Jdo0PqXLBlug4DzkHTGkvZ5F0nj+0JrSxYteInakJV99vg==
+"@lerna/check-working-tree@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.13.0.tgz#1ddcd4d9b1aceb65efaaa4cd1333a66706d67c9c"
+  integrity sha512-dsdO15NXX5To+Q53SYeCrBEpiqv4m5VkaPZxbGQZNwoRen1MloXuqxSymJANQn+ZLEqarv5V56gydebeROPH5A==
   dependencies:
-    "@lerna/collect-uncommitted" "3.14.1"
-    "@lerna/describe-ref" "3.13.3"
+    "@lerna/describe-ref" "3.13.0"
     "@lerna/validation-error" "3.13.0"
 
-"@lerna/child-process@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.13.3.tgz#6c084ee5cca9fc9e04d6bf4fc3f743ed26ff190c"
-  integrity sha512-3/e2uCLnbU+bydDnDwyadpOmuzazS01EcnOleAnuj9235CU2U97DH6OyoG1EW/fU59x11J+HjIqovh5vBaMQjQ==
+"@lerna/child-process@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.13.0.tgz#84e35adf3217a6983edd28080657b9596a052674"
+  integrity sha512-0iDS8y2jiEucD4fJHEzKoc8aQJgm7s+hG+0RmDNtfT0MM3n17pZnf5JOMtS1FJp+SEXOjMKQndyyaDIPFsnp6A==
   dependencies:
     chalk "^2.3.1"
     execa "^1.0.0"
     strong-log-transformer "^2.0.0"
 
-"@lerna/clean@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.14.0.tgz#4399f4a3289106b0b8ffbffd4a6cfd2e3fe935f2"
-  integrity sha512-wEuAqOS9VMqh2C20KD63IySzyEnyVDqDI3LUsXw+ByUf9AJDgEHv0TCOxbDjDYaaQw1tjSBNZMyYInNeoASwhA==
+"@lerna/clean@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.13.1.tgz#9a7432efceccd720a51da5c76f849fc59c5a14ce"
+  integrity sha512-myGIaXv7RUO2qCFZXvx8SJeI+eN6y9SUD5zZ4/LvNogbOiEIlujC5lUAqK65rAHayQ9ltSa/yK6Xv510xhZXZQ==
   dependencies:
-    "@lerna/command" "3.14.0"
-    "@lerna/filter-options" "3.14.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/filter-options" "3.13.0"
     "@lerna/prompt" "3.13.0"
     "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/rimraf-dir" "3.13.3"
+    "@lerna/rimraf-dir" "3.13.0"
     p-map "^1.2.0"
     p-map-series "^1.0.0"
     p-waterfall "^1.0.0"
@@ -1536,34 +1345,24 @@
     npmlog "^4.1.2"
     yargs "^12.0.1"
 
-"@lerna/collect-uncommitted@3.14.1":
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-3.14.1.tgz#b3498c4c7f46efc79092ce4aa0a24edc535e5d1a"
-  integrity sha512-hQ67S+nlSJwsPylXbWlrQSZUcWa8tTNIdcMd9OY4+QxdJlZUG7CLbWSyaxi0g11WdoRJHT163mr9xQyAvIVT1A==
-  dependencies:
-    "@lerna/child-process" "3.13.3"
-    chalk "^2.3.1"
-    figgy-pudding "^3.5.1"
-    npmlog "^4.1.2"
-
-"@lerna/collect-updates@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.14.0.tgz#64d64ff1ec05ac53dfe6851be49d2ad261e6795e"
-  integrity sha512-siRHo2atAwj5KpKVOo6QTVIYDYbNs7dzTG6ow9VcFMLKX5shuaEyFA22Z3LmnxQ3sakVFdgvvVeediEz6cM3VA==
+"@lerna/collect-updates@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.13.0.tgz#f0828d84ff959ff153d006765659ffc4d68cdefc"
+  integrity sha512-uR3u6uTzrS1p46tHQ/mlHog/nRJGBqskTHYYJbgirujxm6FqNh7Do+I1Q/7zSee407G4lzsNxZdm8IL927HemQ==
   dependencies:
-    "@lerna/child-process" "3.13.3"
-    "@lerna/describe-ref" "3.13.3"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/describe-ref" "3.13.0"
     minimatch "^3.0.4"
     npmlog "^4.1.2"
     slash "^1.0.0"
 
-"@lerna/command@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.14.0.tgz#5f5e68293c0ff1e85a20b4e96fa6bea33b7632df"
-  integrity sha512-PtFi5EtXB2VuSruoLsjfZdus56d7oKlZAI4iSRoaS/BBxE2Wyfn7//vW7Ow4hZCzuqb9tBcpDq+4u2pdXN1d2Q==
+"@lerna/command@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.13.1.tgz#b60dda2c0d9ffbb6030d61ddf7cceedc1e8f7e6e"
+  integrity sha512-SYWezxX+iheWvzRoHCrbs8v5zHPaxAx3kWvZhqi70vuGsdOVAWmaG4IvHLn11ztS+Vpd5PM+ztBWSbnykpLFKQ==
   dependencies:
-    "@lerna/child-process" "3.13.3"
-    "@lerna/package-graph" "3.14.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/package-graph" "3.13.0"
     "@lerna/project" "3.13.1"
     "@lerna/validation-error" "3.13.0"
     "@lerna/write-log-file" "3.13.0"
@@ -1573,10 +1372,10 @@
     lodash "^4.17.5"
     npmlog "^4.1.2"
 
-"@lerna/conventional-commits@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.14.0.tgz#24f643550dc29d4f1249cc26d0eb453d7a1c513d"
-  integrity sha512-hGZ2qQZ9uEGf2eeIiIpEodSs9Qkkf/2uYEtNT7QN1RYISPUh6/lKGBssc5dpbCF64aEuxmemWLdlDf1ogG6++w==
+"@lerna/conventional-commits@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.13.0.tgz#877aa225ca34cca61c31ea02a5a6296af74e1144"
+  integrity sha512-BeAgcNXuocmLhPxnmKU2Vy8YkPd/Uo+vu2i/p3JGsUldzrPC8iF3IDxH7fuXpEFN2Nfogu7KHachd4tchtOppA==
   dependencies:
     "@lerna/validation-error" "3.13.0"
     conventional-changelog-angular "^5.0.3"
@@ -1589,22 +1388,22 @@
     pify "^3.0.0"
     semver "^5.5.0"
 
-"@lerna/create-symlink@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.14.0.tgz#f40ae06e8cebe70c694368ebf9a4af5ab380fbea"
-  integrity sha512-Kw51HYOOi6UfCKncqkgEU1k/SYueSBXgkNL91FR8HAZH7EPSRTEtp9mnJo568g0+Hog5C+3cOaWySwhHpRG29A==
+"@lerna/create-symlink@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.13.0.tgz#e01133082fe040779712c960683cb3a272b67809"
+  integrity sha512-PTvg3jAAJSAtLFoZDsuTMv1wTOC3XYIdtg54k7uxIHsP8Ztpt+vlilY/Cni0THAqEMHvfiToel76Xdta4TU21Q==
   dependencies:
     cmd-shim "^2.0.2"
     fs-extra "^7.0.0"
     npmlog "^4.1.2"
 
-"@lerna/create@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.14.0.tgz#ec7a0d4aa81e60c918ea2ba06f3c71ee2855a936"
-  integrity sha512-J4PeGnzVBOSV7Cih8Uhv9xIauljR9bGcfSDN9aMzFtJhSX0xFXNvmnpXRORp7xNHV2lbxk7mNxRQxzR9CQRMuw==
+"@lerna/create@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.13.1.tgz#2c1284cfdc59f0d2b88286d78bc797f4ab330f79"
+  integrity sha512-pLENMXgTkQuvKxAopjKeoLOv9fVUCnpTUD7aLrY5d95/1xqSZlnsOcQfUYcpMf3GpOvHc8ILmI5OXkPqjAf54g==
   dependencies:
-    "@lerna/child-process" "3.13.3"
-    "@lerna/command" "3.14.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/command" "3.13.1"
     "@lerna/npm-conf" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     camelcase "^5.0.0"
@@ -1622,42 +1421,42 @@
     validate-npm-package-name "^3.0.0"
     whatwg-url "^7.0.0"
 
-"@lerna/describe-ref@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.13.3.tgz#13318513613f6a407d37fc5dc025ec2cfb705606"
-  integrity sha512-5KcLTvjdS4gU5evW8ESbZ0BF44NM5HrP3dQNtWnOUSKJRgsES8Gj0lq9AlB2+YglZfjEftFT03uOYOxnKto4Uw==
+"@lerna/describe-ref@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.13.0.tgz#fb4c3863fd6bcccad67ce7b183887a5fc1942bb6"
+  integrity sha512-UJefF5mLxLae9I2Sbz5RLYGbqbikRuMqdgTam0MS5OhXnyuuKYBUpwBshCURNb1dPBXTQhSwc7+oUhORx8ojCg==
   dependencies:
-    "@lerna/child-process" "3.13.3"
+    "@lerna/child-process" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/diff@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.14.0.tgz#a4860c062faf990dd3c208dcf1c6fbde5a042bdb"
-  integrity sha512-H6FSj0jOiQ6unVCwOK6ReT5uZN6ZIn/j/cx4YwuOtU3SMcs3UfuQRIFNeKg/tKmOcQGd39Mn9zDhmt3TAYGROA==
+"@lerna/diff@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.13.1.tgz#5c734321b0f6c46a3c87f55c99afef3b01d46520"
+  integrity sha512-cKqmpONO57mdvxtp8e+l5+tjtmF04+7E+O0QEcLcNUAjC6UR2OSM77nwRCXDukou/1h72JtWs0jjcdYLwAmApg==
   dependencies:
-    "@lerna/child-process" "3.13.3"
-    "@lerna/command" "3.14.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/command" "3.13.1"
     "@lerna/validation-error" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/exec@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.14.0.tgz#da632dac4a86d59f7fe8c566af8648f8272241ff"
-  integrity sha512-cNFO8hWsBVLeqVQ7LsQ4rYKbbQ2eN+Ne+hWKTlUQoyRbYzgJ22TXhjKR6IMr68q0xtclcDlasfcNO+XEWESh0g==
+"@lerna/exec@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.13.1.tgz#4439e90fb0877ec38a6ef933c86580d43eeaf81b"
+  integrity sha512-I34wEP9lrAqqM7tTXLDxv/6454WFzrnXDWpNDbiKQiZs6SIrOOjmm6I4FiQsx+rU3o9d+HkC6tcUJRN5mlJUgA==
   dependencies:
-    "@lerna/child-process" "3.13.3"
-    "@lerna/command" "3.14.0"
-    "@lerna/filter-options" "3.14.0"
-    "@lerna/run-topologically" "3.14.0"
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/filter-options" "3.13.0"
+    "@lerna/run-parallel-batches" "3.13.0"
     "@lerna/validation-error" "3.13.0"
-    p-map "^1.2.0"
 
-"@lerna/filter-options@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.14.0.tgz#6a2e60708633f54973bf31262b58e53efb537ef2"
-  integrity sha512-ZmNZK9m8evxHc+2ZnDyCm8XFIKVDKpIASG1wtizr3R14t49fuYE7nR+rm4t82u9oSSmER8gb8bGzh0SKZme/jg==
+"@lerna/filter-options@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.13.0.tgz#976e3d8b9fcd47001ab981d276565c1e9f767868"
+  integrity sha512-SRp7DCo9zrf+7NkQxZMkeyO1GRN6GICoB9UcBAbXhLbWisT37Cx5/6+jh49gYB63d/0/WYHSEPMlheUrpv1Srw==
   dependencies:
-    "@lerna/collect-updates" "3.14.0"
+    "@lerna/collect-updates" "3.13.0"
     "@lerna/filter-packages" "3.13.0"
     dedent "^0.7.0"
 
@@ -1686,12 +1485,12 @@
     ssri "^6.0.1"
     tar "^4.4.8"
 
-"@lerna/github-client@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.13.3.tgz#bcf9b4ff40bdd104cb40cd257322f052b41bb9ce"
-  integrity sha512-fcJkjab4kX0zcLLSa/DCUNvU3v8wmy2c1lhdIbL7s7gABmDcV0QZq93LhnEee3VkC9UpnJ6GKG4EkD7eIifBnA==
+"@lerna/github-client@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.13.1.tgz#cb9bf9f01685a0cee0fac63f287f6c3673e45aa3"
+  integrity sha512-iPLUp8FFoAKGURksYEYZzfuo9TRA+NepVlseRXFaWlmy36dCQN20AciINpoXiXGoHcEUHXUKHQvY3ARFdMlf3w==
   dependencies:
-    "@lerna/child-process" "3.13.3"
+    "@lerna/child-process" "3.13.0"
     "@octokit/plugin-enterprise-rest" "^2.1.1"
     "@octokit/rest" "^16.16.0"
     git-url-parse "^11.1.2"
@@ -1702,21 +1501,21 @@
   resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1"
   integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==
 
-"@lerna/has-npm-version@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.13.3.tgz#167e3f602a2fb58f84f93cf5df39705ca6432a2d"
-  integrity sha512-mQzoghRw4dBg0R9FFfHrj0TH0glvXyzdEZmYZ8Isvx5BSuEEwpsryoywuZSdppcvLu8o7NAdU5Tac8cJ/mT52w==
+"@lerna/has-npm-version@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.13.0.tgz#6e1f7e9336cce3e029066f0175f06dd9d51ad09f"
+  integrity sha512-Oqu7DGLnrMENPm+bPFGOHnqxK8lCnuYr6bk3g/CoNn8/U0qgFvHcq6Iv8/Z04TsvleX+3/RgauSD2kMfRmbypg==
   dependencies:
-    "@lerna/child-process" "3.13.3"
+    "@lerna/child-process" "3.13.0"
     semver "^5.5.0"
 
-"@lerna/import@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.14.0.tgz#de5727dc18d21c50af14b481e47b424c5bbe107c"
-  integrity sha512-j8z/m85FX1QYPgl5TzMNupdxsQF/NFZSmdCR19HQzqiVKC8ULGzF30WJEk66+KeZ94wYMSakINtYD+41s34pNQ==
+"@lerna/import@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.13.1.tgz#69d641341a38b79bd379129da1c717d51dd728c7"
+  integrity sha512-A1Vk1siYx1XkRl6w+zkaA0iptV5TIynVlHPR9S7NY0XAfhykjztYVvwtxarlh6+VcNrO9We6if0+FXCrfDEoIg==
   dependencies:
-    "@lerna/child-process" "3.13.3"
-    "@lerna/command" "3.14.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/command" "3.13.1"
     "@lerna/prompt" "3.13.0"
     "@lerna/pulse-till-done" "3.13.0"
     "@lerna/validation-error" "3.13.0"
@@ -1724,44 +1523,44 @@
     fs-extra "^7.0.0"
     p-map-series "^1.0.0"
 
-"@lerna/init@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.14.0.tgz#f5b92f171f9ed4168bd3d9305fffe6a46460a1d2"
-  integrity sha512-X3PQkQZds5ozA1xiarmVzAK6LPLNK3bBu24Api0w2KJXO7Ccs9ob/VcGdevZuzqdJo1Xg2H6oBhEqIClU9Uqqw==
+"@lerna/init@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.13.1.tgz#0392c822abb3d63a75be4916c5e761cfa7b34dda"
+  integrity sha512-M59WACqim8WkH5FQEGOCEZ89NDxCKBfFTx4ZD5ig3LkGyJ8RdcJq5KEfpW/aESuRE9JrZLzVr0IjKbZSxzwEMA==
   dependencies:
-    "@lerna/child-process" "3.13.3"
-    "@lerna/command" "3.14.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/command" "3.13.1"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
     write-json-file "^2.3.0"
 
-"@lerna/link@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.14.0.tgz#817243559b3d460a08bd65582e7632b1dbc6df69"
-  integrity sha512-xlwQhWTVOZrgAuoONY3/OIBWehDfZXmf5qFhnOy7lIxByRhEX5Vwx0ApaGxHTv3Flv7T+oI4s8UZVq5F6dT8Aw==
+"@lerna/link@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.13.1.tgz#7d8ed4774bfa198d1780f790a14abb8722a3aad1"
+  integrity sha512-N3h3Fj1dcea+1RaAoAdy4g2m3fvU7m89HoUn5X/Zcw5n2kPoK8kTO+NfhNAatfRV8VtMXst8vbNrWQQtfm0FFw==
   dependencies:
-    "@lerna/command" "3.14.0"
-    "@lerna/package-graph" "3.14.0"
-    "@lerna/symlink-dependencies" "3.14.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/package-graph" "3.13.0"
+    "@lerna/symlink-dependencies" "3.13.0"
     p-map "^1.2.0"
     slash "^1.0.0"
 
-"@lerna/list@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.14.0.tgz#cfe826937c63a3652003639eb7fd36bf4b0a3660"
-  integrity sha512-Gp+9gaIkBfXBwc9Ng0Y74IEfAqpQpLiXwOP4IOpdINxOeDpllhMaYP6SzLaMvrfSyHRayM7Cq5/PRnHkXQ5uuQ==
+"@lerna/list@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.13.1.tgz#f9513ed143e52156c10ada4070f903c5847dcd10"
+  integrity sha512-635iRbdgd9gNvYLLIbYdQCQLr+HioM5FGJLFS0g3DPGygr6iDR8KS47hzCRGH91LU9NcM1mD1RoT/AChF+QbiA==
   dependencies:
-    "@lerna/command" "3.14.0"
-    "@lerna/filter-options" "3.14.0"
-    "@lerna/listable" "3.14.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/filter-options" "3.13.0"
+    "@lerna/listable" "3.13.0"
     "@lerna/output" "3.13.0"
 
-"@lerna/listable@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.14.0.tgz#08f4c78e0466568e8e8a57d4ad09537f2bb7bbb9"
-  integrity sha512-ZK44Mo8xf/N97eQZ236SPSq0ek6+gk4HqHIx05foEMZVV1iIDH4a/nblLsJNjGQVsIdMYFPaqNJ0z+ZQfiJazQ==
+"@lerna/listable@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.13.0.tgz#babc18442c590b549cf0966d20d75fea066598d4"
+  integrity sha512-liYJ/WBUYP4N4MnSVZuLUgfa/jy3BZ02/1Om7xUY09xGVSuNVNEeB8uZUMSC+nHqFHIsMPZ8QK9HnmZb1E/eTA==
   dependencies:
-    "@lerna/query-graph" "3.14.0"
+    "@lerna/batch-packages" "3.13.0"
     chalk "^2.3.1"
     columnify "^1.5.4"
 
@@ -1783,23 +1582,22 @@
     config-chain "^1.1.11"
     pify "^3.0.0"
 
-"@lerna/npm-dist-tag@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.14.0.tgz#69b1f99ce9d777782afe646522cb14293d986eb5"
-  integrity sha512-DEyYEdufTGIC6E4RTJUsYPgqlz1Bs/XPeEQ5fd+ojWnICevj7dRrr2DfHucPiUCADlm2jbAraAQc3QPU0dXRhw==
+"@lerna/npm-dist-tag@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.13.0.tgz#49ecbe0e82cbe4ad4a8ea6de112982bf6c4e6cd4"
+  integrity sha512-mcuhw34JhSRFrbPn0vedbvgBTvveG52bR2lVE3M3tfE8gmR/cKS/EJFO4AUhfRKGCTFn9rjaSEzlFGYV87pemQ==
   dependencies:
-    "@lerna/otplease" "3.14.0"
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.1.0"
     npm-registry-fetch "^3.9.0"
     npmlog "^4.1.2"
 
-"@lerna/npm-install@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.13.3.tgz#9b09852732e51c16d2e060ff2fd8bfbbb49cf7ba"
-  integrity sha512-7Jig9MLpwAfcsdQ5UeanAjndChUjiTjTp50zJ+UZz4CbIBIDhoBehvNMTCL2G6pOEC7sGEg6sAqJINAqred6Tg==
+"@lerna/npm-install@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.13.0.tgz#88f4cc39f4f737c8a8721256b915ea1bcc6a7227"
+  integrity sha512-qNyfts//isYQxore6fsPorNYJmPVKZ6tOThSH97tP0aV91zGMtrYRqlAoUnDwDdAjHPYEM16hNujg2wRmsqqIw==
   dependencies:
-    "@lerna/child-process" "3.13.3"
+    "@lerna/child-process" "3.13.0"
     "@lerna/get-npm-exec-opts" "3.13.0"
     fs-extra "^7.0.0"
     npm-package-arg "^6.1.0"
@@ -1807,38 +1605,28 @@
     signal-exit "^3.0.2"
     write-pkg "^3.1.0"
 
-"@lerna/npm-publish@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.14.0.tgz#e3fc5613a2dd08cdd3323347ba87fad5dc5f11fb"
-  integrity sha512-ShG0qEnGkWxtjQvIRATgm/CzeoVaSyyoNRag5t8gDSR/r2u9ux72oROKQUEaE8OwcTS4rL2cyBECts8XMNmyYw==
+"@lerna/npm-publish@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.13.0.tgz#5c74808376e778865ffdc5885fe83935e15e60c3"
+  integrity sha512-y4WO0XTaf9gNRkI7as6P2ItVDOxmYHwYto357fjybcnfXgMqEA94c3GJ++jU41j0A9vnmYC6/XxpTd9sVmH9tA==
   dependencies:
-    "@lerna/otplease" "3.14.0"
-    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/run-lifecycle" "3.13.0"
     figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
     libnpmpublish "^1.1.1"
-    npm-package-arg "^6.1.0"
     npmlog "^4.1.2"
     pify "^3.0.0"
     read-package-json "^2.0.13"
 
-"@lerna/npm-run-script@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.13.3.tgz#9bb6389ed70cd506905d6b05b6eab336b4266caf"
-  integrity sha512-qR4o9BFt5hI8Od5/DqLalOJydnKpiQFEeN0h9xZi7MwzuX1Ukwh3X22vqsX4YRbipIelSFtrDzleNVUm5jj0ow==
+"@lerna/npm-run-script@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.13.0.tgz#e5997f045402b9948bdc066033ebb36bf94fc9e4"
+  integrity sha512-hiL3/VeVp+NFatBjkGN8mUdX24EfZx9rQlSie0CMgtjc7iZrtd0jCguLomSCRHYjJuvqgbp+LLYo7nHVykfkaQ==
   dependencies:
-    "@lerna/child-process" "3.13.3"
+    "@lerna/child-process" "3.13.0"
     "@lerna/get-npm-exec-opts" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/otplease@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-3.14.0.tgz#b539fd3e7a08452fc0db3b10010ca3cf0e4a73e7"
-  integrity sha512-rYAWzaYZ81bwnrmTkYWGgcc13bl/6DlG7pjWQWNGAJNLzO5zzj0xmXN5sMFJnNvDpSiS/ZS1sIuPvb4xnwLUkg==
-  dependencies:
-    "@lerna/prompt" "3.13.0"
-    figgy-pudding "^3.5.1"
-
 "@lerna/output@3.13.0":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989"
@@ -1846,29 +1634,27 @@
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/pack-directory@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.14.0.tgz#229446c2e3f307a7932f2f779d7fb8b8ff7d93b0"
-  integrity sha512-E9PmC1oWYjYN8Z0Oeoj7X98NruMg/pcdDiRxnwJ5awnB0d/kyfoquHXCYwCQQFCnWUfto7m5lM4CSostcolEVQ==
+"@lerna/pack-directory@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.13.1.tgz#5ad4d0945f86a648f565e24d53c1e01bb3a912d1"
+  integrity sha512-kXnyqrkQbCIZOf1054N88+8h0ItC7tUN5v9ca/aWpx298gsURpxUx/1TIKqijL5TOnHMyIkj0YJmnH/PyBVLKA==
   dependencies:
     "@lerna/get-packed" "3.13.0"
     "@lerna/package" "3.13.0"
-    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/run-lifecycle" "3.13.0"
     figgy-pudding "^3.5.1"
     npm-packlist "^1.4.1"
     npmlog "^4.1.2"
     tar "^4.4.8"
     temp-write "^3.4.0"
 
-"@lerna/package-graph@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.14.0.tgz#4ccdf446dccedfbbeb4efff3eb720cb6fcb109fc"
-  integrity sha512-dNpA/64STD5YXhaSlg4gT6Z474WPJVCHoX1ibsVIFu0fVgH609Y69bsdmbvTRdI7r6Dcu4ZfGxdR636RTrH+Eg==
+"@lerna/package-graph@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.13.0.tgz#607062f8d2ce22b15f8d4a0623f384736e67f760"
+  integrity sha512-3mRF1zuqFE1HEFmMMAIggXy+f+9cvHhW/jzaPEVyrPNLKsyfJQtpTNzeI04nfRvbAh+Gd2aNksvaW/w3xGJnnw==
   dependencies:
-    "@lerna/prerelease-id-from-version" "3.14.0"
     "@lerna/validation-error" "3.13.0"
     npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
     semver "^5.5.0"
 
 "@lerna/package@3.13.0":
@@ -1880,13 +1666,6 @@
     npm-package-arg "^6.1.0"
     write-pkg "^3.1.0"
 
-"@lerna/prerelease-id-from-version@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.14.0.tgz#d5da9c26ac4a0d0ecde09018f06e41ca4dd444c2"
-  integrity sha512-Ap3Z/dNhqQuSrKmK+JmzYvQYI2vowxHvUVxZJiDVilW8dyNnxkCsYFmkuZytk5sxVz4VeGLNPS2RSsU5eeSS+Q==
-  dependencies:
-    semver "^5.5.0"
-
 "@lerna/project@3.13.1":
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.13.1.tgz#bce890f60187bd950bcf36c04b5260642e295e79"
@@ -1913,29 +1692,29 @@
     inquirer "^6.2.0"
     npmlog "^4.1.2"
 
-"@lerna/publish@3.14.1":
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.14.1.tgz#c1f7ad8d152947bb88a1755b4305a5a431d3e610"
-  integrity sha512-p+By/P84XJkndBzrmcnVLMcFpGAE+sQZCQK4e3aKQrEMLDrEwXkWt/XJxzeQskPxInFA/7Icj686LOADO7p0qg==
-  dependencies:
-    "@lerna/check-working-tree" "3.14.1"
-    "@lerna/child-process" "3.13.3"
-    "@lerna/collect-updates" "3.14.0"
-    "@lerna/command" "3.14.0"
-    "@lerna/describe-ref" "3.13.3"
+"@lerna/publish@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.13.1.tgz#217e401dcb5824cdd6d36555a36303fb7520c514"
+  integrity sha512-KhCJ9UDx76HWCF03i5TD7z5lX+2yklHh5SyO8eDaLptgdLDQ0Z78lfGj3JhewHU2l46FztmqxL/ss0IkWHDL+g==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/check-working-tree" "3.13.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/collect-updates" "3.13.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/describe-ref" "3.13.0"
     "@lerna/log-packed" "3.13.0"
     "@lerna/npm-conf" "3.13.0"
-    "@lerna/npm-dist-tag" "3.14.0"
-    "@lerna/npm-publish" "3.14.0"
+    "@lerna/npm-dist-tag" "3.13.0"
+    "@lerna/npm-publish" "3.13.0"
     "@lerna/output" "3.13.0"
-    "@lerna/pack-directory" "3.14.0"
-    "@lerna/prerelease-id-from-version" "3.14.0"
+    "@lerna/pack-directory" "3.13.1"
     "@lerna/prompt" "3.13.0"
     "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/run-lifecycle" "3.14.0"
-    "@lerna/run-topologically" "3.14.0"
+    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/run-parallel-batches" "3.13.0"
     "@lerna/validation-error" "3.13.0"
-    "@lerna/version" "3.14.1"
+    "@lerna/version" "3.13.1"
     figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
     libnpmaccess "^3.0.1"
@@ -1945,6 +1724,7 @@
     p-finally "^1.0.0"
     p-map "^1.2.0"
     p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
     pacote "^9.5.0"
     semver "^5.5.0"
 
@@ -1955,14 +1735,6 @@
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/query-graph@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-3.14.0.tgz#2abb36f445bd924d0f85ac7aec1445e9ef1e2c6c"
-  integrity sha512-6YTh3vDMW2hUxHdKeRvx4bosc9lZClKaN+DzC1XKTkwDbWrsjmEzLcemKL6QnyyeuryN2f/eto7P9iSe3z3pQQ==
-  dependencies:
-    "@lerna/package-graph" "3.14.0"
-    figgy-pudding "^3.5.1"
-
 "@lerna/resolve-symlink@3.13.0":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.13.0.tgz#3e6809ef53b63fe914814bfa071cd68012e22fbb"
@@ -1972,24 +1744,24 @@
     npmlog "^4.1.2"
     read-cmd-shim "^1.0.1"
 
-"@lerna/rimraf-dir@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.13.3.tgz#3a8e71317fde853893ef0262bc9bba6a180b7227"
-  integrity sha512-d0T1Hxwu3gpYVv73ytSL+/Oy8JitsmvOYUR5ouRSABsmqS7ZZCh5t6FgVDDGVXeuhbw82+vuny1Og6Q0k4ilqw==
+"@lerna/rimraf-dir@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.13.0.tgz#bb1006104b4aabcb6985624273254648f872b278"
+  integrity sha512-kte+pMemulre8cmPqljxIYjCmdLByz8DgHBHXB49kz2EiPf8JJ+hJFt0PzEubEyJZ2YE2EVAx5Tv5+NfGNUQyQ==
   dependencies:
-    "@lerna/child-process" "3.13.3"
+    "@lerna/child-process" "3.13.0"
     npmlog "^4.1.2"
     path-exists "^3.0.0"
     rimraf "^2.6.2"
 
-"@lerna/run-lifecycle@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.14.0.tgz#0499eca0e7f393faf4e24e6c8737302a9059c22b"
-  integrity sha512-GUM3L9MzGRSW0WQ8wbLW1+SYStU1OFjW0GBzShhBnFrO4nGRrU7VchsLpcLu0hk2uCzyhsrDKzifEdOdUyMoEQ==
+"@lerna/run-lifecycle@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.13.0.tgz#d8835ee83425edee40f687a55f81b502354d3261"
+  integrity sha512-oyiaL1biZdjpmjh6X/5C4w07wNFyiwXSSHH5GQB4Ay4BPwgq9oNhCcxRoi0UVZlZ1YwzSW8sTwLgj8emkIo3Yg==
   dependencies:
     "@lerna/npm-conf" "3.13.0"
     figgy-pudding "^3.5.1"
-    npm-lifecycle "^2.1.1"
+    npm-lifecycle "^2.1.0"
     npmlog "^4.1.2"
 
 "@lerna/run-parallel-batches@3.13.0":
@@ -2000,47 +1772,39 @@
     p-map "^1.2.0"
     p-map-series "^1.0.0"
 
-"@lerna/run-topologically@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-3.14.0.tgz#2a560cb657f0ef1565c680b6001b4b01b872dc07"
-  integrity sha512-y+KBpC1YExFzGynovt9MY4O/bc3RrJaKeuXieiPfKGKxrdtmZe/r33oj/xePTXZq65jnw3SaU3H8S5CrrdkwDg==
-  dependencies:
-    "@lerna/query-graph" "3.14.0"
-    figgy-pudding "^3.5.1"
-    p-queue "^4.0.0"
-
-"@lerna/run@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.14.0.tgz#1a5d3330149fbf5092012707b775d5f57d9d0057"
-  integrity sha512-kGGFGLYPKozAN07CSJ7kOyLY6W3oLCQcxCathg1isSkBqQH29tWUg8qNduOlhIFLmnq/nf1JEJxxoXnF6IRLjQ==
+"@lerna/run@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.13.1.tgz#87e174c1d271894ddd29adc315c068fb7b1b0117"
+  integrity sha512-nv1oj7bsqppWm1M4ifN+/IIbVu9F4RixrbQD2okqDGYne4RQPAXyb5cEZuAzY/wyGTWWiVaZ1zpj5ogPWvH0bw==
   dependencies:
-    "@lerna/command" "3.14.0"
-    "@lerna/filter-options" "3.14.0"
-    "@lerna/npm-run-script" "3.13.3"
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/filter-options" "3.13.0"
+    "@lerna/npm-run-script" "3.13.0"
     "@lerna/output" "3.13.0"
-    "@lerna/run-topologically" "3.14.0"
+    "@lerna/run-parallel-batches" "3.13.0"
     "@lerna/timer" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     p-map "^1.2.0"
 
-"@lerna/symlink-binary@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.14.0.tgz#db1c3204b83d91c4b43386302ee76cea4d20bc3f"
-  integrity sha512-AHFb4NlazxYmC+7guoamM3laIRbMSeKERMooKHJ7moe0ayGPBWsCGOH+ZFKZ+eXSDek+FnxdzayR3wf8B3LkTg==
+"@lerna/symlink-binary@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.13.0.tgz#36a9415d468afcb8105750296902f6f000a9680d"
+  integrity sha512-obc4Y6jxywkdaCe+DB0uTxYqP0IQ8mFWvN+k/YMbwH4G2h7M7lCBWgPy8e7xw/50+1II9tT2sxgx+jMus1sTJg==
   dependencies:
-    "@lerna/create-symlink" "3.14.0"
+    "@lerna/create-symlink" "3.13.0"
     "@lerna/package" "3.13.0"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
 
-"@lerna/symlink-dependencies@3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.14.0.tgz#f17e5cd704a0f067636038dafeaf42b5d2f28802"
-  integrity sha512-kuSXxwAWiVZqFcXfUBKH4yLUH3lrnGyZmCYon7UnZitw3AK3LQY7HvV2LNNw/oatfjOAiKhPBxnYjYijKiV4oA==
+"@lerna/symlink-dependencies@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.13.0.tgz#76c23ecabda7824db98a0561364f122b457509cf"
+  integrity sha512-7CyN5WYEPkbPLbqHBIQg/YiimBzb5cIGQB0E9IkLs3+racq2vmUNQZn38LOaazQacAA83seB+zWSxlI6H+eXSg==
   dependencies:
-    "@lerna/create-symlink" "3.14.0"
+    "@lerna/create-symlink" "3.13.0"
     "@lerna/resolve-symlink" "3.13.0"
-    "@lerna/symlink-binary" "3.14.0"
+    "@lerna/symlink-binary" "3.13.0"
     fs-extra "^7.0.0"
     p-finally "^1.0.0"
     p-map "^1.2.0"
@@ -2058,23 +1822,21 @@
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/version@3.14.1":
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.14.1.tgz#df081fec70fcfdcd3c470648c49b035b44a373bf"
-  integrity sha512-H/jykoxVIt4oDEYkBgwDfO5dmZFl3G6vP1UEttRVP1FIkI+gCN+olby8S0Qd8XprDuR5OrLboiDWQs3p7nJhLw==
-  dependencies:
-    "@lerna/batch-packages" "3.14.0"
-    "@lerna/check-working-tree" "3.14.1"
-    "@lerna/child-process" "3.13.3"
-    "@lerna/collect-updates" "3.14.0"
-    "@lerna/command" "3.14.0"
-    "@lerna/conventional-commits" "3.14.0"
-    "@lerna/github-client" "3.13.3"
+"@lerna/version@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.13.1.tgz#5e919d13abb13a663dcc7922bb40931f12fb137b"
+  integrity sha512-WpfKc5jZBBOJ6bFS4atPJEbHSiywQ/Gcd+vrwaEGyQHWHQZnPTvhqLuq3q9fIb9sbuhH5pSY6eehhuBrKqTnjg==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/check-working-tree" "3.13.0"
+    "@lerna/child-process" "3.13.0"
+    "@lerna/collect-updates" "3.13.0"
+    "@lerna/command" "3.13.1"
+    "@lerna/conventional-commits" "3.13.0"
+    "@lerna/github-client" "3.13.1"
     "@lerna/output" "3.13.0"
-    "@lerna/prerelease-id-from-version" "3.14.0"
     "@lerna/prompt" "3.13.0"
-    "@lerna/run-lifecycle" "3.14.0"
-    "@lerna/run-topologically" "3.14.0"
+    "@lerna/run-lifecycle" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     chalk "^2.3.1"
     dedent "^0.7.0"
@@ -2109,53 +1871,42 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@octokit/endpoint@^5.1.0":
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.1.4.tgz#e6bb3ceda8923fdc9703ded78c9acc28eff88c06"
-  integrity sha512-DypS8gbbcc9rlOCDW0wV9a+B18+ylduj6PpxeE+qa3IK1h5b0eW4CKj5pxxXWOZUYhEKwgOnh3+Q+Y/hx/bOPw==
+"@octokit/endpoint@^3.2.0":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-3.2.3.tgz#bd9aea60cd94ce336656b57a5c9cb7f10be8f4f3"
+  integrity sha512-yUPCt4vMIOclox13CUxzuKiPJIFo46b/6GhUnUTw5QySczN1L0DtSxgmIZrZV4SAb9EyAqrceoyrWoYVnfF2AA==
   dependencies:
     deepmerge "3.2.0"
-    is-plain-object "^3.0.0"
-    universal-user-agent "^2.1.0"
+    is-plain-object "^2.0.4"
+    universal-user-agent "^2.0.1"
     url-template "^2.0.8"
 
 "@octokit/plugin-enterprise-rest@^2.1.1":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.2.tgz#c0e22067a043e19f96ff9c7832e2a3019f9be75c"
-  integrity sha512-CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw==
-
-"@octokit/request-error@^1.0.1", "@octokit/request-error@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.0.2.tgz#e6dbc5be13be1041ef8eca9225520982add574cf"
-  integrity sha512-T9swMS/Vc4QlfWrvyeSyp/GjhXtYaBzCcibjGywV4k4D2qVrQKfEMPy8OxMDEj7zkIIdpHwqdpVbKCvnUPqkXw==
-  dependencies:
-    deprecation "^2.0.0"
-    once "^1.4.0"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.1.tgz#47954271289cfc65607a8cfb0257f0d47fb2d486"
+  integrity sha512-Ssrh5D5uOqeS/Kjs6bbzn4ZaaaZQ2h6X/DgoDVv0Goa2ncpHwBN644hfYOL5ycigkpYbHKTjyb6cM49kPwQRPA==
 
-"@octokit/request@^4.0.1":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-4.1.0.tgz#e85dc377113baf2fe24433af8feb20e8a32e21b0"
-  integrity sha512-RvpQAba4i+BNH0z8i0gPRc1ShlHidj4puQjI/Tno6s+Q3/Mzb0XRSHJiOhpeFrZ22V7Mwjq1E7QS27P5CgpWYA==
+"@octokit/request@2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-2.4.2.tgz#87c36e820dd1e43b1629f4f35c95b00cd456320b"
+  integrity sha512-lxVlYYvwGbKSHXfbPk5vxEA8w4zHOH1wobado4a9EfsyD3Cbhuhus1w0Ye9Ro0eMubGO8kNy5d+xNFisM3Tvaw==
   dependencies:
-    "@octokit/endpoint" "^5.1.0"
-    "@octokit/request-error" "^1.0.1"
-    deprecation "^2.0.0"
-    is-plain-object "^3.0.0"
+    "@octokit/endpoint" "^3.2.0"
+    deprecation "^1.0.1"
+    is-plain-object "^2.0.4"
     node-fetch "^2.3.0"
     once "^1.4.0"
-    universal-user-agent "^2.1.0"
+    universal-user-agent "^2.0.1"
 
 "@octokit/rest@^16.16.0":
-  version "16.27.3"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.27.3.tgz#20ad5d0c7043364d1e1f72fa74f825c181771fc0"
-  integrity sha512-WWH/SHF4kus6FG+EAfX7/JYH70EjgFYa4AAd2Lf1hgmgzodhrsoxpXPSZliZ5BdJruZPMP7ZYaPoTrYCCKYzmQ==
+  version "16.18.1"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.18.1.tgz#e6cbf111a8afc3d5ad44c98edf264124f1568ea0"
+  integrity sha512-ozKUH4KCusmPQ6xHxF2q1IDVM5tPbmmAUP69yRLd98BH16mqOVwMkm6zLCUJPD03IVhG+YNHShJDc077CTkIWg==
   dependencies:
-    "@octokit/request" "^4.0.1"
-    "@octokit/request-error" "^1.0.2"
-    atob-lite "^2.0.0"
+    "@octokit/request" "2.4.2"
     before-after-hook "^1.4.0"
     btoa-lite "^1.0.0"
-    deprecation "^2.0.0"
+    deprecation "^1.0.1"
     lodash.get "^4.4.2"
     lodash.set "^4.3.2"
     lodash.uniq "^4.5.0"
@@ -2164,23 +1915,24 @@
     universal-user-agent "^2.0.0"
     url-template "^2.0.8"
 
-"@react-navigation/core@~3.4.1":
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.4.2.tgz#bec563e94fde40fbab3730cdc97f22afbb2a1498"
-  integrity sha512-7G+iDzLSTeOUU4vVZeRZKJ+Bd7ds7ZxYNqZcB8i0KlBeQEQfR74Ounfu/p0KIEq2RiNnaE3QT7WVP3C87sebzw==
+"@react-navigation/core@3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.2.0.tgz#329dfe54f305ee22ed750d51cb09c5d18562d56f"
+  integrity sha512-MXjTqqPFbifXGlws4hSye9Ax4dEM2OvV7VMEJOJU9TbzQjyewi59Cjplbt8pYQ5ummvkKeRS2FlQYIygNR5oCQ==
   dependencies:
-    hoist-non-react-statics "^3.3.0"
+    create-react-context "0.2.2"
+    hoist-non-react-statics "^2.5.5"
     path-to-regexp "^1.7.0"
-    query-string "^6.4.2"
-    react-is "^16.8.6"
+    query-string "^6.2.0"
+    react-is "^16.6.3"
 
-"@react-navigation/native@~3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.5.0.tgz#f5d16e0845ac26d1147d1caa481f18a00740e7ae"
-  integrity sha512-TmGOis++ejEXG3sqNJhCSKqB0/qLu3FQgDtO959qpqif36R/diR8SQwJqeSdofoEiK3CepdhFlTCeHdS1/+MsQ==
+"@react-navigation/native@~3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.3.0.tgz#def7a94ef17581a404a3de2a3200f986e999dac1"
+  integrity sha512-w/+2B0qX441BpNkYb5QoPY8+Q4Q18adGTahVpc6o8Juj6odAxyIJ2RozXk7dCpN/w0dz4B+5ggqMKHVniE6K7w==
   dependencies:
     hoist-non-react-statics "^3.0.1"
-    react-native-safe-area-view "^0.14.1"
+    react-native-safe-area-view "^0.13.0"
     react-native-screens "^1.0.0 || ^1.0.0-alpha"
 
 "@react-slate/components@0.2.0":
@@ -2249,48 +2001,15 @@
     passport-oauth2 "1.x.x"
     underscore "^1.7.0"
 
-"@types/babel__core@^7.1.0":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
-  integrity sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
-  integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
-  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2"
-  integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
 "@types/bcryptjs@^2.4.2":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.2.tgz#e3530eac9dd136bfdfb0e43df2c4c5ce1f77dfae"
   integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
 
 "@types/bluebird@*":
-  version "3.5.27"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.27.tgz#61eb4d75dc6bfbce51cf49ee9bbebe941b2cb5d0"
-  integrity sha512-6BmYWSBea18+tSjjSC3QIyV93ZKAeNWGM7R6aYt1ryTZXrlHF+QLV0G2yV0viEGVyRkyQsWfMoJ0k/YghBX5sQ==
+  version "3.5.26"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.26.tgz#a38c438ae84fa02431d6892edf86e46edcbca291"
+  integrity sha512-aj2mrBLn5ky0GmAg6IPXrQjnN0iB/ulozuJ+oZdrHRAzRbXjGmu4UXsNCjFvPbSaaPZmniocdOzsM392qLOlmQ==
 
 "@types/body-parser@*":
   version "1.17.0"
@@ -2326,6 +2045,13 @@
   resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.1.tgz#90b68446364baf9efd8e8349bb36bd3852b75b80"
   integrity sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==
 
+"@types/cross-spawn@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.0.tgz#320aaf1d1a12979f1b84fe7a5590a7e860bf3a80"
+  integrity sha512-evp2ZGsFw9YKprDbg8ySgC9NA15g3YgiI8ANkGmKKvvi0P2aDGYLPxQIC5qfeKNUOe3TjABVGuah6omPRpIYhg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -2350,9 +2076,9 @@
     "@types/react-native-vector-icons" "*"
 
 "@types/express-serve-static-core@*":
-  version "4.16.7"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz#50ba6f8a691c08a3dd9fa7fba25ef3133d298049"
-  integrity sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz#35df7b302299a4ab138a643617bd44078e74d44e"
+  integrity sha512-QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA==
   dependencies:
     "@types/node" "*"
     "@types/range-parser" "*"
@@ -2366,9 +2092,9 @@
     "@types/node" "*"
 
 "@types/express@*":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287"
-  integrity sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.1.tgz#d756bd1a85c34d87eaf44c888bad27ba8a4b7cf0"
+  integrity sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -2379,7 +2105,7 @@
   resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
   integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
 
-"@types/glob@*", "@types/glob@^7.1.1":
+"@types/glob@*":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
   integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
@@ -2426,37 +2152,15 @@
   resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.29.tgz#aa845204cd0a289f65d47e0de63a6a815e30cc66"
   integrity sha512-lRVw09gOvgviOfeUrKc/pmTiRZ7g7oDOU6OAutyuSHpm1/o2RaBQvRhgK8QEdu+FFuw/wnWb29A/iuxv9i8OpQ==
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
-
-"@types/istanbul-lib-report@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
-  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-    "@types/istanbul-lib-report" "*"
-
-"@types/jest-diff@*":
-  version "20.0.1"
-  resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
-  integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==
+"@types/istanbul-lib-coverage@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#2cc2ca41051498382b43157c8227fea60363f94a"
+  integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==
 
-"@types/jest@^24.0.13":
-  version "24.0.13"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.13.tgz#10f50b64cb05fb02411fbba49e9042a3a11da3f9"
-  integrity sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==
-  dependencies:
-    "@types/jest-diff" "*"
+"@types/jest@^23.3.1":
+  version "23.3.14"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.14.tgz#37daaf78069e7948520474c87b80092ea912520a"
+  integrity sha512-Q5hTcfdudEL2yOmluA1zaSyPbzWPmJ3XfSWeP3RyoYvS9hnje1ZyagrZOuQ6+1nQC1Gw+7gap3pLNL3xL6UBug==
 
 "@types/jsdom@^12.2.0":
   version "12.2.3"
@@ -2490,9 +2194,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.112":
-  version "4.14.134"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.134.tgz#9032b440122db3a2a56200e91191996161dde5b9"
-  integrity sha512-2/O0khFUCFeDlbi7sZ7ZFRCcT812fAeOLm7Ev4KbwASkZ575TDrDcY7YyaoHdTOzKcNbfiwLYZqPmoC4wadrsw==
+  version "4.14.123"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
+  integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
 
 "@types/mime@*":
   version "2.0.1"
@@ -2512,19 +2216,19 @@
     "@types/node" "*"
 
 "@types/mocha@^5.2.5":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
-  integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.6.tgz#b8622d50557dd155e9f2f634b7d68fd38de5e94b"
+  integrity sha512-1axi39YdtBI7z957vdqXI4Ac25e7YihYQtJa+Clnxg1zTJEaIRbndt71O3sP4GAMgiAm0pY26/b9BrY4MR/PMw==
 
 "@types/node@*":
-  version "12.0.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
-  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+  version "11.11.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.3.tgz#7c6b0f8eaf16ae530795de2ad1b85d34bf2f5c58"
+  integrity sha512-wp6IOGu1lxsfnrD+5mX6qwSwWuqsdkKKxTN4aQc4wByHAKZJf9/D4KXPQ1POUjEbnCP5LMggB0OEFNY9OTsMqg==
 
 "@types/nodemailer@^4.6.2":
-  version "4.6.8"
-  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-4.6.8.tgz#c14356e799fe1d4ee566126f901bc6031cc7b1b5"
-  integrity sha512-IX1P3bxDP1VIdZf6/kIWYNmSejkYm9MOyMEtoDFi4DVzKjJ3kY4GhOcOAKs6lZRjqVVmF9UjPOZXuQczlpZThw==
+  version "4.6.6"
+  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-4.6.6.tgz#2ce2bde5dd5bb4546e11390e1babd80ba35e2154"
+  integrity sha512-N2czhXs7fbQhvoquEGzmHAWttnxLfrM3+cWMRFX4hTQq4GE3VyaSE3MOOse4VoNgvtti/H5ow/Hq9KXu/UMWqA==
   dependencies:
     "@types/node" "*"
 
@@ -2603,19 +2307,19 @@
     "@types/express" "*"
 
 "@types/pdfmake@^0.1.3":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@types/pdfmake/-/pdfmake-0.1.7.tgz#7f4fa9e8925240a6eee8ded5c8a26e20eb0f59c3"
-  integrity sha512-UEfT5yAnydLwrEWGuAq+lw2K6uyd6fDtBh3R/1/oLRHHjahmiduWmTU+zBM7ZygCSUg7URg69o41vbEXGZ62Yw==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pdfmake/-/pdfmake-0.1.3.tgz#0f16bd71fc2ff1b9bed3b4ad042fd7119f08ae7e"
+  integrity sha512-b6/notpoQg/jXnbDMImRj/c7GUDzpvC2DF1gtatJlvQ7JXI4O5t3KlgW5F9xCLjd//7RtyoiTcD8gQshMj1pzQ==
 
 "@types/prop-types@*":
-  version "15.7.1"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
-  integrity sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==
+  version "15.7.0"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.0.tgz#4c48fed958d6dcf9487195a0ef6456d5f6e0163a"
+  integrity sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg==
 
 "@types/qs@^6.5.1":
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.5.3.tgz#1c3b71b091eaeaf5924538006b7f70603ce63d38"
-  integrity sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.5.2.tgz#7f347062655056662845ba4bb79dcbfdc382cd61"
+  integrity sha512-47kAAs3yV/hROraCTQYDMh4p/6zI9+gtssjD0kq9OWsGdLcBge59rl49FnCuJ+iWxEKiqFz6KXzeGH5DRVjNJA==
 
 "@types/range-parser@*":
   version "1.2.3"
@@ -2623,9 +2327,9 @@
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
 "@types/react-dom@^16.8.0":
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.4.tgz#7fb7ba368857c7aa0f4e4511c4710ca2c5a12a88"
-  integrity sha512-eIRpEW73DCzPIMaNBDP5pPIpK1KXyZwNgfxiVagb5iGiz6da+9A5hslSX6GAQKdO7SayVCS/Fr2kjqprgAvkfA==
+  version "16.8.2"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.2.tgz#9bd7d33f908b243ff0692846ef36c81d4941ad12"
+  integrity sha512-MX7n1wq3G/De15RGAAqnmidzhr2Y9O/ClxPxyqaNg96pGyeXUYPSvujgzEVpLo9oIP4Wn1UETl+rxTN02KEpBw==
   dependencies:
     "@types/react" "*"
 
@@ -2653,17 +2357,17 @@
     "@types/react-native" "*"
 
 "@types/react-native-vector-icons@*":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.1.tgz#d0862f3eb97bbe5720ab604f2f10ee07dacb31ef"
-  integrity sha512-2C9jyyJKEjzX0C4nP+9rNNjEhutWwalkRdaSTEYtNjUkkkTk68WGG2hgjrcBjdm4Gn1Vi9OgUd+FR8GNmCyp+A==
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/@types/react-native-vector-icons/-/react-native-vector-icons-4.6.4.tgz#83c2d88f0c2615a44b9059eb75c11f92702c1ee2"
+  integrity sha512-G2JD98lrgjggA979WeTXlj6He1sN4Skpd4UJlcVDsD71u1yHf8raT9D7OP4vb3LZWX6ILYkVa4dzLtVkt4wyWA==
   dependencies:
     "@types/react" "*"
     "@types/react-native" "*"
 
 "@types/react-native@*":
-  version "0.57.60"
-  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.60.tgz#61e97a84e2f64ed971e7d238bb30cec188898235"
-  integrity sha512-zObrnRsCbpM7qDm97d8+5qiSIMMYRaWgpqu6orjbjzLUAcJaKnpBMXgW6bRXWkFBjHgm3hjDAdVVGMWlrYJBdw==
+  version "0.57.40"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.40.tgz#a227acb6b2c7372cb678202df4cfe716ace9ce94"
+  integrity sha512-nCcF9gNYp/VeV5QBtHbn/VnXZG+T8EsMxZFx8qqZfBe1gxJUsldXgOXYd1kcrrYzUX0LqG/KipDBX++fB2qQ0g==
   dependencies:
     "@types/prop-types" "*"
     "@types/react" "*"
@@ -2676,25 +2380,25 @@
     "@types/react" "*"
 
 "@types/react-navigation@^3.0.5":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@types/react-navigation/-/react-navigation-3.0.7.tgz#5d327b00de2bb58203977002c3ea21302da72034"
-  integrity sha512-JFsNeCAQEQGTpObiD1QczDyCyQkFBaQA/F85Fo2W8QML1b6UNYHlUDtEYJA6jcfXqPoL15dVPBVj9NBJlHToqA==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/react-navigation/-/react-navigation-3.0.5.tgz#0543fcaa590c994a65fa92a1a88e0269e7600a2f"
+  integrity sha512-LYQRe/tz8Moo35eN8QmNN5jKbQMrDGOEhzFjsT3K2inHnRQUknN38+L3xtN1wcBwI2576Vw4hpi9E79pBaU+8A==
   dependencies:
     "@types/react" "*"
     "@types/react-native" "*"
 
 "@types/react-redux@^6.0.4":
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-6.0.14.tgz#8ffeb52c4f4d578bf74418d9aff5af7289924e4f"
-  integrity sha512-bvpWqBOvz2V+EfZ9Qu1d3gFKYCIn/BYoGWAVt1c526tbiI9rtfaBbjutbbapmtEZaEfLuHj3Ljg9qho0SBSwUg==
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-6.0.13.tgz#490ace7b49e57281edf85671bb455b31cdfa7d0b"
+  integrity sha512-69lPYT69CSvzQ75Ut4MfT+oQU9TAjCycdL6BQOrPztqbzdhzSe1d4Qj8vrMkTOm454Xz151zh+YT6S4t2OBopw==
   dependencies:
     "@types/react" "*"
     redux "^4.0.0"
 
 "@types/react-router-dom@^4.2.7":
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.3.tgz#7837e3e9fefbc84a8f6c8a51dca004f4e83e94e3"
-  integrity sha512-xj0DmFjgvAqRfh/kJPO7apD5G30yPQe+8slu/dugioQOkdKpyzc4Fgk4hoTelm6CSHz7pI2PPsW5+Y6GRBF2zw==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.1.tgz#71fe2918f8f60474a891520def40a63997dafe04"
+  integrity sha512-GbztJAScOmQ/7RsQfO4cd55RuH1W4g6V1gDW3j4riLlt+8yxYLqqsiMzmyuXBLzdFmDtX/uU2Bpcm0cmudv44A==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
@@ -2711,17 +2415,17 @@
     redux ">= 3.7.2"
 
 "@types/react-router@*":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.0.1.tgz#9f4548c75755c55b0cffdd743080e5afa87da6dd"
-  integrity sha512-vOyVO0u3Cs0w6G5DzYqNVqcTsurEnDgOmmkJf2s7VwtunWzpPgI6dHsCBX68vXqeICpP6jCfojgJcHkm5BV7hQ==
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.4.5.tgz#1166997dc7eef2917b5ebce890ebecb32ee5c1b3"
+  integrity sha512-12+VOu1+xiC8RPc9yrgHCyLI79VswjtuqeS2gPrMcywH6tkc8rGIUhs4LaL3AJPqo5d+RPnfRpNKiJ7MK2Qhcg==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
 
 "@types/react-slick@^0.23.3":
-  version "0.23.4"
-  resolved "https://registry.yarnpkg.com/@types/react-slick/-/react-slick-0.23.4.tgz#c97e2a9e7e3d1933c68593b8e82752fab1e8ce53"
-  integrity sha512-vXoIy4GUfB7/YgqubR4H7RALo+pRdMYCeLgWwV3MPwl5pggTlEkFBTF19R7u+LJc85uMqC7RfsbkqPLMQ4ab+A==
+  version "0.23.3"
+  resolved "https://registry.yarnpkg.com/@types/react-slick/-/react-slick-0.23.3.tgz#c9d14323a75f54f46a652fb745fe553aad091ce0"
+  integrity sha512-B6wU5ynINOolrByhoeJ448qZPjCFPcuhyQI5sjihjG8gQJuoTH6a4YQhuDm4umvbRVielJQANhptc8hmxA85IA==
   dependencies:
     "@types/react" "*"
 
@@ -2733,9 +2437,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@^16.4.6":
-  version "16.8.19"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.19.tgz#629154ef05e2e1985cdde94477deefd823ad9be3"
-  integrity sha512-QzEzjrd1zFzY9cDlbIiFvdr+YUmefuuRYrPxmkwG0UQv5XF35gFIi7a95m1bNVcFU0VimxSZ5QVGSiBmlggQXQ==
+  version "16.8.8"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.8.tgz#4b60a469fd2469f7aa6eaa0f8cfbc51f6d76e662"
+  integrity sha512-xwEvyet96u7WnB96kqY0yY7qxx/pEpU51QeACkKFtrgjjXITQn0oO1iwPEraXVgh10ZFPix7gs1R4OJXF7P5sg==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -2758,11 +2462,6 @@
   resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-0.0.29.tgz#8093ee0416a6e2bf2aa6338109114b3fbffa0e9b"
   integrity sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
-
 "@types/superagent@*":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.1.tgz#61f0b43d7db93a3c286c124512b7c228183c32fa"
@@ -2807,10 +2506,10 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/yargs@^12.0.2", "@types/yargs@^12.0.9":
-  version "12.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
-  integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==
+"@types/yargs@^12.0.9":
+  version "12.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
+  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
 
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
@@ -2958,13 +2657,6 @@
     "@webassemblyjs/wast-parser" "1.8.5"
     "@xtuc/long" "4.2.2"
 
-"@wry/equality@^0.1.2":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
-  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
-  dependencies:
-    tslib "^1.9.3"
-
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -3005,13 +2697,13 @@ absolute-path@^0.0.0:
   resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
   integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c=
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+accepts@~1.3.3, accepts@~1.3.4, accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
 
 acorn-dynamic-import@^4.0.0:
   version "4.0.0"
@@ -3019,9 +2711,9 @@ acorn-dynamic-import@^4.0.0:
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
 acorn-globals@^4.1.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
-  integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
+  integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
@@ -3066,9 +2758,9 @@ add-stream@^1.0.0:
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
 address@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709"
-  integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
+  integrity sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==
 
 adjust-sourcemap-loader@^1.1.0:
   version "1.2.0"
@@ -3083,14 +2775,7 @@ adjust-sourcemap-loader@^1.1.0:
     object-path "^0.9.2"
     regex-parser "^2.2.9"
 
-agent-base@4, agent-base@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@~4.2.1:
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -3249,6 +2934,13 @@ ansi@^0.3.0, ansi@~0.3.1:
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
 
+ant-design-palettes@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ant-design-palettes/-/ant-design-palettes-1.1.3.tgz#84119b1a4d86363adc52a38d587e65336a0a27dd"
+  integrity sha512-UpkkTp8egEN21KZNvY7sTcabLlkHvLvS71EVPk4CYi77Z9AaGGCaVn7i72tbOgWDrQp2wjIg8WgMbKBdK7GtWA==
+  dependencies:
+    tinycolor2 "^1.4.1"
+
 antd-mobile-rn@^2.2.1:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/antd-mobile-rn/-/antd-mobile-rn-2.3.3.tgz#be386da77b763737365ca68abb258bf6816783b3"
@@ -3272,18 +2964,19 @@ antd-mobile-rn@^2.2.1:
     utility-types "^2.1.0"
 
 antd@^3.10.0:
-  version "3.19.2"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-3.19.2.tgz#18829f7bbc6acb3f4b43a77349c2bf2c3e733408"
-  integrity sha512-s1nFRNXQiNZpUfIpyQN89OBrZg9hz2qgPiBeR5b/GgMacHRNzB4sOAD3XBUYeojmUo2UkOgZOUL9jTdiUOf2ZA==
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-3.15.0.tgz#af187ce62902edf261d7251fc9105407527fad9d"
+  integrity sha512-gSoVmQN7rfYmhfpv0dL2sL9gk0Pu9JHgGiExjLJZaSnbPjpCOTAYjIzxG/oo8GzCSeK5abgN5F1saWR5ggLVFQ==
   dependencies:
-    "@ant-design/create-react-context" "^0.2.4"
-    "@ant-design/icons" "~2.0.0"
-    "@ant-design/icons-react" "~2.0.0"
+    "@ant-design/icons" "~1.2.0"
+    "@ant-design/icons-react" "~1.1.2"
     "@types/react-slick" "^0.23.3"
     array-tree-filter "^2.1.0"
     babel-runtime "6.x"
     classnames "~2.2.6"
     copy-to-clipboard "^3.0.8"
+    create-react-class "^15.6.3"
+    create-react-context "0.2.2"
     css-animation "^1.5.0"
     dom-closest "^0.2.0"
     enquire.js "^2.1.6"
@@ -3293,38 +2986,37 @@ antd@^3.10.0:
     prop-types "^15.6.2"
     raf "^3.4.0"
     rc-animate "^2.5.4"
-    rc-calendar "~9.14.0"
+    rc-calendar "~9.10.3"
     rc-cascader "~0.17.0"
     rc-checkbox "~2.1.5"
     rc-collapse "~1.11.1"
-    rc-dialog "~7.4.0"
-    rc-drawer "~1.9.3"
+    rc-dialog "~7.3.0"
+    rc-drawer "~1.7.6"
     rc-dropdown "~2.4.1"
     rc-editor-mention "^1.1.7"
     rc-form "^2.4.0"
     rc-input-number "~4.4.0"
-    rc-mentions "~0.3.1"
     rc-menu "~7.4.12"
     rc-notification "~3.3.0"
-    rc-pagination "~1.20.1"
+    rc-pagination "~1.17.7"
     rc-progress "~2.3.0"
     rc-rate "~2.5.0"
-    rc-select "~9.1.0"
+    rc-select "~9.0.0"
     rc-slider "~8.6.5"
-    rc-steps "~3.4.1"
+    rc-steps "~3.3.0"
     rc-switch "~1.9.0"
-    rc-table "~6.5.0"
+    rc-table "~6.4.0"
     rc-tabs "~9.6.0"
     rc-time-picker "~3.6.1"
     rc-tooltip "~3.7.3"
-    rc-tree "~2.1.0"
-    rc-tree-select "~2.9.1"
+    rc-tree "~1.14.6"
+    rc-tree-select "~2.6.0"
     rc-trigger "^2.6.2"
     rc-upload "~2.6.0"
     rc-util "^4.5.1"
     react-lazy-load "^3.0.13"
     react-lifecycles-compat "^3.0.4"
-    react-slick "~0.24.0"
+    react-slick "~0.23.2"
     resize-observer-polyfill "^1.5.0"
     shallowequal "^1.1.0"
     warning "~4.0.2"
@@ -3348,13 +3040,12 @@ anymatch@^2.0.0:
     normalize-path "^2.1.1"
 
 apollo-utilities@^1.0.3:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
-  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
+  integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
   dependencies:
-    "@wry/equality" "^0.1.2"
     fast-json-stable-stringify "^2.0.0"
-    ts-invariant "^0.4.0"
+    ts-invariant "^0.2.1"
     tslib "^1.9.3"
 
 append-transform@^0.4.0:
@@ -3579,11 +3270,10 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1, assert@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
-  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
-    object-assign "^4.1.1"
     util "0.10.3"
 
 assertion-error@^1.1.0:
@@ -3607,9 +3297,9 @@ astral-regex@^1.0.0:
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
 async-foreach@^0.1.3:
   version "0.1.3"
@@ -3638,7 +3328,7 @@ async@^1.5.0, async@^1.5.2, async@~1.5:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.1.4, async@^2.3.0, async@^2.4.0:
+async@^2.1.4, async@^2.3.0, async@^2.4.0, async@^2.5.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
@@ -3655,11 +3345,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob-lite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
-  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
-
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -3685,16 +3370,15 @@ autoprefixer@^8.3.0:
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^9.5.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.0.tgz#0111c6bde2ad20c6f17995a33fad7cf6854b4c87"
-  integrity sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.0.tgz#7e51d0355c11596e6cf9a0afc9a44e86d1596c70"
+  integrity sha512-hMKcyHsZn5+qL6AUeP3c8OyuteZ4VaUlg+fWbyl8z7PqsKHF/Bf8/px3K6AT8aMzDkBo8Bc11245MM+itDBOxQ==
   dependencies:
-    browserslist "^4.6.1"
-    caniuse-lite "^1.0.30000971"
-    chalk "^2.4.2"
+    browserslist "^4.4.2"
+    caniuse-lite "^1.0.30000947"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.16"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.7.0:
@@ -3930,28 +3614,15 @@ babel-jest@^23.6.0:
     babel-plugin-istanbul "^4.1.6"
     babel-preset-jest "^23.2.0"
 
-babel-jest@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"
-  integrity sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==
-  dependencies:
-    "@jest/transform" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    "@types/babel__core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.6.0"
-    chalk "^2.4.2"
-    slash "^2.0.0"
-
 babel-loader@^8.0.2:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
-  integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz#225322d7509c2157655840bba52e46b6c2f2fe33"
+  integrity sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==
   dependencies:
     find-cache-dir "^2.0.0"
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
-    pify "^4.0.1"
+    util.promisify "^1.0.0"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -3968,9 +3639,9 @@ babel-plugin-check-es2015-constants@6.22.0, babel-plugin-check-es2015-constants@
     babel-runtime "^6.22.0"
 
 babel-plugin-import@^1.7.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.12.0.tgz#12d50950aecfd8de3f10880730221f0f0843a755"
-  integrity sha512-3Fo7sJ2Hm71y1VJS7eMA/E7J5+roKJmzwia5BxzUQREBs6CRylwtvQq8m39W8nplG4Y7rZwOCndh5MzRTSmHpA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.11.0.tgz#78ac908e6b225206babb734e19eae5f78d6d1035"
+  integrity sha512-de9dWdU1YjmWRPYurlHRKD2hTd24z0bIQ0/JgyXqLMXML+TsvEkVhtqzOsNtu9MmCuvwBiTTTjZBbZXA1Xu7TQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/runtime" "^7.0.0"
@@ -3985,27 +3656,11 @@ babel-plugin-istanbul@^4.1.6:
     istanbul-lib-instrument "^1.10.1"
     test-exclude "^4.2.1"
 
-babel-plugin-istanbul@^5.1.0:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz#841d16b9a58eeb407a0ddce622ba02fe87a752ba"
-  integrity sha512-dySz4VJMH+dpndj0wjJ8JPs/7i1TdSPb1nRrn56/92pKOF9VKC1FMFJmMXjzlGGusnCAqujP6PBCiKq0sVA+YQ==
-  dependencies:
-    find-up "^3.0.0"
-    istanbul-lib-instrument "^3.3.0"
-    test-exclude "^5.2.3"
-
 babel-plugin-jest-hoist@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
   integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
 
-babel-plugin-jest-hoist@^24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"
-  integrity sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==
-  dependencies:
-    "@types/babel__traverse" "^7.0.6"
-
 babel-plugin-minify-builtins@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
@@ -4091,11 +3746,6 @@ babel-plugin-module-resolver@^3.1.1:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
-babel-plugin-react-native-web@^0.9.6:
-  version "0.9.13"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.9.13.tgz#20d76e8e78815582b3d983efa19b3116168e7784"
-  integrity sha512-cgHJcA+jDIcEH0g0JSCjRxGlKIMVR5GWCgVSFwfjIP1HCvjFOtjUWGHPEnlMShp9mHl/WtL2v59sRWzVnoK3CA==
-
 babel-plugin-styled-components@^1.3.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.0.tgz#ff1f42ad2cc78c21f26b62266b8f564dbc862939"
@@ -4403,15 +4053,12 @@ babel-polyfill@^6.23.0, babel-polyfill@^6.26.0:
     regenerator-runtime "^0.10.5"
 
 babel-preset-expo@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-5.1.1.tgz#2fb9e14013ee872b1716d857e3c583981a47e3b9"
-  integrity sha512-aboINGtepZW4s5IKu9dpNY7RUzTlM4S55xw2cuQ39DiEWY1fr8TsbLyK4lMC5LXrGhoTGypnn85/Y4yPEdnK5g==
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-5.0.0.tgz#d1569579c7326391d589b031ed688061f959e378"
+  integrity sha512-pDtkAIafvQLAZ5dQ/6I9okkiZLw9IBR8ItRzAyUO4j2rUMB9ey6yZTTE77AKWq5HhxhY53Hic8Zl0vSDMTXI0A==
   dependencies:
-    "@babel/core" "^7.1.0"
     "@babel/plugin-proposal-decorators" "^7.1.0"
-    "@babel/preset-env" "^7.3.1"
     babel-plugin-module-resolver "^3.1.1"
-    babel-plugin-react-native-web "^0.9.6"
     metro-react-native-babel-preset "^0.49.0"
 
 babel-preset-fbjs@2.3.0, babel-preset-fbjs@^2.1.2:
@@ -4463,14 +4110,6 @@ babel-preset-jest@^23.2.0:
     babel-plugin-jest-hoist "^23.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
-babel-preset-jest@^24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984"
-  integrity sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==
-  dependencies:
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.6.0"
-
 babel-preset-minify@^0.5.0-alpha.5a128fd5:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz#e25bb8d3590087af02b650967159a77c19bfb96b"
@@ -4592,11 +4231,6 @@ base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.2.3:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
   integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
-base64url@3.x.x:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
-  integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
-
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -4640,9 +4274,9 @@ before-after-hook@^1.4.0:
   integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==
 
 big-integer@^1.6.7:
-  version "1.6.43"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.43.tgz#8ac15bf13e93e509500859061233e19d8d0d99d1"
-  integrity sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==
+  version "1.6.42"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.42.tgz#91623ae5ceeff9a47416c56c9440a66f12f534f1"
+  integrity sha512-3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q==
 
 big.js@^3.1.3:
   version "3.2.0"
@@ -4655,9 +4289,9 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
+  integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
 
 block-stream@*:
   version "0.0.9"
@@ -4667,9 +4301,9 @@ block-stream@*:
     inherits "~2.0.0"
 
 bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
 blueimp-md5@^2.5.0:
   version "2.10.0"
@@ -4681,7 +4315,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@1.18.3:
+body-parser@1.18.3, body-parser@^1.15.2, body-parser@^1.18.3:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
   integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
@@ -4694,24 +4328,8 @@ body-parser@1.18.3:
     iconv-lite "0.4.23"
     on-finished "~2.3.0"
     qs "6.5.2"
-    raw-body "2.3.3"
-    type-is "~1.6.16"
-
-body-parser@1.19.0, body-parser@^1.15.2, body-parser@^1.18.3:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
+    raw-body "2.3.3"
+    type-is "~1.6.16"
 
 bonjour@^3.5.0:
   version "3.5.0"
@@ -4871,14 +4489,23 @@ browserslist@^3.2.8:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.6.0, browserslist@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
-  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
+browserslist@^4.3.4:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2"
+  integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==
   dependencies:
-    caniuse-lite "^1.0.30000971"
-    electron-to-chromium "^1.3.137"
-    node-releases "^1.1.21"
+    caniuse-lite "^1.0.30000939"
+    electron-to-chromium "^1.3.113"
+    node-releases "^1.1.8"
+
+browserslist@^4.4.2:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.1.tgz#2226cada1947b33f4cfcf7b608dcb519b6128106"
+  integrity sha512-/pPw5IAUyqaQXGuD5vS8tcbudyPZ241jk1W5pQBsGDfcjNQt7p8qxZhgMNuygDShte1PibLFexecWUPgmVLfrg==
+  dependencies:
+    caniuse-lite "^1.0.30000949"
+    electron-to-chromium "^1.3.116"
+    node-releases "^1.1.11"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -4989,11 +4616,6 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
@@ -5013,7 +4635,7 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.0.1, cacache@^11.2.0, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -5112,11 +4734,6 @@ callsites@^2.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
   integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -5163,19 +4780,24 @@ camelcase@^4.1.0:
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
+  integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==
 
 camelize@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
   integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000971:
-  version "1.0.30000974"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
-  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000939:
+  version "1.0.30000948"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000948.tgz#793ed7c28fe664856beb92b43fc013fc22b81633"
+  integrity sha512-Lw4y7oz1X5MOMZm+2IFaSISqVVQvUuD+ZUSfeYK/SlYiMjkHN/eJ2PDfJehW5NA6JjrxYSSnIWfwjeObQMEjFQ==
+
+caniuse-lite@^1.0.30000947, caniuse-lite@^1.0.30000949:
+  version "1.0.30000950"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000950.tgz#8c559d66e332b34e919d1086cc6d29c1948856ae"
+  integrity sha512-Cs+4U9T0okW2ftBsCIHuEYXXkki7mjXmjCh4c6PzYShk04qDEr76/iC7KwhLoWoY65wcra1XOsRD+S7BptEb5A==
 
 canvas-prebuilt@^1.6.5-prerelease.1:
   version "1.6.11"
@@ -5208,13 +4830,6 @@ capture-exit@^1.2.0:
   dependencies:
     rsvp "^3.3.3"
 
-capture-exit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
-  dependencies:
-    rsvp "^4.8.4"
-
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
@@ -5239,9 +4854,9 @@ caseless@~0.12.0:
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chai-http@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-4.3.0.tgz#3c37c675c1f4fe685185a307e345de7599337c1a"
-  integrity sha512-zFTxlN7HLMv+7+SPXZdkd5wUlK+KxH6Q7bIEMiEx0FK3zuuMqL7cwICAQ0V1+yYRozBburYuxN1qZstgHpFZQg==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-4.2.1.tgz#d4db6ae491e46b7d5029b2c103b6af45cd5ae290"
+  integrity sha512-S2Ezy5uSVuOYleeXppfUKtTU/xbHCZyKkwjheNJ/76SGFTUPDpDkkpVdPNgC3sAO1Ap5J5LJ+/rXdLG8EGhCDA==
   dependencies:
     "@types/chai" "4"
     "@types/superagent" "^3.8.3"
@@ -5323,10 +4938,10 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
-chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
-  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
+  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -5338,7 +4953,7 @@ chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.6:
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.1"
+    upath "^1.1.0"
   optionalDependencies:
     fsevents "^1.2.7"
 
@@ -5348,9 +4963,9 @@ chownr@^1.0.1, chownr@^1.1.1:
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
 
 chrome-trace-event@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
   dependencies:
     tslib "^1.9.0"
 
@@ -5616,9 +5231,9 @@ columnify@^1.5.4:
     wcwidth "^1.0.0"
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -5628,37 +5243,30 @@ command-exists@^1.2.7:
   integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
 
 command-join@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.1.tgz#0a9e58a84e94bd0d1b6c75ce1078723d8a7645cb"
-  integrity sha512-LBA9kSxtg2SA8itaBeuitpn4pZQOhGVP1dyU1cnXLYrBpF3sikaPhjWPqyqVh7oGpneI05RtJs9a0fftIEgXcA==
-  dependencies:
-    "@improved/node" "^1.0.0"
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
+  integrity sha1-Uui5hPSHLZUv8b3IuYOX0nxxRM8=
 
 commander@2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@2.17.x:
+commander@2.17.x, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.15.1, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0, commander@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.15.1, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
   integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
 
-commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -5680,9 +5288,9 @@ component-classes@1.x, component-classes@^1.2.5, component-classes@^1.2.6:
     component-indexof "0.0.3"
 
 component-emitter@^1.2.0, component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-indexof@0.0.3:
   version "0.0.3"
@@ -5694,23 +5302,23 @@ component-type@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
   integrity sha1-ikeQFwAjjk/DIml3EjAibyS0Fak=
 
-compressible@~2.0.16:
-  version "2.0.17"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
-  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
+compressible@~2.0.14:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
   dependencies:
-    mime-db ">= 1.40.0 < 2"
+    mime-db ">= 1.38.0 < 2"
 
-compression@^1.7.1, compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+compression@^1.5.2, compression@^1.7.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.16"
+    compressible "~2.0.14"
     debug "2.6.9"
-    on-headers "~1.0.2"
+    on-headers "~1.0.1"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
@@ -5729,16 +5337,6 @@ concat-stream@^1.4.10, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
-  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.0.2"
-    typedarray "^0.0.6"
-
 config-chain@^1.1.11:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
@@ -5754,19 +5352,19 @@ connect-cors@^0.5.6:
   dependencies:
     connect ">= 1.6.4"
 
-connect-history-api-fallback@^1.6.0:
+connect-history-api-fallback@^1.3.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
 "connect@>= 1.6.4", connect@^3.6.5:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  version "3.6.6"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
+    finalhandler "1.1.0"
+    parseurl "~1.3.2"
     utils-merge "1.0.1"
 
 console-browserify@^1.1.0:
@@ -5796,13 +5394,6 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
-  dependencies:
-    safe-buffer "5.1.2"
-
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -5869,12 +5460,12 @@ conventional-changelog-core@^2.0.11:
     through2 "^2.0.0"
 
 conventional-changelog-core@^3.1.6:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
-  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f"
+  integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig==
   dependencies:
-    conventional-changelog-writer "^4.0.5"
-    conventional-commits-parser "^3.0.2"
+    conventional-changelog-writer "^4.0.3"
+    conventional-commits-parser "^3.0.1"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
@@ -5885,7 +5476,7 @@ conventional-changelog-core@^3.1.6:
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^3.0.0"
+    through2 "^2.0.0"
 
 conventional-changelog-ember@^0.3.12:
   version "0.3.12"
@@ -5935,10 +5526,10 @@ conventional-changelog-preset-loader@^1.1.8:
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
   integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
 
-conventional-changelog-preset-loader@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
-  integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
+conventional-changelog-preset-loader@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
+  integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
 
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
@@ -5956,21 +5547,21 @@ conventional-changelog-writer@^3.0.9:
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-changelog-writer@^4.0.5:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.6.tgz#24db578ac8e7c89a409ef9bba12cf3c095990148"
-  integrity sha512-ou/sbrplJMM6KQpR5rKFYNVQYesFjN7WpNGdudQSWNi6X+RgyFUcSv871YBYkrUYV9EX8ijMohYVzn9RUb+4ag==
+conventional-changelog-writer@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1"
+  integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.2"
+    conventional-commits-filter "^2.0.1"
     dateformat "^3.0.0"
     handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
     lodash "^4.2.1"
     meow "^4.0.0"
-    semver "^6.0.0"
+    semver "^5.5.0"
     split "^1.0.0"
-    through2 "^3.0.0"
+    through2 "^2.0.0"
 
 conventional-changelog@^1.1.24:
   version "1.1.24"
@@ -5997,12 +5588,12 @@ conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.6:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-filter@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
-  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
+conventional-commits-filter@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
+  integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A==
   dependencies:
-    lodash.ismatch "^4.4.0"
+    is-subset "^0.1.1"
     modify-values "^1.0.0"
 
 conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7:
@@ -6018,17 +5609,17 @@ conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-commits-parser@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d"
-  integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==
+conventional-commits-parser@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
+  integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg==
   dependencies:
     JSONStream "^1.0.4"
-    is-text-path "^2.0.0"
+    is-text-path "^1.0.0"
     lodash "^4.2.1"
     meow "^4.0.0"
     split2 "^2.0.0"
-    through2 "^3.0.0"
+    through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
 conventional-recommended-bump@^1.2.1:
@@ -6045,14 +5636,14 @@ conventional-recommended-bump@^1.2.1:
     object-assign "^4.0.1"
 
 conventional-recommended-bump@^4.0.4:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.1.1.tgz#37014fadeda267d0607e2fc81124da840a585127"
-  integrity sha512-JT2vKfSP9kR18RXXf55BRY1O3AHG8FPg5btP3l7LYfcWJsiXI6MCf30DepQ98E8Qhowvgv7a8iev0J1bEDkTFA==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
+  integrity sha512-9mY5Yoblq+ZMqJpBzgS+RpSq+SUfP2miOR3H/NR9drGf08WCrY9B6HAGJZEm6+ThsVP917VHAahSOjM6k1vhPg==
   dependencies:
-    concat-stream "^2.0.0"
-    conventional-changelog-preset-loader "^2.1.1"
-    conventional-commits-filter "^2.0.2"
-    conventional-commits-parser "^3.0.2"
+    concat-stream "^1.6.0"
+    conventional-changelog-preset-loader "^2.0.2"
+    conventional-commits-filter "^2.0.1"
+    conventional-commits-parser "^3.0.1"
     git-raw-commits "2.0.0"
     git-semver-tags "^2.0.2"
     meow "^4.0.0"
@@ -6080,11 +5671,6 @@ cookie@0.3.1, cookie@^0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-
 cookiejar@^2.1.0, cookiejar@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
@@ -6116,40 +5702,21 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-to-clipboard@^3.0.8:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz#d2724a3ccbfed89706fac8a894872c979ac74467"
-  integrity sha512-eOZERzvCmxS8HWzugj4Uxl8OJxa7T2k1Gi0X5qavwydHIfuSHq2dTD09LOg/XyGq4Zpb5IsR/2OJ5lbOegz78w==
-  dependencies:
-    toggle-selection "^1.0.6"
-
-core-js-compat@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.3.tgz#0cc3ba4c7f62928c2837e1cffbe8dc78b4f1ae14"
-  integrity sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz#f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9"
+  integrity sha512-c3GdeY8qxCHGezVb1EFQfHYK/8NZRemgcTIzPq7PuxjHAf/raKibn2QdhHPb/y6q74PMgH6yizaDZlRmw6QyKw==
   dependencies:
-    browserslist "^4.6.0"
-    core-js-pure "3.1.3"
-    semver "^6.1.0"
-
-core-js-pure@3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5"
-  integrity sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA==
+    toggle-selection "^1.0.3"
 
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3, core-js@^2.5.7, core-js@^2.6.5:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
-  integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
-
-core-js@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
-  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
+core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3, core-js@^2.5.7:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -6167,13 +5734,14 @@ cosmiconfig@^4.0.0:
     require-from-string "^2.0.1"
 
 cosmiconfig@^5.0.2, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
+  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.13.1"
+    js-yaml "^3.9.0"
+    lodash.get "^4.4.2"
     parse-json "^4.0.0"
 
 create-ecdh@^4.0.0:
@@ -6363,9 +5931,9 @@ css-selector-tokenizer@^0.7.0:
     regexpu-core "^1.0.0"
 
 css-to-react-native@^2.0.3:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.3.1.tgz#cf0f61e0514846e2d4dc188b0886e29d8bef64a2"
-  integrity sha512-yO+oEx1Lf+hDKasqQRVrAvzMCz825Huh1VMlEEDlRWyAhFb/FWb6I0KpEF1PkyKQ7NEdcx9d5M2ZEWgJAsgPvQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.3.0.tgz#bf80d24ec4a08e430306ef429c0586e6ed5485f7"
+  integrity sha512-IhR7bNIrCFwbJbKZOAjNDZdwpsbjTN6f1agXeELHDqg1wHPA8c2QLruttKOW7hgMGetkfraRJCIEMrptifBfVw==
   dependencies:
     camelize "^1.0.0"
     css-color-keywords "^1.0.0"
@@ -6397,16 +5965,16 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==
 
 cssstyle@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz#427ea4d585b18624f6fdbf9de7a2a1a3ba713077"
-  integrity sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.1.tgz#3aceb2759eaf514ac1a21628d723d6043a819495"
+  integrity sha512-7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A==
   dependencies:
     cssom "0.3.x"
 
 csstype@^2.2.0:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.5.tgz#1cd1dff742ebf4d7c991470ae71e12bb6751e034"
-  integrity sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA==
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.3.tgz#b701e5968245bf9b08d54ac83d00b624e622a9fa"
+  integrity sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
@@ -6426,9 +5994,9 @@ cyclist@~0.2.2:
   integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 damerau-levenshtein@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"
-  integrity sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
 
 dargs@^4.0.1:
   version "4.1.0"
@@ -6475,7 +6043,7 @@ debug@*, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -6521,6 +6089,13 @@ decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
+  dependencies:
+    xregexp "4.0.0"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -6585,7 +6160,7 @@ deepmerge@^2.1.1:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
   integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
 
-default-gateway@^4.2.0:
+default-gateway@^4.0.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
   integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
@@ -6636,18 +6211,17 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
   dependencies:
-    "@types/glob" "^7.1.1"
     globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
 
 delay-async@^1.0.0:
   version "1.1.0"
@@ -6670,9 +6244,9 @@ denodeify@^1.2.1:
   integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE=
 
 denque@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
-  integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.0.tgz#79e2f0490195502107f24d9553f374837dabc916"
+  integrity sha512-gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ==
 
 depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
@@ -6684,10 +6258,10 @@ depd@~2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-deprecation@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.0.0.tgz#dd0427cd920c78bc575ec39dab2f22e7c304fb9d"
-  integrity sha512-lbQN037mB3VfA2JFuguM5GCJ+zPinMeCrFe+AfSZ6eqrnJA/Fs+EYMnd6Nb2mn9lf2jO9xwEd9o9lic+D4vkcw==
+deprecation@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711"
+  integrity sha512-ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg==
 
 des.js@^1.0.0:
   version "1.0.0"
@@ -6750,11 +6324,6 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
-diff-sequences@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975"
-  integrity sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==
-
 diff@3.5.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -6785,9 +6354,9 @@ dir-glob@^2.0.0:
     path-type "^3.0.0"
 
 dlv@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
-  integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5"
+  integrity sha512-xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q==
 
 dns-equal@^1.0.0:
   version "1.0.0"
@@ -6825,9 +6394,9 @@ doctrine@^2.1.0:
     esutils "^2.0.2"
 
 dom-align@^1.7.0:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.8.3.tgz#f1fc197228109eca24f04cc6ad3b06f6eb8a54bb"
-  integrity sha512-thE1qB8mvtRZgwN4+IGFz1rv7zVsr08c2/IEYtOJIeTzW4YDadIOd5nQ4BpiiAvUWg55xTeGq7zLTDxDYWDrnw==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.8.2.tgz#fdcd36bce25ba8d34fe3582efd57ac767df490bd"
+  integrity sha512-17vInOylbB7H4qua7QRsmQT05FFTZemO8BhnOPgF9BPqjAPDyQr/9V8fmJbn05vQ31m2gu3EJSSYN2u94szUZg==
 
 dom-closest@^0.2.0:
   version "0.2.0"
@@ -6843,7 +6412,7 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
-dom-helpers@^3.4.0:
+dom-helpers@^3.3.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
   integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
@@ -6879,14 +6448,14 @@ dom-testing-library@^2.3.1:
     wait-for-expect "^0.4.0"
 
 dom-testing-library@^3.13.0:
-  version "3.19.4"
-  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.19.4.tgz#f5b737f59ee9749a4568fa353f1f59be97c888c3"
-  integrity sha512-GJOx8CLpnkvM3takILOsld/itUUc9+7Qh6caN1Spj6+9jIgNPY36fsvoH7sEgYokC0lBRdttO7G7fIFYCXlmcA==
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.17.1.tgz#3291bc3cf68c555ba5e663697ee77d604aaa122b"
+  integrity sha512-SbkaRfQvuLjnv+xFgSo/cmKoN9tjBL6Rh1f3nQH9jnjUe5q+keRwacYSi3uSpcB4D1K768iavCayKH3ZN9ea+g==
   dependencies:
-    "@babel/runtime" "^7.4.3"
+    "@babel/runtime" "^7.3.4"
     "@sheerun/mutationobserver-shim" "^0.3.2"
-    pretty-format "^24.7.0"
-    wait-for-expect "^1.1.1"
+    pretty-format "^24.0.0"
+    wait-for-expect "^1.1.0"
 
 dom-walk@^0.1.0:
   version "0.1.1"
@@ -7001,10 +6570,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.137, electron-to-chromium@^1.3.47:
-  version "1.3.150"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.150.tgz#afb972b53a702b37c76db843c39c967e9f68464b"
-  integrity sha512-5wuYlaXhXbBvavSTij5ZyidICB6sAK/1BwgZZoPCgsniid1oDgzVvDOV/Dw6J25lKV9QZ9ZdQCp8MEfF0/OIKA==
+electron-to-chromium@^1.3.113, electron-to-chromium@^1.3.116, electron-to-chromium@^1.3.47:
+  version "1.3.116"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.116.tgz#1dbfee6a592a0c14ade77dbdfe54fef86387d702"
+  integrity sha512-NKwKAXzur5vFCZYBHpdWjTMO8QptNLNP80nItkSIgUOapPAo9Uia+RvkCaZJtO7fhQaVElSvBPWEc2ku6cKsPA==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -7034,7 +6603,7 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
-encodeurl@~1.0.2:
+encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
@@ -7124,11 +6693,11 @@ error-stack-parser@^2.0.1:
     stackframe "^1.0.4"
 
 errorhandler@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91"
-  integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.0.tgz#eaba64ca5d542a311ac945f582defc336165d9f4"
+  integrity sha1-6rpkyl1UKjEayUX1gt78M2Fl2fQ=
   dependencies:
-    accepts "~1.3.7"
+    accepts "~1.3.3"
     escape-html "~1.0.3"
 
 es-abstract@^1.11.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
@@ -7163,9 +6732,9 @@ es6-error@^4.0.2:
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
 es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
+  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -7235,35 +6804,29 @@ eslint-import-resolver-webpack@^0.9.0:
     resolve "^1.4.0"
     semver "^5.3.0"
 
-eslint-module-utils@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
-  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
+eslint-module-utils@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
+  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
   dependencies:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
 
 eslint-plugin-import@^2.14.0:
-  version "2.17.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189"
-  integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz#97ac3e75d0791c4fac0e15ef388510217be7f66f"
+  integrity sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==
   dependencies:
-    array-includes "^3.0.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.0"
+    eslint-module-utils "^2.3.0"
     has "^1.0.3"
     lodash "^4.17.11"
     minimatch "^3.0.4"
     read-pkg-up "^2.0.0"
-    resolve "^1.11.0"
-
-eslint-plugin-jest@^22.6.4:
-  version "22.6.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.6.4.tgz#2895b047dd82f90f43a58a25cf136220a21c9104"
-  integrity sha512-36OqnZR/uMCDxXGmTsqU4RwllR0IiB/XF8GW3ODmhsjiITKuI0GpgultWFt193ipN3HARkaIcKowpE6HBvRHNg==
+    resolve "^1.9.0"
 
 eslint-plugin-json@^1.2.0:
   version "1.4.0"
@@ -7302,29 +6865,29 @@ eslint-plugin-prettier@^2.2.0:
     jest-docblock "^21.0.0"
 
 eslint-plugin-prettier@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d"
-  integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.0.1.tgz#19d521e3981f69dd6d14f64aec8c6a6ac6eb0b0d"
+  integrity sha512-/PMttrarPAY78PLvV3xfWibMOdMDl57hmlQ2XqFeA37wd+CJ7WSxV7txqjVPHi/AAFKd2lX0ZqfsOc/i5yFCSQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
 eslint-plugin-react-hooks@^1.0.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.6.0.tgz#348efcda8fb426399ac7b8609607c7b4025a6f5f"
-  integrity sha512-lHBVRIaz5ibnIgNG07JNiAuBUeKhEf8l4etNx5vfAEwqQ5tcuK3jV9yjmopPgQDagQb7HwIuQVsE3IVcGrRnag==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.5.1.tgz#3c601326914ee0e1fedd709115db4940bdbbed4a"
+  integrity sha512-i3dIrmZ+Ssrm0LrbbtuGcRf7EEpe1FaMuL8XnnpZO0X4tk3dZNzevWxD0/7nMAFa5yZQfNnYkfEP0MmwLvbdHw==
 
 eslint-plugin-react@^7.5.1:
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.13.0.tgz#bc13fd7101de67996ea51b33873cd9dc2b7e5758"
-  integrity sha512-uA5LrHylu8lW/eAH3bEQe9YdzpPaFd9yAJTwTi/i/BKTD7j6aQMKVAdGM/ML72zD6womuSK7EiGtMKuK06lWjQ==
+  version "7.12.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz#b1ecf26479d61aee650da612e425c53a99f48c8c"
+  integrity sha512-1puHJkXJY+oS1t467MjbqjvX53uQ05HXwjqDgdbGBqf5j9eeydI54G3KwiJmWciQ0HTBacIKw2jgwSBSH3yfgQ==
   dependencies:
     array-includes "^3.0.3"
     doctrine "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.1.0"
+    jsx-ast-utils "^2.0.1"
     object.fromentries "^2.0.0"
-    prop-types "^15.7.2"
-    resolve "^1.10.1"
+    prop-types "^15.6.2"
+    resolve "^1.9.0"
 
 eslint-restricted-globals@^0.1.1:
   version "0.1.1"
@@ -7456,10 +7019,10 @@ event-target-shim@^1.0.5:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-1.1.1.tgz#a86e5ee6bdaa16054475da797ccddf0c55698491"
   integrity sha1-qG5e5r2qFgVEddp5fM3fDFVphJE=
 
-eventemitter3@^3.0.0, eventemitter3@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
-  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
 eventlistener@0.0.1:
   version "0.0.1"
@@ -7498,10 +7061,18 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.2.0"
 
-exec-sh@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
-  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
 execa@^0.7.0:
   version "0.7.0"
@@ -7658,18 +7229,6 @@ expect@^23.6.0:
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
 
-expect@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d"
-  integrity sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    ansi-styles "^3.2.0"
-    jest-get-type "^24.8.0"
-    jest-matcher-utils "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-regex-util "^24.3.0"
-
 expo-ads-admob@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/expo-ads-admob/-/expo-ads-admob-2.0.0.tgz#53b78a5ac5eee4f306ff461256160990ab96936b"
@@ -8108,7 +7667,7 @@ express-session@^1.16.1:
     safe-buffer "5.1.2"
     uid-safe "~2.1.5"
 
-express@4.16.4:
+express@4.16.4, express@^4.13.4, express@^4.15.2, express@^4.16.2:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -8144,42 +7703,6 @@ express@4.16.4:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.13.4, express@^4.15.2, express@^4.16.2, express@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
-  dependencies:
-    accepts "~1.3.7"
-    array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
-    content-type "~1.0.4"
-    cookie "0.4.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.1.2"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 extend-shallow@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
@@ -8303,9 +7826,9 @@ fast-diff@^1.1.1, fast-diff@^1.1.2:
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
 fast-glob@^2.0.2:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
+  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.1.2"
@@ -8476,30 +7999,30 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.2"
+    encodeurl "~1.0.1"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
     parseurl "~1.3.2"
-    statuses "~1.4.0"
+    statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@1.1.2, finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
     unpipe "~1.0.0"
 
 find-babel-config@^1.1.0:
@@ -8571,9 +8094,9 @@ findup-sync@^2.0.0:
     resolve-dir "^1.0.1"
 
 fined@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
-  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.1.tgz#95d88ff329123dd1a6950fdfcd321f746271e01f"
+  integrity sha512-jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==
   dependencies:
     expand-tilde "^2.0.2"
     is-plain-object "^2.0.3"
@@ -8676,13 +8199,13 @@ formidable@^1.2.0:
   integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==
 
 formik@^1.3.1:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/formik/-/formik-1.5.7.tgz#2fc5fc2f0c693cdc4e8c9dad3a10eb4c4e131ff5"
-  integrity sha512-kZo8lS4WzfC2uivnSkE9DOuX9x+jVjCtIZOlb1A4lHGeURyuLt6eDfwGJzNlcP0lXIwmpANKzegiB8j60B54TA==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/formik/-/formik-1.5.1.tgz#ef5687e1ade5b1fe5f1d51435b422238aad107e9"
+  integrity sha512-FBWGBKQkcCE4d5b5l2fKccD9d1QxNxw/0bQTRvp3EjzA8Bnjmsm9H/Oy0375UA8P3FPmfJkF4cXLLdEqK7fP5A==
   dependencies:
     create-react-context "^0.2.2"
     deepmerge "^2.1.1"
-    hoist-non-react-statics "^3.3.0"
+    hoist-non-react-statics "^2.5.5"
     lodash "^4.17.11"
     lodash-es "^4.17.11"
     prop-types "^15.6.1"
@@ -8769,19 +8292,10 @@ fs-extra@^7.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.0.1.tgz#90294081f978b1f182f347a440a209154344285b"
-  integrity sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
-  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
@@ -8806,17 +8320,17 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.3, fsevents@^1.2.7:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
-  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
   dependencies:
-    nan "^2.12.1"
-    node-pre-gyp "^0.12.0"
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
 
-fstream@^1.0.0, fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+fstream@^1.0.0, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -9093,10 +8607,10 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -9134,9 +8648,9 @@ global@^4.3.0:
     process "~0.5.1"
 
 globals@^11.0.1, globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
+  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
 
 globals@^9.18.0:
   version "9.18.0"
@@ -9258,12 +8772,12 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@^4.0.2, handlebars@^4.0.3, handlebars@^4.1.0, handlebars@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+handlebars@^4.0.2, handlebars@^4.0.3, handlebars@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
+  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
   dependencies:
-    neo-async "^2.6.0"
+    async "^2.5.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
@@ -9396,18 +8910,18 @@ hashids@^1.1.4:
   integrity sha512-dEHCG2LraR6PNvSGxosZHIRgxF5sNLOIBFEHbj8lfP9WWmu/PWPMzsip1drdVSOFi51N2pU7gZavrgn7sbGFuw==
 
 haul@^1.0.0-rc.9:
-  version "1.0.0-rc.15"
-  resolved "https://registry.yarnpkg.com/haul/-/haul-1.0.0-rc.15.tgz#2d247610baadc0a046a54502ad17bfec5fb7cf61"
-  integrity sha512-KrtEFBbbTCv4ffMehESxhQwrd+ht6OA1sN2p1Y38Goltk7NXYmVAeMIJAljPxVhaDVHtf9xpvX5qACUXydRXbQ==
-  dependencies:
-    "@babel/core" "^7.4.0"
-    "@babel/plugin-proposal-class-properties" "^7.4.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.4.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.4.0"
-    "@babel/plugin-transform-react-jsx" "^7.3.0"
-    "@babel/polyfill" "^7.4.0"
-    "@babel/preset-env" "^7.4.0"
-    "@babel/register" "^7.4.0"
+  version "1.0.0-rc.13"
+  resolved "https://registry.yarnpkg.com/haul/-/haul-1.0.0-rc.13.tgz#46d2b3ee16a4a5b630b71bcf79ca95bbe9f61ec9"
+  integrity sha512-sB3frdVGflJ01PABePnjINn7sOdVxsyjoI0UG2tfPtts+yqcGIffEpTWP6DtqQfjUcas67yfQIi3BFLg4JNxUQ==
+  dependencies:
+    "@babel/core" "^7.0.0"
+    "@babel/plugin-proposal-class-properties" "^7.0.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
+    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/polyfill" "^7.0.0"
+    "@babel/preset-env" "^7.0.0"
+    "@babel/register" "^7.0.0"
     "@react-slate/components" "0.2.0"
     "@react-slate/core" "0.7.0"
     "@react-slate/utils" "0.2.2"
@@ -9479,16 +8993,15 @@ heroku-babel-loader@^8.0.4:
     util.promisify "^1.0.0"
 
 history@^4.7.2:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca"
-  integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
+  integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==
   dependencies:
-    "@babel/runtime" "^7.1.2"
+    invariant "^2.2.1"
     loose-envify "^1.2.0"
     resolve-pathname "^2.2.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
     value-equal "^0.4.0"
+    warning "^3.0.0"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -9510,16 +9023,16 @@ hoek@5.x.x:
   integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==
 
 hoek@6.x.x:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
-  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
+  integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
 
 hoist-non-react-statics@^1.0.5:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
-hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
+hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
@@ -9544,6 +9057,11 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
+home-or-tmp@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"
+  integrity sha1-V6j+JM8zzdUkhgoVgh3cJchmcfs=
+
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -9573,7 +9091,7 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-html-entities@^1.2.0, html-entities@^1.2.1:
+html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
@@ -9643,17 +9161,6 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-errors@1.7.2, http-errors@~1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
@@ -9742,9 +9249,9 @@ i18next-browser-languagedetector@^2.1.0:
   integrity sha512-wPbtH18FdOuB245I8Bhma5/XSDdN/HpYlX+wga1eMy+slhaFQSnrWX6fp+aYSL2eEuj0RlfHeEVz6Fo/lxAj6A==
 
 i18next-express-middleware@^1.1.1:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/i18next-express-middleware/-/i18next-express-middleware-1.8.0.tgz#8ef73a56036b404b162d81d4aec23cfa0ab2a609"
-  integrity sha512-vbEV+YbGoXNpv59WM7MHvdbBpPUS6itMIgpX21mjmu8/naS/NlmZe6vMNFGUIWs5PbXGnKWm7ucKxYmc2RV8vA==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/i18next-express-middleware/-/i18next-express-middleware-1.7.1.tgz#00436776113ff2e87d3befa81a9aa8a359af1193"
+  integrity sha512-e8JhShjL2sVkWFrO0ySVsmM9Ge7sQ8iDsNXSmpAD/2Fvg/P4uo7Kqm0R+yWWsRYCr+uu8tWsSDiEbmbjrnsyVg==
   dependencies:
     cookies "0.7.1"
 
@@ -9780,14 +9287,14 @@ icss-utils@^2.1.0:
     postcss "^6.0.1"
 
 idx@^2.1.0:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.6.tgz#1f824595070100ae9ad585c86db08dc74f83a59d"
-  integrity sha512-WFXLF7JgPytbMgelpRY46nHz5tyDcedJ76pLV+RJWdb8h33bxFq4bdZau38DhNSzk5eVniBf1K3jwfK+Lb5nYA==
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.5.tgz#609a011b7c9e092380f30908389d64ecd1102f70"
+  integrity sha512-pp6pulm8tbJag/Z3PXTq+PMfjlWTavze4hp/ajH9hQdNql62kuTHhzn9AP0buQ4n80zJlgaBeruWvGcA5DUdIw==
 
 ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -10024,9 +9531,9 @@ inquirer@^5.0.1:
     through "^2.3.6"
 
 inquirer@^6.2.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
-  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
+  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -10039,7 +9546,7 @@ inquirer@^6.2.0:
     run-async "^2.2.0"
     rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.1.0"
+    strip-ansi "^5.0.0"
     through "^2.3.6"
 
 instapromise@^2.0.7:
@@ -10047,12 +9554,12 @@ instapromise@^2.0.7:
   resolved "https://registry.yarnpkg.com/instapromise/-/instapromise-2.0.7.tgz#85e66b31021194da11214c865127ef04ec30167a"
   integrity sha1-heZrMQIRlNoRIUyGUSfvBOwwFno=
 
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
+internal-ip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
+  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
   dependencies:
-    default-gateway "^4.2.0"
+    default-gateway "^4.0.1"
     ipaddr.js "^1.9.0"
 
 interpret@^1.0.0, interpret@^1.0.1, interpret@^1.1.0:
@@ -10068,7 +9575,7 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -10095,7 +9602,12 @@ ip@^1.1.0, ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.9.0, ipaddr.js@^1.9.0:
+ipaddr.js@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+
+ipaddr.js@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
   integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
@@ -10281,11 +9793,6 @@ is-generator-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
   integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
 
-is-generator-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
-  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -10301,9 +9808,9 @@ is-glob@^3.1.0:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
@@ -10314,6 +9821,11 @@ is-ip@^2.0.0:
   dependencies:
     ip-regex "^2.0.0"
 
+is-negative-zero@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
+  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -10350,24 +9862,24 @@ is-observable@^1.1.0:
   dependencies:
     symbol-observable "^1.1.0"
 
-is-path-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
-  integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
-    is-path-inside "^2.1.0"
+    is-path-inside "^1.0.0"
 
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
-    path-is-inside "^1.0.2"
+    path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
@@ -10381,13 +9893,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-plain-object@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
-  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
-  dependencies:
-    isobject "^4.0.0"
-
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -10480,13 +9985,6 @@ is-text-path@^1.0.0:
   dependencies:
     text-extensions "^1.0.0"
 
-is-text-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636"
-  integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==
-  dependencies:
-    text-extensions "^2.0.0"
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -10554,9 +10052,9 @@ isexe@^2.0.0:
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 ismobilejs@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/ismobilejs/-/ismobilejs-0.5.2.tgz#e81bacf6187c532ad8348355f4fecd6e6adfdce1"
-  integrity sha512-ta9UdV60xVZk/ZafFtSFslQaE76SvNkcs1r73d2PVR21zVzx9xuYv9tNe4MxA1NN7WoeCc2RjGot3Bz1eHDx3Q==
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/ismobilejs/-/ismobilejs-0.5.1.tgz#0e3f825e29e32f84ad5ddbb60e9e04a894046488"
+  integrity sha512-QX4STsOcBYqlTjVGuAdP1MiRVxtiUbRHOKH0v7Gn1EvfUVIQnrSdgCM4zB4VCZuIejnb2NUMUx0Bwd3EIG6yyA==
 
 isobject@^2.0.0:
   version "2.1.0"
@@ -10570,11 +10068,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isobject@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
-  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
-
 isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -10628,11 +10121,6 @@ istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
   integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
-istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
 istanbul-lib-hook@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
@@ -10653,19 +10141,6 @@ istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
     istanbul-lib-coverage "^1.2.1"
     semver "^5.3.0"
 
-istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
 istanbul-lib-report@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
@@ -10676,15 +10151,6 @@ istanbul-lib-report@^1.1.5:
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-report@^2.0.4:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
-  dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
-
 istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
@@ -10696,17 +10162,6 @@ istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-lib-source-maps@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
-    source-map "^0.6.1"
-
 istanbul-reports@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
@@ -10714,13 +10169,6 @@ istanbul-reports@^1.5.1:
   dependencies:
     handlebars "^4.0.3"
 
-istanbul-reports@^2.1.1:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
-  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
-  dependencies:
-    handlebars "^4.1.2"
-
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -10746,15 +10194,6 @@ jest-changed-files@^23.4.2:
   dependencies:
     throat "^4.0.0"
 
-jest-changed-files@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz#7e7eb21cf687587a85e50f3d249d1327e15b157b"
-  integrity sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    execa "^1.0.0"
-    throat "^4.0.0"
-
 jest-cli@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
@@ -10797,25 +10236,6 @@ jest-cli@^23.6.0:
     which "^1.2.12"
     yargs "^11.0.0"
 
-jest-cli@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989"
-  integrity sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==
-  dependencies:
-    "@jest/core" "^24.8.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    chalk "^2.0.1"
-    exit "^0.1.2"
-    import-local "^2.0.0"
-    is-ci "^2.0.0"
-    jest-config "^24.8.0"
-    jest-util "^24.8.0"
-    jest-validate "^24.8.0"
-    prompts "^2.0.1"
-    realpath-native "^1.1.0"
-    yargs "^12.0.2"
-
 jest-config@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
@@ -10836,29 +10256,6 @@ jest-config@^23.6.0:
     micromatch "^2.3.11"
     pretty-format "^23.6.0"
 
-jest-config@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz#77db3d265a6f726294687cbbccc36f8a76ee0f4f"
-  integrity sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    babel-jest "^24.8.0"
-    chalk "^2.0.1"
-    glob "^7.1.1"
-    jest-environment-jsdom "^24.8.0"
-    jest-environment-node "^24.8.0"
-    jest-get-type "^24.8.0"
-    jest-jasmine2 "^24.8.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.8.0"
-    jest-util "^24.8.0"
-    jest-validate "^24.8.0"
-    micromatch "^3.1.10"
-    pretty-format "^24.8.0"
-    realpath-native "^1.1.0"
-
 jest-diff@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030"
@@ -10879,16 +10276,6 @@ jest-diff@^23.6.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.6.0"
 
-jest-diff@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172"
-  integrity sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==
-  dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.3.0"
-    jest-get-type "^24.8.0"
-    pretty-format "^24.8.0"
-
 jest-docblock@23.2.0, jest-docblock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
@@ -10901,13 +10288,6 @@ jest-docblock@^21.0.0:
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
   integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
 
-jest-docblock@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd"
-  integrity sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==
-  dependencies:
-    detect-newline "^2.1.0"
-
 jest-dom@^1.0.0:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/jest-dom/-/jest-dom-1.12.1.tgz#4880c91e39e9c737188b5c952740df8912635248"
@@ -10928,17 +10308,6 @@ jest-each@^23.6.0:
     chalk "^2.0.1"
     pretty-format "^23.6.0"
 
-jest-each@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz#a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"
-  integrity sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    chalk "^2.0.1"
-    jest-get-type "^24.8.0"
-    jest-util "^24.8.0"
-    pretty-format "^24.8.0"
-
 jest-environment-jsdom@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
@@ -10948,18 +10317,6 @@ jest-environment-jsdom@^23.4.0:
     jest-util "^23.4.0"
     jsdom "^11.5.1"
 
-jest-environment-jsdom@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz#300f6949a146cabe1c9357ad9e9ecf9f43f38857"
-  integrity sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==
-  dependencies:
-    "@jest/environment" "^24.8.0"
-    "@jest/fake-timers" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    jest-mock "^24.8.0"
-    jest-util "^24.8.0"
-    jsdom "^11.5.1"
-
 jest-environment-node@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
@@ -10968,21 +10325,10 @@ jest-environment-node@^23.4.0:
     jest-mock "^23.2.0"
     jest-util "^23.4.0"
 
-jest-environment-node@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz#d3f726ba8bc53087a60e7a84ca08883a4c892231"
-  integrity sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==
-  dependencies:
-    "@jest/environment" "^24.8.0"
-    "@jest/fake-timers" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    jest-mock "^24.8.0"
-    jest-util "^24.8.0"
-
-jest-expo@^32.0.0:
-  version "32.0.1"
-  resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-32.0.1.tgz#83bb16cba0d14d75bc635b8fb078bc33e82b99ad"
-  integrity sha512-FnqfaQ0LuzOgG3/qJh6G+pard5SnWnTfJ7Ad+NFl6CEyZhLp/sCu01fl+CGpal2LFSPODChheIaLYebgw69d+g==
+jest-expo@^31.0.0:
+  version "31.0.0"
+  resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-31.0.0.tgz#6f191eebb646b2654388f5166311385c118a7924"
+  integrity sha512-GWHGY4M53dZljIzEJdGCntZFvWvF7tf6zAhCURaNSLpZ0o7qtVKqjZrjXI8bp+58Hr3O9N9KhWJYKFVzmMLAFQ==
   dependencies:
     "@babel/core" "^7.1.0"
     babel-core "^7.0.0-bridge.0"
@@ -10996,11 +10342,6 @@ jest-get-type@^22.1.0, jest-get-type@^22.4.3:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
   integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
-jest-get-type@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc"
-  integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==
-
 jest-haste-map@23.5.0:
   version "23.5.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.5.0.tgz#d4ca618188bd38caa6cb20349ce6610e194a8065"
@@ -11029,25 +10370,6 @@ jest-haste-map@^23.6.0:
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-haste-map@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800"
-  integrity sha512-ZBPRGHdPt1rHajWelXdqygIDpJx8u3xOoLyUBWRW28r3tagrgoepPrzAozW7kW9HrQfhvmiv1tncsxqHJO1onQ==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    anymatch "^2.0.0"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.1.15"
-    invariant "^2.2.4"
-    jest-serializer "^24.4.0"
-    jest-util "^24.8.0"
-    jest-worker "^24.6.0"
-    micromatch "^3.1.10"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
 jest-jasmine2@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
@@ -11066,28 +10388,6 @@ jest-jasmine2@^23.6.0:
     jest-util "^23.4.0"
     pretty-format "^23.6.0"
 
-jest-jasmine2@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898"
-  integrity sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^24.8.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    chalk "^2.0.1"
-    co "^4.6.0"
-    expect "^24.8.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^24.8.0"
-    jest-matcher-utils "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-runtime "^24.8.0"
-    jest-snapshot "^24.8.0"
-    jest-util "^24.8.0"
-    pretty-format "^24.8.0"
-    throat "^4.0.0"
-
 jest-leak-detector@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
@@ -11095,13 +10395,6 @@ jest-leak-detector@^23.6.0:
   dependencies:
     pretty-format "^23.6.0"
 
-jest-leak-detector@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz#c0086384e1f650c2d8348095df769f29b48e6980"
-  integrity sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==
-  dependencies:
-    pretty-format "^24.8.0"
-
 jest-matcher-utils@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
@@ -11120,16 +10413,6 @@ jest-matcher-utils@^23.6.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.6.0"
 
-jest-matcher-utils@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495"
-  integrity sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^24.8.0"
-    jest-get-type "^24.8.0"
-    pretty-format "^24.8.0"
-
 jest-message-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
@@ -11141,37 +10424,11 @@ jest-message-util@^23.4.0:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-message-util@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b"
-  integrity sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
-
 jest-mock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
   integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
-jest-mock@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"
-  integrity sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==
-  dependencies:
-    "@jest/types" "^24.8.0"
-
-jest-pnp-resolver@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
-  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
-
 jest-react-native@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/jest-react-native/-/jest-react-native-18.0.0.tgz#77dd909f069324599f227c58c61c2e62168726ba"
@@ -11182,11 +10439,6 @@ jest-regex-util@^23.3.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
   integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
 
-jest-regex-util@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
-  integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
-
 jest-resolve-dependencies@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
@@ -11195,15 +10447,6 @@ jest-resolve-dependencies@^23.6.0:
     jest-regex-util "^23.3.0"
     jest-snapshot "^23.6.0"
 
-jest-resolve-dependencies@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0"
-  integrity sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    jest-regex-util "^24.3.0"
-    jest-snapshot "^24.8.0"
-
 jest-resolve@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
@@ -11213,17 +10456,6 @@ jest-resolve@^23.6.0:
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
-jest-resolve@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f"
-  integrity sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    browser-resolve "^1.11.3"
-    chalk "^2.0.1"
-    jest-pnp-resolver "^1.2.1"
-    realpath-native "^1.1.0"
-
 jest-runner@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
@@ -11243,31 +10475,6 @@ jest-runner@^23.6.0:
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runner@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz#4f9ae07b767db27b740d7deffad0cf67ccb4c5bb"
-  integrity sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/environment" "^24.8.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    chalk "^2.4.2"
-    exit "^0.1.2"
-    graceful-fs "^4.1.15"
-    jest-config "^24.8.0"
-    jest-docblock "^24.3.0"
-    jest-haste-map "^24.8.0"
-    jest-jasmine2 "^24.8.0"
-    jest-leak-detector "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-resolve "^24.8.0"
-    jest-runtime "^24.8.0"
-    jest-util "^24.8.0"
-    jest-worker "^24.6.0"
-    source-map-support "^0.5.6"
-    throat "^4.0.0"
-
 jest-runtime@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
@@ -11295,45 +10502,11 @@ jest-runtime@^23.6.0:
     write-file-atomic "^2.1.0"
     yargs "^11.0.0"
 
-jest-runtime@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz#05f94d5b05c21f6dc54e427cd2e4980923350620"
-  integrity sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/environment" "^24.8.0"
-    "@jest/source-map" "^24.3.0"
-    "@jest/transform" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    "@types/yargs" "^12.0.2"
-    chalk "^2.0.1"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.1.15"
-    jest-config "^24.8.0"
-    jest-haste-map "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-mock "^24.8.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.8.0"
-    jest-snapshot "^24.8.0"
-    jest-util "^24.8.0"
-    jest-validate "^24.8.0"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
-    strip-bom "^3.0.0"
-    yargs "^12.0.2"
-
 jest-serializer@23.0.1, jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
   integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
 
-jest-serializer@^24.4.0:
-  version "24.4.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
-  integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
-
 jest-snapshot@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
@@ -11350,29 +10523,6 @@ jest-snapshot@^23.6.0:
     pretty-format "^23.6.0"
     semver "^5.5.0"
 
-jest-snapshot@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"
-  integrity sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-    "@jest/types" "^24.8.0"
-    chalk "^2.0.1"
-    expect "^24.8.0"
-    jest-diff "^24.8.0"
-    jest-matcher-utils "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-resolve "^24.8.0"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    pretty-format "^24.8.0"
-    semver "^5.5.0"
-
-jest-transform-stub@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d"
-  integrity sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg==
-
 jest-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
@@ -11387,24 +10537,6 @@ jest-util@^23.4.0:
     slash "^1.0.0"
     source-map "^0.6.0"
 
-jest-util@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1"
-  integrity sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/fake-timers" "^24.8.0"
-    "@jest/source-map" "^24.3.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    callsites "^3.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.15"
-    is-ci "^2.0.0"
-    mkdirp "^0.5.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
-
 jest-validate@^23.5.0, jest-validate@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
@@ -11415,18 +10547,6 @@ jest-validate@^23.5.0, jest-validate@^23.6.0:
     leven "^2.1.0"
     pretty-format "^23.6.0"
 
-jest-validate@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849"
-  integrity sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    camelcase "^5.0.0"
-    chalk "^2.0.1"
-    jest-get-type "^24.8.0"
-    leven "^2.1.0"
-    pretty-format "^24.8.0"
-
 jest-watcher@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
@@ -11436,19 +10556,6 @@ jest-watcher@^23.4.0:
     chalk "^2.0.1"
     string-length "^2.0.0"
 
-jest-watcher@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz#58d49915ceddd2de85e238f6213cef1c93715de4"
-  integrity sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==
-  dependencies:
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    "@types/yargs" "^12.0.9"
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    jest-util "^24.8.0"
-    string-length "^2.0.0"
-
 jest-worker@23.2.0, jest-worker@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
@@ -11456,14 +10563,6 @@ jest-worker@23.2.0, jest-worker@^23.2.0:
   dependencies:
     merge-stream "^1.0.1"
 
-jest-worker@^24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
-  integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
-  dependencies:
-    merge-stream "^1.0.1"
-    supports-color "^6.1.0"
-
 jest@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
@@ -11472,14 +10571,6 @@ jest@^23.6.0:
     import-local "^1.0.0"
     jest-cli "^23.6.0"
 
-jest@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081"
-  integrity sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==
-  dependencies:
-    import-local "^2.0.0"
-    jest-cli "^24.8.0"
-
 joi@14.0.4:
   version "14.0.4"
   resolved "https://registry.yarnpkg.com/joi/-/joi-14.0.4.tgz#f066f79330f6bd6f3dda243be6d2c211f83a5f9b"
@@ -11533,10 +10624,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
+  version "3.12.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
+  integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -11643,9 +10734,9 @@ json2mq@^0.2.0:
     string-convert "^0.2.0"
 
 json3@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
 json5@2.x, json5@^2.1.0:
   version "2.1.0"
@@ -11667,9 +10758,9 @@ json5@^1.0.1:
     minimist "^1.2.0"
 
 jsonc-parser@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.1.0.tgz#eb0d0c7a3c33048524ce3574c57c7278fb2f1bf3"
-  integrity sha512-n9GrT8rrr2fhvBbANa1g+xFmgGK5X91KFeDwlKQ3+SJfmH5+tKv/M/kahx/TXOMflfWHKGKqKyfHQaLKTNzJ6w==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.3.tgz#6d4199ccab7f21ff5d2a4225050c54e981fb21a2"
+  integrity sha512-WJi9y9ABL01C8CxTKxRRQkkSpY/x2bo4Gy0WuiZGrInxQqgxQpvkBCLNcDYcHOSdhx4ODgbFcgAvfL49C+PHgQ==
 
 jsonfile@^2.1.0, jsonfile@^2.3.1:
   version "2.4.0"
@@ -11695,7 +10786,23 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonwebtoken@^8.1.0, jsonwebtoken@^8.2.0:
+jsonwebtoken@^8.1.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz#ebd0ca2a69797816e1c5af65b6c759787252947e"
+  integrity sha512-IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA==
+  dependencies:
+    jws "^3.2.1"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^5.6.0"
+
+jsonwebtoken@^8.2.0:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
   integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
@@ -11721,13 +10828,22 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.0.1, jsx-ast-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz#0ee4e2c971fb9601c67b5641b71be80faecf0b36"
-  integrity sha512-yDGDG2DS4JcqhA6blsuYbtsT09xL8AoLuUR2Gb5exrw7UEM19sBcOTq+YBBhrNbl0PUC4R4LnFu+dHg2HKeVvA==
+jsx-ast-utils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
   dependencies:
     array-includes "^3.0.3"
 
+jwa@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.0.tgz#8f61dc799acf0309f2d4b22a91ce73d6d2bb206c"
+  integrity sha512-mt6IHaq0ZZWDBspg0Pheu3r9sVNMEZn+GJe1zcdYyhFcDSclp3J8xEdO4PjZolZ2i8xlaVU1LetHM0nJejYsEw==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
 jwa@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
@@ -11737,6 +10853,14 @@ jwa@^1.4.1:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
+jws@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.1.tgz#d79d4216a62c9afa0a3d5e8b5356d75abdeb2be5"
+  integrity sha512-bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g==
+  dependencies:
+    jwa "^1.2.0"
+    safe-buffer "^5.0.1"
+
 jws@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
@@ -11762,7 +10886,7 @@ keyv@3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-killable@^1.0.1:
+killable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -11808,11 +10932,6 @@ kleur@^2.0.1:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
   integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
 
-kleur@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
 knex@^0.14.2:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
@@ -11909,25 +11028,25 @@ lerna@^2.5.1:
     yargs "^8.0.2"
 
 lerna@^3.4.0:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.14.1.tgz#6bce5d2d4958e853f51387f8f41a8f2d9aa4a8ea"
-  integrity sha512-lQxmGeEECjOMI3pRh2+I6jazoEWhEfvZNIs7XaX71op33AVwyjlY/nQ1GJGrPhxYBuQnlPgH0vH/nC/lcLaVkw==
-  dependencies:
-    "@lerna/add" "3.14.0"
-    "@lerna/bootstrap" "3.14.0"
-    "@lerna/changed" "3.14.1"
-    "@lerna/clean" "3.14.0"
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.13.1.tgz#feaff562176f304bd82329ca29ce46ab6c033463"
+  integrity sha512-7kSz8LLozVsoUNTJzJzy+b8TnV9YdviR2Ee2PwGZSlVw3T1Rn7kOAPZjEi+3IWnOPC96zMPHVmjCmzQ4uubalw==
+  dependencies:
+    "@lerna/add" "3.13.1"
+    "@lerna/bootstrap" "3.13.1"
+    "@lerna/changed" "3.13.1"
+    "@lerna/clean" "3.13.1"
     "@lerna/cli" "3.13.0"
-    "@lerna/create" "3.14.0"
-    "@lerna/diff" "3.14.0"
-    "@lerna/exec" "3.14.0"
-    "@lerna/import" "3.14.0"
-    "@lerna/init" "3.14.0"
-    "@lerna/link" "3.14.0"
-    "@lerna/list" "3.14.0"
-    "@lerna/publish" "3.14.1"
-    "@lerna/run" "3.14.0"
-    "@lerna/version" "3.14.1"
+    "@lerna/create" "3.13.1"
+    "@lerna/diff" "3.13.1"
+    "@lerna/exec" "3.13.1"
+    "@lerna/import" "3.13.1"
+    "@lerna/init" "3.13.1"
+    "@lerna/link" "3.13.1"
+    "@lerna/list" "3.13.1"
+    "@lerna/publish" "3.13.1"
+    "@lerna/run" "3.13.1"
+    "@lerna/version" "3.13.1"
     import-local "^1.0.0"
     npmlog "^4.1.2"
 
@@ -12131,7 +11250,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -12217,7 +11336,7 @@ lodash.assign@^3.0.0:
     lodash._createassigner "^3.0.0"
     lodash.keys "^3.0.0"
 
-lodash.assign@^4.0.1:
+lodash.assign@^4.0.1, lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
@@ -12227,7 +11346,7 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
-lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -12310,11 +11429,6 @@ lodash.isinteger@^4.0.4:
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
   integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
 
-lodash.ismatch@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
-  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
-
 lodash.isnumber@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
@@ -12364,6 +11478,11 @@ lodash.merge@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
   integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
 
+lodash.mergewith@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
+
 lodash.omit@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
@@ -12474,7 +11593,7 @@ lodash@3.10.1, lodash@^3.10.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@4.17.11, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.1, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10:
+lodash@4.17.11, lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.1, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -12503,17 +11622,18 @@ log-update@2.3.x, log-update@^2.3.0:
     wrap-ansi "^3.0.1"
 
 logfmt@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/logfmt/-/logfmt-1.3.2.tgz#be34020b7390b8201212a12f533e3cb4c92d70c2"
-  integrity sha512-U0lelcaGWEfEITZQXs8y5HrJp2xa0BJ+KDfkkLJRmuKbQIEVGNv145FbaNekY4ZYHJSBBx8NLJitaPtRqLEkxQ==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/logfmt/-/logfmt-1.2.1.tgz#0e99838eb3a87fb6272d6d2b4fc327b95a29abee"
+  integrity sha512-QlZuQi8AlGbrXfW7LrxH/lhyFjI6Xr2DNSrIzhtIJAicAgl21P2gHpqABR3Sh0Kd4dvwTAej6jDVdh0o/HwfcA==
   dependencies:
+    lodash "4.x"
     split "0.2.x"
     through "2.3.x"
 
-loglevel@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372"
-  integrity sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==
+loglevel@^1.4.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
 long@^4.0.0:
   version "4.0.0"
@@ -12528,9 +11648,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3
     js-tokens "^3.0.0 || ^4.0.0"
 
 lottie-ios@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-2.5.3.tgz#bff86b6662f9259439535d1548894c274c9e476f"
-  integrity sha512-oBtLkPJ4JkaUqUTOsmFPbSK2/fW6iBezcH5UKBgODaGMpZXCjogArXcvmG7KRNEnPiYMhgqSCKd8tDyDrwQp7Q==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-2.5.0.tgz#55c808e785d4a6933b0c10b395530b17098b05de"
+  integrity sha1-VcgI54XUppM7DBCzlVMLFwmLBd4=
 
 lottie-react-native@2.5.0:
   version "2.5.0"
@@ -12585,10 +11705,10 @@ macos-release@^1.0.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
   integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==
 
-macos-release@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
-  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
+macos-release@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
+  integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
 
 make-dir@^1.0.0:
   version "1.3.0"
@@ -12597,7 +11717,7 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
-make-dir@^2.0.0, make-dir@^2.1.0:
+make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -12730,9 +11850,9 @@ mem@^1.1.0:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.2.0.tgz#5ee057680ed9cb8dad8a78d820f9a8897a102025"
+  integrity sha512-5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA==
   dependencies:
     map-age-cleaner "^0.1.1"
     mimic-fn "^2.0.0"
@@ -13091,10 +12211,10 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.40.0, "mime-db@>= 1.40.0 < 2":
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+"mime-db@>= 1.38.0 < 2", mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
 
 mime-db@~1.23.0:
   version "1.23.0"
@@ -13113,27 +12233,27 @@ mime-types@2.1.11:
   dependencies:
     mime-db "~1.23.0"
 
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
   dependencies:
-    mime-db "1.40.0"
+    mime-db "~1.38.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@1.6.0, mime@^1.3.4, mime@^1.4.1:
+mime@^1.3.4, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.0.3, mime@^2.4.2:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
-  integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==
+mime@^2.0.3, mime@^2.3.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
+  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -13141,9 +12261,9 @@ mimic-fn@^1.0.0:
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.0.0.tgz#0913ff0b121db44ef5848242c38bbb35d44cabde"
+  integrity sha512-jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA==
 
 mimic-response@^1.0.0:
   version "1.0.1"
@@ -13228,7 +12348,7 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.5:
+minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -13236,7 +12356,7 @@ minipass@^2.2.1, minipass@^2.3.5:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.2.1:
+minizlib@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
   integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
@@ -13321,9 +12441,9 @@ mocha@^5.1.1:
     supports-color "5.4.0"
 
 mochapack@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/mochapack/-/mochapack-1.1.1.tgz#98d7f4bd4b7f32dfd4e3aed68d562f4c97fe38b1"
-  integrity sha512-t8WchR4+38f0BO7+nBcUexqe1NNhzr8vsylOp5wF/J1EWP47T76KRVnZIrHHjxXdnp5JJHZtUD8C0pkJG2iv0g==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mochapack/-/mochapack-1.1.0.tgz#0fe24228b4b92a987ece2258e96188f59f248435"
+  integrity sha512-IFNA4LasRYWu2pNRjDRpoU8I/aLLgdVfkqlWz+x+tMLBrQO3HC18b+gjevIKeIfjVJ3msNJSSa4elOLNVd9HPw==
   dependencies:
     babel-runtime "^6.18.0"
     chalk "^2.3.0"
@@ -13349,9 +12469,9 @@ modify-values@^1.0.0:
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 moment-timezone@^0.5.23:
-  version "0.5.25"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.25.tgz#a11bfa2f74e088327f2cd4c08b3e7bdf55957810"
-  integrity sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw==
+  version "0.5.23"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463"
+  integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==
   dependencies:
     moment ">= 2.9.0"
 
@@ -13388,16 +12508,11 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1:
+ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.0.0, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 multi-progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/multi-progress/-/multi-progress-2.0.0.tgz#29ccb42cf24874b1c6384f03127ce5dff7b22f2c"
@@ -13487,15 +12602,20 @@ named-placeholders@^1.1.2:
   dependencies:
     lru-cache "^4.1.3"
 
-nan@^2.12.1, nan@^2.13.2:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+nan@^2.10.0, nan@^2.9.2:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.1.tgz#a15bee3790bde247e8f38f1d446edcdaeb05f2dd"
+  integrity sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==
+
+nan@~2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
 
 nanoid@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.3.tgz#dde999e173bc9d7bd2ee2746b89909ade98e075e"
-  integrity sha512-NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.1.tgz#deb55cac196e3f138071911dabbc3726eb048864"
+  integrity sha512-k1u2uemjIGsn25zmujKnotgniC/gxQ9sdegdezeDiKdkDW56THUMqlz3urndKCXJxA6yPzSZbXx/QCMe/pxqsA==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -13556,23 +12676,23 @@ ncp@^2.0.0, ncp@~2.0.0:
   integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
 
 needle@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
-  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
+  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
   dependencies:
-    debug "^3.2.6"
+    debug "^2.1.2"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0, neo-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+neo-async@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 next-tick@^1.0.0:
   version "1.0.0"
@@ -13624,9 +12744,9 @@ node-fetch@^1.0.1:
     is-stream "^1.0.1"
 
 node-fetch@^2.0.0, node-fetch@^2.2.0, node-fetch@^2.3.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
+  integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==
 
 node-forge@0.7.5:
   version "0.7.5"
@@ -13656,23 +12776,6 @@ node-gyp@^3.8.0:
     tar "^2.0.0"
     which "1"
 
-node-gyp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz#972654af4e5dd0cd2a19081b4b46fe0442ba6f45"
-  integrity sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==
-  dependencies:
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^4.4.8"
-    which "1"
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -13755,33 +12858,24 @@ node-pre-gyp@^0.11.0:
     semver "^5.3.0"
     tar "^4"
 
-node-pre-gyp@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
+node-releases@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.11.tgz#9a0841a4b0d92b7d5141ed179e764f42ad22724a"
+  integrity sha512-8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ==
   dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^4"
 
-node-releases@^1.1.21:
-  version "1.1.23"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
-  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
+node-releases@^1.1.8:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.10.tgz#5dbeb6bc7f4e9c85b899e2e7adcc0635c9b2adf7"
+  integrity sha512-KbUPCpfoBvb3oBkej9+nrU0/7xPlVhmhhUJ1PZqwIP5/1dJkRWKWD3OONjo6M2J7tSCBtDCumLwwqeI+DWWaLQ==
   dependencies:
     semver "^5.3.0"
 
 node-sass@^4.7.2:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
-  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
+  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -13790,10 +12884,12 @@ node-sass@^4.7.2:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
-    lodash "^4.17.11"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.13.2"
+    nan "^2.10.0"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
     request "^2.88.0"
@@ -13882,14 +12978,14 @@ npm-bundled@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
   integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
 
-npm-lifecycle@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.1.tgz#0027c09646f0fd346c5c93377bdaba59c6748fdf"
-  integrity sha512-+Vg6I60Z75V/09pdcH5iUo/99Q/vop35PaI99elvxk56azSVVsdsSsS/sXqKDNwbRRNN1qSxkcO45ZOu0yOWew==
+npm-lifecycle@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
+  integrity sha512-QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g==
   dependencies:
     byline "^5.0.0"
-    graceful-fs "^4.1.15"
-    node-gyp "^4.0.0"
+    graceful-fs "^4.1.11"
+    node-gyp "^3.8.0"
     resolve-from "^4.0.0"
     slide "^1.1.6"
     uid-number "0.0.6"
@@ -14000,9 +13096,9 @@ number-is-nan@^1.0.0:
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
-  integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.1.tgz#08d6d75e69fd791bdea31507ffafe8c843b67e9c"
+  integrity sha512-T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -14029,9 +13125,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-keys@^1.0.12:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
+  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
 
 object-path@^0.9.2:
   version "0.9.2"
@@ -14107,9 +13203,9 @@ octokit-pagination-methods@^1.1.0:
   integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
 
 omit.js@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.2.tgz#91a14f0eba84066dfa015bf30e474c47f30bc858"
-  integrity sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.0.tgz#e013cb86a7517b9cf6f7cfb0ddb4297256a99288"
+  integrity sha512-O1rwbvEfAdhtonTv+v6IQeMOKTi/wlHcXpI3hehyPDlujkjSBQC6Vtzg0mdy+v2KVDmuPf7hAbHlTBM6q1bUHQ==
   dependencies:
     babel-runtime "^6.23.0"
 
@@ -14184,10 +13280,10 @@ opn@^3.0.2:
   dependencies:
     object-assign "^4.0.1"
 
-opn@^5.3.0, opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+opn@^5.1.0, opn@^5.3.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
+  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -14277,11 +13373,11 @@ os-name@^2.0.1:
     win-release "^1.0.0"
 
 os-name@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
-  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9"
+  integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==
   dependencies:
-    macos-release "^2.2.0"
+    macos-release "^2.0.0"
     windows-release "^3.1.0"
 
 os-shim@^0.1.2:
@@ -14321,13 +13417,6 @@ p-defer@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
-p-each-series@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
-  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
-  dependencies:
-    p-reduce "^1.0.0"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -14339,9 +13428,9 @@ p-is-promise@^1.1.0:
   integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
 p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
+  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
 
 p-limit@^1.1.0:
   version "1.3.0"
@@ -14384,22 +13473,15 @@ p-map@^1.1.1, p-map@^1.2.0:
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
+  integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w==
 
 p-pipe@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
   integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
 
-p-queue@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346"
-  integrity sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==
-  dependencies:
-    eventemitter3 "^3.1.0"
-
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
@@ -14418,9 +13500,9 @@ p-try@^1.0.0:
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
 p-waterfall@^1.0.0:
   version "1.0.0"
@@ -14625,10 +13707,10 @@ parse5@4.0.0, parse5@^4.0.0:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
   integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+parseurl@~1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -14704,11 +13786,10 @@ passport-oauth1@1.x.x:
     utils-merge "1.x.x"
 
 passport-oauth2@1.x.x:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.5.0.tgz#64babbb54ac46a4dcab35e7f266ed5294e3c4108"
-  integrity sha512-kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.4.0.tgz#f62f81583cbe12609be7ce6f160b9395a27b86ad"
+  integrity sha1-9i+BWDy+EmCb585vFguTlaJ7hq0=
   dependencies:
-    base64url "3.x.x"
     oauth "0.9.x"
     passport-strategy "1.x.x"
     uid2 "0.0.x"
@@ -14754,7 +13835,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -14868,20 +13949,20 @@ pg-pool@^2.0.4:
   integrity sha512-hod2zYQxM8Gt482q+qONGTYcg/qVcV32VHVPtktbBJs0us3Dj7xibISw0BAAXVMCzt8A/jhfJvpZaxUlqtqs0g==
 
 pg-types@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.0.1.tgz#b8585a37f2a9c7b386747e44574799549e5f4933"
-  integrity sha512-b7y6QM1VF5nOeX9ukMQ0h8a9z89mojrBHXfJeSug4mhL0YpxNBm83ot2TROyoAmX/ZOX3UbwVO4EbH7i1ZZNiw==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.0.0.tgz#038ddc302a0340efcdb46d0581cc7caa2303cbba"
+  integrity sha512-THUD7gQll5tys+5eQ8Rvs7DjHiIC3bLqixk3gMN9Hu8UrCBAOjf35FoI39rTGGc3lM2HU/R+Knpxvd11mCwOMA==
   dependencies:
     pg-int8 "1.0.1"
     postgres-array "~2.0.0"
     postgres-bytea "~1.0.0"
-    postgres-date "~1.0.4"
+    postgres-date "~1.0.0"
     postgres-interval "^1.1.0"
 
 pg@^7.4.0:
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-7.11.0.tgz#a8b9ae9cf19199b7952b72957573d0a9c5e67c0c"
-  integrity sha512-YO4V7vCmEMGoF390LJaFaohWNKaA2ayoQOEZmiHVcAUF+YsRThpf/TaKCgSvsSE7cDm37Q/Cy3Gz41xiX/XjTw==
+  version "7.8.2"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-7.8.2.tgz#d53ffcbbaa789e15e80ffec570603294d90116e8"
+  integrity sha512-5U4fjV43DnQxelkhyPdU3YfUbYVa21bNmreXRCM/gFFw09YxWaitWWITm/u0twUNF5EYOSDhkgyEAocgtpP9JQ==
   dependencies:
     buffer-writer "2.0.0"
     packet-reader "1.0.0"
@@ -14925,7 +14006,7 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.0, pirates@^4.0.1:
+pirates@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
@@ -15014,11 +14095,11 @@ pn@^1.1.0:
   integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
 popper.js@^1.12.9:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
-  integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
+  integrity sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ==
 
-portfinder@^1.0.20:
+portfinder@^1.0.9:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -15095,10 +14176,10 @@ postcss@^6.0.1, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.16:
-  version "7.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
-  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+postcss@^7.0.0, postcss@^7.0.14:
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
+  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -15114,10 +14195,10 @@ postgres-bytea@~1.0.0:
   resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
   integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
 
-postgres-date@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728"
-  integrity sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA==
+postgres-date@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8"
+  integrity sha1-4tiXAu/bJY/52c7g/pG9BpdSV6g=
 
 postgres-interval@^1.1.0:
   version "1.2.0"
@@ -15158,10 +14239,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.9.2:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.0.tgz#d1701ca9b2941864b52f3262b35946d2c9cd88f0"
-  integrity sha512-YsdAD29M0+WY2xXZk3i0PA16olY9qZss+AuODxglXcJ+2ZBwFv+6k5tE8GS8/HKAthaajlS/WqhdgcjumOrPlg==
+prettier@^1.14.3, prettier@^1.9.2:
+  version "1.16.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
+  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
 
 pretty-error@^2.0.2:
   version "2.1.1"
@@ -15187,12 +14268,12 @@ pretty-format@^23.0.1, pretty-format@^23.6.0:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-pretty-format@^24.7.0, pretty-format@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
-  integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
+pretty-format@^24.0.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.5.0.tgz#cc69a0281a62cd7242633fc135d6930cd889822d"
+  integrity sha512-/3RuSghukCf8Riu5Ncve0iI+BzVkbRU5EeUoArKARZobREycuH5O4waxvaNIloEXdb0qwgmEAed5vTpX1HNROQ==
   dependencies:
-    "@jest/types" "^24.8.0"
+    "@jest/types" "^24.5.0"
     ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
@@ -15287,14 +14368,6 @@ prompts@^0.1.9:
     kleur "^2.0.1"
     sisteransi "^0.1.1"
 
-prompts@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz#bf90bc71f6065d255ea2bdc0fe6520485c1b45db"
-  integrity sha512-+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg==
-  dependencies:
-    kleur "^3.0.2"
-    sisteransi "^1.0.0"
-
 promzard@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
@@ -15311,7 +14384,7 @@ prop-types@15.6.1:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-prop-types@15.x, prop-types@^15, prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@15.x, prop-types@^15, prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -15337,13 +14410,13 @@ protoduck@^5.0.1:
   dependencies:
     genfun "^5.0.0"
 
-proxy-addr@~2.0.4, proxy-addr@~2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
-  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+proxy-addr@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.9.0"
+    ipaddr.js "1.8.0"
 
 prr@~1.0.1:
   version "1.0.1"
@@ -15356,9 +14429,9 @@ pseudomap@^1.0.2:
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24, psl@^1.1.28:
-  version "1.1.32"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
-  integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -15432,10 +14505,10 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@6.7.0, qs@^6.5.0, qs@^6.5.1:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+qs@^6.5.0, qs@^6.5.1:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
+  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
 
 query-string@^5.0.1:
   version "5.1.1"
@@ -15446,13 +14519,12 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^6.4.2:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.6.0.tgz#a6b7dfd57ad67e346b143d033df2b1e4cfb6b53a"
-  integrity sha512-Xhvaa80rZzfvI7gYXF6ism5otKTyea90XROstBTBKiWE/tDfnIDbQwkGLguJaQBNweVCW4T9DoTe5eyox0CbZQ==
+query-string@^6.2.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.4.0.tgz#1566c0cec3a2da2d82c222ed3f9e2a921dba5e6a"
+  integrity sha512-Werid2I41/tJTqOGPJ3cC3vwrIh/8ZupBQbp7BSsqXzr+pTin3aMJ/EZb8UEuk7ZO3VqQFvq2qck/ihc6wqIdw==
   dependencies:
     decode-uri-component "^0.2.0"
-    split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
 querystring-es3@^0.2.0:
@@ -15465,10 +14537,10 @@ querystring@0.2.0, querystring@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+querystringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
+  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
 
 quick-lru@^1.0.0:
   version "1.1.0"
@@ -15516,15 +14588,15 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+range-parser@^1.0.3, range-parser@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raven-js@^3.17.0:
-  version "3.27.2"
-  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775"
-  integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ==
+  version "3.27.0"
+  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.0.tgz#9f47c03e17933ce756e189f3669d49c441c1ba6e"
+  integrity sha512-vChdOL+yzecfnGA+B5EhEZkJ3kY3KlMzxEhShKh6Vdtooyl0yZfYNFQfYzgMf2v4pyQa+OTZ5esTxxgOOZDHqw==
 
 raven@^2.1.1:
   version "2.6.4"
@@ -15547,16 +14619,6 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-loader@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
@@ -15572,10 +14634,10 @@ rc-align@^2.4.0, rc-align@^2.4.1:
     prop-types "^15.5.8"
     rc-util "^4.0.4"
 
-rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.5.4, rc-animate@^2.6.0, rc-animate@^2.8.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.8.3.tgz#80d45402f35d3617276fc14810fb8a635fe90dc0"
-  integrity sha512-VPSHJF/PW9zrPVCdQ94/YOI2lFfJVlaiAeQveJN2nlPVMivgvXkuFJyfe42GbZqm+qlnRjH9B4WbY9rCZz9miw==
+rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.6.0.tgz#ca8440d042781af7a1329d84f97ea94794c5ec15"
+  integrity sha512-JXDycchgbOI+7T/VKmFWnAIn042LLScK1fNkmNunb0jz5q5aPGCAybx2bTo7X5t31Jkj9OsxKNb/vZPDPWufCg==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.6"
@@ -15584,7 +14646,7 @@ rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.5.4, rc-animate@^2.6.0, rc-anim
     raf "^3.4.0"
     react-lifecycles-compat "^3.0.4"
 
-rc-animate@^3.0.0-rc.1:
+rc-animate@^3.0.0-rc.1, rc-animate@^3.0.0-rc.4, rc-animate@^3.0.0-rc.5:
   version "3.0.0-rc.6"
   resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.0.0-rc.6.tgz#04288eefa118e0cae214536c8a903ffaac1bc3fb"
   integrity sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==
@@ -15598,10 +14660,10 @@ rc-animate@^3.0.0-rc.1:
     rc-util "^4.5.0"
     react-lifecycles-compat "^3.0.4"
 
-rc-calendar@~9.14.0:
-  version "9.14.5"
-  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.14.5.tgz#77c9d6bfec827d2e325adc770f1cef2fa2e4fc0e"
-  integrity sha512-UCo2O7e3hfOJrV0pkBzpw5vedwyn08YTWvErMTvYbz3nE7rLehXH6i2ABUe1fMCIXoH+YDhQ085SRJgKyA3mZA==
+rc-calendar@~9.10.3:
+  version "9.10.10"
+  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.10.10.tgz#82ba059e98cdd1957e1740ec3eaac407a60e108f"
+  integrity sha512-WFnxpXGzIt2cPCJjFmrju/w2jZHAO9jW3JSDZovaJuBtVciu1p8brL6PSjWCo4flD3jVurL9LO8tJwgajELj2w==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -15612,9 +14674,9 @@ rc-calendar@~9.14.0:
     react-lifecycles-compat "^3.0.4"
 
 rc-cascader@~0.17.0:
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.17.4.tgz#bb38ba3ed0990bfaa5ee547467d85ecc0d152f96"
-  integrity sha512-CeFQJIMzY7x++uPqlx4Xl/cH8iTs8nRoW522+DLb21kdL5kWqKlK+3iHXExoxcAymjwo5ScIiXi+NY4m8Pgq9w==
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.17.1.tgz#914481c3370b5fd8f82e4f9df9b6596dfeda14d5"
+  integrity sha512-JED1iOLpj1+uob+0Asd4zwhhMRp3gLs2iYOY2/0OsdEsPc8Qj6TUwj8+isVtqyXiwGWG3vo8XgO6KCM/i7ZFqQ==
   dependencies:
     array-tree-filter "^2.1.0"
     prop-types "^15.5.8"
@@ -15625,19 +14687,19 @@ rc-cascader@~0.17.0:
     warning "^4.0.1"
 
 rc-checkbox@~2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.7.tgz#ae6785525cf35fa4c62d706c4a1ff7b2b1fcb821"
-  integrity sha512-8L+0XuucUOMUM6F/7qH+hnQpEHPZfW1Um02lUHEVdpZNor5mC0Fj4x8GvTtwcM1pAl5tD3I6lHYD8cE1W8RZJw==
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.6.tgz#5dc00653e5277018c431fec55e38b91c1f976e90"
+  integrity sha512-+VxQbt2Cwe1PxCvwosrAYXT6EQeGwrbLJB2K+IPGCSRPCKnk9zcub/0eW8A4kxjyyfh60PkwsAUZ7qmB31OmRA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
     prop-types "15.x"
-    react-lifecycles-compat "^3.0.4"
+    rc-util "^4.0.4"
 
 rc-collapse@~1.11.1:
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.11.3.tgz#6f0c5ef65e66930c11fe9e7d2483a8a4c362f2d3"
-  integrity sha512-yECQX2iDPWnKcVi3Wz5bomZuJ2u+wv+kGxuKo2GIRz7Brh9jkGQz5ElghCV1jqDGnzy8GIRxxHHSwlSgdxdUog==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.11.1.tgz#4aa0977adbf5229d7db58205646b13905add72ad"
+  integrity sha512-9HA8f7aWE0yabnzfE2v/7IyMb6dTmj052A9cyEMB0aT1sdLESpetMAzT3FkLcPT5fl7YNRkyVZ3zwkC5qMmzmA==
   dependencies:
     classnames "2.x"
     css-animation "1.x"
@@ -15646,19 +14708,19 @@ rc-collapse@~1.11.1:
     react-is "^16.7.0"
     shallowequal "^1.1.0"
 
-rc-dialog@~7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.4.0.tgz#640551235b1f886c7f9a01ce75f87102a70ae1d4"
-  integrity sha512-X2JdDjphlOHPkqXUmmTAhYvcDAgGeM/VFjF5r/AMqjDYIL2xZkvrrOOq7KNxddRAJ0r1V4Ib/MTgCfhhti/aew==
+rc-dialog@~7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.3.0.tgz#d5b8c4bb4f4b2ac38bb5a839ab9e255b8a88b1ac"
+  integrity sha512-YLQHqZuU0cO02LUwhCsCCtvSw24SKLrT4DkNHCNGGcH9YpZP/IOFaH4zVUmXGEQiwyt0D1f3volHthMCKzLzMg==
   dependencies:
     babel-runtime "6.x"
     rc-animate "2.x"
     rc-util "^4.4.0"
 
-rc-drawer@~1.9.3:
-  version "1.9.8"
-  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-1.9.8.tgz#241dae399d6fc3d8ea117e768b27088d97cb5946"
-  integrity sha512-LUOsMdax6yFhCbHpzpPBpf4GlQaLQ1OoBrpyImREghynfVoCs8WT6WUfE3FWWG1PM0Fs8f+yY4uiR7rMFQxl5A==
+rc-drawer@~1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-1.7.7.tgz#b014d1de52457c85c4f3e1f0d647a54031dd260c"
+  integrity sha512-7dESNkClYdWGSdBdwcfeOz6DUCqzrW44QT013fsTBJIiWNLSLgDV5KoHKXG8VTJWU4mBn7M5Lqgyr94CRZcxGA==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -15677,9 +14739,9 @@ rc-dropdown@~2.4.1:
     react-lifecycles-compat "^3.0.2"
 
 rc-editor-core@~0.8.3:
-  version "0.8.10"
-  resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.8.10.tgz#6f215bc5df9c33ffa9f6c5b30ca73a7dabe8ab7c"
-  integrity sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw==
+  version "0.8.9"
+  resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.8.9.tgz#f611952c8eed965e3e348d84ae7be885daeb221c"
+  integrity sha512-fGTkTm96Kil/i9n5a3JwAzJcl2TkfjO1r1WBWf6NIOxXiJXpC3Lajkf3j6E5K7iz5AW0QRaSGnNQFBrwvXKKWA==
   dependencies:
     babel-runtime "^6.26.0"
     classnames "^2.2.5"
@@ -15690,23 +14752,23 @@ rc-editor-core@~0.8.3:
     setimmediate "^1.0.5"
 
 rc-editor-mention@^1.1.7:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz#9f1cab1065f86b01523840321790c2ab12ac5e8b"
-  integrity sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-1.1.12.tgz#896bcb172112f18812e96fdd33ba603c0fc7306a"
+  integrity sha512-cPm2rQ7P+hXaKMsO0ajVv08QlTDcSPVtw8/lVr9D+QzQKRPChCqLw9rVGOa4YGYTeS3gVe8lBfLr8a9JKFk3gA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.5"
     dom-scroll-into-view "^1.2.0"
     draft-js "~0.10.0"
-    immutable "~3.7.4"
+    immutable "^3.7.4"
     prop-types "^15.5.8"
     rc-animate "^2.3.0"
     rc-editor-core "~0.8.3"
 
 rc-form@^2.4.0:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.4.5.tgz#9aa8c844b6fea1da5a03ed5e4f8475bfd0fd6ab7"
-  integrity sha512-qyltQUDSJDFmK2vavNn5GdbA4+P9Xd10kRzOKGZpl4NNAKirKZ4F6MAuY3n5U/k74LIZ3kme1+SEkxNaHuYyTA==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.4.3.tgz#742ed935ed029c6cd9a98ee6837cb37ab3b51e5d"
+  integrity sha512-59KeQat5TU4YzpfXYpFlyQ1/5uFXm0SV7VokRr+i8bPMhimpKpZl5gt0J7dNiKLTsGnkCqBLSL88d9ufPJ+EQQ==
   dependencies:
     async-validator "~1.8.5"
     babel-runtime "6.x"
@@ -15733,33 +14795,21 @@ rc-hammerjs@~0.6.0:
     prop-types "^15.5.9"
 
 rc-input-number@~4.4.0:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.4.5.tgz#81473d2885a6b312e486c4f2ba3f441c1ab88520"
-  integrity sha512-Dt20e8Ylc/N/6oXiPUlwDVdx3fz7W5umUOa4z5pBuWFG7NPlBVXRWkq7+nbnTyaK24UxN67PVpmD3+Omo+QRZQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.4.0.tgz#0ddaaab925a7b0d6c6dbc9eb157ca23e9529b8c7"
+  integrity sha512-AsXLVaQZ7rCU71B8zzP3nviL8/CkFGDcp5kIlpMzBdGIHoLyRnXcxei3itH9PfFSgMBixEnb5hFVoTikFbNWSQ==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.0"
+    is-negative-zero "^2.0.0"
     prop-types "^15.5.7"
     rc-util "^4.5.1"
     rmc-feedback "^2.0.0"
 
-rc-mentions@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-0.3.1.tgz#7c54f8fbd2e203c56ff4e0a0191ce4a2c9a88c86"
-  integrity sha512-fa5dN3IMTahJfAga1nmma9OymK/ZBV/MZfV11h4kjDmCAVETv5EbAlV0mn6Y+JajvXS6n/XFoPUSF+nwK/AeWw==
-  dependencies:
-    "@ant-design/create-react-context" "^0.2.4"
-    babel-runtime "^6.23.0"
-    classnames "^2.2.6"
-    rc-menu "^7.4.22"
-    rc-trigger "^2.6.2"
-    rc-util "^4.6.0"
-    react-lifecycles-compat "^3.0.4"
-
-rc-menu@^7.3.0, rc-menu@^7.4.22, rc-menu@~7.4.12:
-  version "7.4.23"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.23.tgz#e07d497864274076299d7d8a84d14fc86b6bd30d"
-  integrity sha512-d0pUMN0Zr3GCFxNpas8p7AUTeX8viItUOQXku4AsyX82ZzUz79HgGul2Nk17BIFTtLzqdB7/NT6WVb5PAOOILw==
+rc-menu@^7.3.0, rc-menu@~7.4.12:
+  version "7.4.21"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.21.tgz#8a728afd8db81312c913511b6502d9de596d72fd"
+  integrity sha512-TfcwybKLuw2WhEkplYH7iFMGlDbH6KhPcd+gv5J2oLQcgiGeUECzyOWSVaFRRlkpB7g2eNzXbha/AXN/Xyzvnw==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -15784,13 +14834,12 @@ rc-notification@~3.3.0:
     rc-animate "2.x"
     rc-util "^4.0.4"
 
-rc-pagination@~1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.20.1.tgz#d53a0564282a79129588fbd2b74885d7d315f0bb"
-  integrity sha512-EC2sxfKo1+R34fDN8EQgFiJn0Z6SKef4O0FizoqV3IomPczSikoarxL1RrHzqeGNsfg7JbUYaux5fQdmUAlPnA==
+rc-pagination@~1.17.7:
+  version "1.17.8"
+  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.17.8.tgz#65583bebe13fffe4de7f418e1a6c86374ceabceb"
+  integrity sha512-duEV+K/b/nZNGr943+TMCEcY4xWkjAkpKW0Vr7fSR8wQk0DY7aTJC+k+vjl4X2EzEmPXqy85hibzpsO9vydKAw==
   dependencies:
     babel-runtime "6.x"
-    classnames "^2.2.6"
     prop-types "^15.5.7"
     react-lifecycles-compat "^3.0.4"
 
@@ -15812,10 +14861,10 @@ rc-rate@~2.5.0:
     rc-util "^4.3.0"
     react-lifecycles-compat "^3.0.4"
 
-rc-select@~9.1.0:
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-9.1.4.tgz#de6dc0eb5a3d9573fbd9084930e44f09703dbe69"
-  integrity sha512-vW6Zsm9MrzxKI4/GRGTJESONn5TqCE7sXEv3uAz1KFby/eImUo5/ngLUn7V8ey8rs4P72UyMvhUfnNzbrcrvOw==
+rc-select@~9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-9.0.2.tgz#ce0d297db5f8a5c7e8bbc3fc24d9ed5ba648012c"
+  integrity sha512-lwFz/aINmbznQmKvq/jFipc922h+RhA+iKCicxAglTqC4qmXg2REKWzviT5Tk0kqVe4mHcfNX8PyvMEHSmkaLA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
@@ -15831,9 +14880,9 @@ rc-select@~9.1.0:
     warning "^4.0.2"
 
 rc-slider@~8.6.5:
-  version "8.6.12"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.12.tgz#40bb0a6e35f13183f08a3e6aa9a2adbd8dabd39d"
-  integrity sha512-mfYRg7H/smb2MlbqAB+/a34e8PeVqAr7t7hrfSS5+0njuDin4qCwoUHkX1jygGeEwtMAdGJ3buE0wRW988R7Xw==
+  version "8.6.7"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.7.tgz#fa0cbbd0251394c7cda8dd1b62d10bb7e9b1b840"
+  integrity sha512-QIFWMnK1VLc4TtJSZJgjhI6UOhN8eg53EM2La+eRa8rSPZwJT3rIWfZnTZs7OV7zXG/AiLWN4G+oGxuMcEFpsg==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -15843,10 +14892,10 @@ rc-slider@~8.6.5:
     shallowequal "^1.0.1"
     warning "^4.0.3"
 
-rc-steps@~3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.4.1.tgz#7f7d127dd60f9fa92ece27c06035c9319c5cab8e"
-  integrity sha512-zdeOFmFqiXlXCQyHet1qrDDbGKZ7OQTrlzn8DP5N6M/WqN7HaYoUDy1fZ+NY2htL5WzzVFQpDRKzjiOiHaSqgw==
+rc-steps@~3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.3.1.tgz#4877e2897331e3bfdb6b789e88aea78f4f15f732"
+  integrity sha512-LGzmPYS9ETePo+6YbHlFukCdcKppeBZXO49ZxewaC7Cba00q0zrMXlexquZ4fm+9iz0IkpzwgmenvjsVWCmGOw==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.3"
@@ -15872,10 +14921,10 @@ rc-switch@~1.9.0:
     prop-types "^15.5.6"
     react-lifecycles-compat "^3.0.4"
 
-rc-table@~6.5.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.5.1.tgz#b05ef79127e24b353083f8399dedaa9cbfbd16a2"
-  integrity sha512-Tu6+UQmKV5ZKMs3TB52OUb9oF9epyk/wlSQxGa7eP6fBQfKcjNVEfzVEjayh203IWI39xjHw0cgeMuvTnnRHaQ==
+rc-table@~6.4.0:
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.4.3.tgz#c84bdf3f45c123f40790e93a2a241b62f6b1e59f"
+  integrity sha512-4/f7mS87EtNxM2vhIaA7I1J8hPZ5OiOQwmjac7RJTmGOFVA8PJDGwEipeyU/eC9RM7f3v4Lc+a05KCfIbRU4tg==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -15889,9 +14938,9 @@ rc-table@~6.5.0:
     warning "^3.0.0"
 
 rc-tabs@~9.6.0:
-  version "9.6.4"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.6.4.tgz#8910f79f0dbfbcb794a3ff879642311fc7c3eff0"
-  integrity sha512-l4PoDSShNJ6pWGuR1UcUgvee48b3Qu1jgMEaD1hH3Rc+mqysoO7hA9AQ1YywkIy34afGTTejAWDSIFZ0lmg08g==
+  version "9.6.2"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.6.2.tgz#a33652e252ff335874ad3d0c81cb598cbae5f881"
+  integrity sha512-yYyL/94ZW+C2RxIaY85fiNQi7NJ+y2aDpy4A/yr7IWOdgKspgF0G8JPDFf9SS2vlEdeZFL+y+kDFRjxkZuP6UA==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -15901,18 +14950,16 @@ rc-tabs@~9.6.0:
     raf "^3.4.1"
     rc-hammerjs "~0.6.0"
     rc-util "^4.0.4"
-    resize-observer-polyfill "^1.5.1"
     warning "^3.0.0"
 
 rc-time-picker@~3.6.1:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.6.6.tgz#343390ad1a3a06b49848c266d8311b3c572ca0d1"
-  integrity sha512-NVeJuxWjg9eJ0+jcCCT2dxVY2OBYxOrjsgu8ly0lk9IUJ8lwjS6JU+OibHRPJPew3Smfz88dz7GQRdBE7BcnRA==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.6.2.tgz#fd7133390353c6cd29ec09aa6c9711ab59228f1c"
+  integrity sha512-SyGEVXO0ImeG2mz+7fkVmDoVM0+OrX6uYGpKYijNr/lAah7c5p310ZR6fVrblXOl4TpqVnfWR67RMJ3twAyM7w==
   dependencies:
     classnames "2.x"
     moment "2.x"
     prop-types "^15.5.8"
-    raf "^3.4.1"
     rc-trigger "^2.2.0"
 
 rc-tooltip@^3.7.0, rc-tooltip@~3.7.3:
@@ -15924,48 +14971,48 @@ rc-tooltip@^3.7.0, rc-tooltip@~3.7.3:
     prop-types "^15.5.8"
     rc-trigger "^2.2.2"
 
-rc-tree-select@~2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-2.9.1.tgz#d076b8ce5bf432df3fdd8a6a01cdd9c93c8e7399"
-  integrity sha512-AfJQC1ZzaeH+Onmx84TtVLUL2guBZe7exA8XSfj1RRB1doDbYGTtybzpP3CEw/tuSftSRnz+iPt+iaxRTrgXRw==
+rc-tree-select@~2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-2.6.1.tgz#07c03ffa36d9dad3a515514eba37869b411c067a"
+  integrity sha512-ZNGZMKIIwikgqvpbC8YJlv33OeGWlHiVbr42IXYTmVORoO3QpJuZPW95sF/Yhpjk86DgjuuM3HreoLPAOZCVQQ==
   dependencies:
     classnames "^2.2.1"
     dom-scroll-into-view "^1.2.1"
     prop-types "^15.5.8"
     raf "^3.4.0"
-    rc-animate "^2.8.2"
-    rc-tree "~2.0.0"
+    rc-animate "^3.0.0-rc.4"
+    rc-tree "~1.15.0"
     rc-trigger "^3.0.0-rc.2"
     rc-util "^4.5.0"
     react-lifecycles-compat "^3.0.4"
     shallowequal "^1.0.2"
     warning "^4.0.1"
 
-rc-tree@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-2.0.0.tgz#68fc4c9ab696943b279a143619e2ecf05918fb53"
-  integrity sha512-DAT/jsbnFbHqG9Df9OaVG93CAVtTsJVnJiwKX+wqsG8TChpty3s6QX3zJZ+gBgjkq4ikLbu1kuFJtX63EKhSAA==
+rc-tree@~1.14.6:
+  version "1.14.10"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.14.10.tgz#4e0dc70c43da03650b5b776bda1b480a5bea85ee"
+  integrity sha512-iOn7+SpWzM4OQoF/7wJeFiuRpBGJ3ndTe6YVGnfIhsWqDd7S6a7z0anDQcBpPsW/PvisjNDXr4zKchZvx+0iCA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
     prop-types "^15.5.8"
-    rc-animate "^2.6.0"
+    rc-animate "^3.0.0-rc.5"
     rc-util "^4.5.1"
     react-lifecycles-compat "^3.0.4"
     warning "^3.0.0"
 
-rc-tree@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-2.1.0.tgz#ea43c246cf9038fa16be5d08a08c73a38aa6aa61"
-  integrity sha512-DyHG/W9rW8cYfBrqVrZUep5yt30scyBuYvFnGrU32bh1DUj8GKqOcdoRBaIiOBYurmIiJ02rq6BeBbvVtVp0mw==
+rc-tree@~1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.15.2.tgz#a0d6f20fa2bdbe51d829d5ceea74a407b04bfea9"
+  integrity sha512-VPXLA/GdV6U9N8evpl4rmjRsBkw5BoweqWjcVBVwYGzBtonNIFpdc+bnb7TDmd6S3mKOM7mXPbiSr2GKYdj4hA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
     prop-types "^15.5.8"
-    rc-animate "^2.6.0"
+    rc-animate "^3.0.0-rc.5"
     rc-util "^4.5.1"
     react-lifecycles-compat "^3.0.4"
-    warning "^4.0.3"
+    warning "^3.0.0"
 
 rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0, rc-trigger@^2.5.1, rc-trigger@^2.5.4, rc-trigger@^2.6.2:
   version "2.6.2"
@@ -15993,16 +15040,16 @@ rc-trigger@^3.0.0-rc.2:
     rc-util "^4.4.0"
 
 rc-upload@~2.6.0:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.6.7.tgz#835d8dceae2c7bdfb7c81211d6ddf02348097146"
-  integrity sha512-i6roYvM31ue50r0w/MbxOdbbkZHqpJLT29JyjQC2W5i/7w0/lZJkWEmj/DG5WRRJCnVfIiKmXp2437oXnUFNuw==
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.6.3.tgz#99f0f4b948e82c71280a507399ee4bf2fc16b440"
+  integrity sha512-wM57UH/EEqW2/EcWz5nwnU07d4LHDHjBgxRin2Q56TW9JcFVnaQVq/JHycVFumsgSFV5CZfNW8PBROsKT9VFMw==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
     prop-types "^15.5.7"
     warning "4.x"
 
-rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1, rc-util@^4.6.0:
+rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.6.0.tgz#ba33721783192ec4f3afb259e182b04e55deb7f6"
   integrity sha512-rbgrzm1/i8mgfwOI4t1CwWK7wGe+OwX+dNa7PVMgxZYPBADGh86eD4OcJO1UKGeajIMDUUKMluaZxvgraQIOmw==
@@ -16031,16 +15078,16 @@ react-addons-test-utils@^16.0.0-alpha.3:
     object-assign "^4.1.0"
 
 react-art@^16.8.0:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-art/-/react-art-16.8.6.tgz#66707f8bb20a27147bce47402e38eefc9fd863fd"
-  integrity sha512-viR81SLSrUNF8YCLCdhLKKP3hLMxpyJPzozl0Zq6F3ALKGcynBd92MZHVl1oLkMBvCyS4Qf8s5pandJg34YHxA==
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-art/-/react-art-16.8.4.tgz#9c9afa3d8a78ded11c3328f262ba3495d9efa77e"
+  integrity sha512-f8dH7bWrWE9oFXjjvFf4NnhXSJAjPlGxtKsQyzJEHyDGX8iir1zwtuPamPByybezkGw2pxaSukCu+5ShJH8I6g==
   dependencies:
     art "^0.10.1"
     create-react-class "^15.6.2"
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
+    scheduler "^0.13.4"
 
 react-clone-referenced-element@^1.0.1:
   version "1.1.0"
@@ -16083,14 +15130,14 @@ react-devtools-core@3.3.4:
     ws "^3.3.1"
 
 react-dom@^16.8.0:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
-  integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48"
+  integrity sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
+    scheduler "^0.13.4"
 
 react-dropzone@^4.2.3:
   version "4.3.0"
@@ -16100,7 +15147,7 @@ react-dropzone@^4.2.3:
     attr-accept "^1.1.3"
     prop-types "^15.5.7"
 
-react-fast-compare@^2.0.1, react-fast-compare@^2.0.2:
+react-fast-compare@^2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
@@ -16111,19 +15158,19 @@ react-ga@^2.3.5:
   integrity sha512-UmATFaZpEQDO96KFjB5FRLcT6hFcwaxOmAJZnjrSiFN/msTqylq9G+z5Z8TYzN/dbamDTiWf92m6MnXXJkAivQ==
 
 react-helmet@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.1.tgz#16a7192fdd09951f8e0fe22ffccbf9bb3e591ffa"
-  integrity sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.0.tgz#a81811df21313a6d55c5f058c4aeba5d6f3d97a7"
+  integrity sha1-qBgR3yExOm1VxfBYxK66XW89l6c=
   dependencies:
+    deep-equal "^1.0.1"
     object-assign "^4.1.1"
     prop-types "^15.5.4"
-    react-fast-compare "^2.0.2"
     react-side-effect "^1.1.0"
 
 react-hot-loader@^4.1.2, react-hot-loader@^4.3.6:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.9.0.tgz#498e5f76aae28bfd420efdabddf5af156745b4dd"
-  integrity sha512-1N6MWV9++qYWrrs41MRhxATwyx743tr8RpeyL1VOZ54zsU8fOx4slYreHZ8v2BDGVfy+dJ0myJZrJA9/26RlCA==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.8.0.tgz#0b7c7dd9407415e23eb8246fdd28b0b839f54cb6"
+  integrity sha512-HY9F0vITYSVmXhAR6tPkMk240nxmoH8+0rca9iO2B82KVguiCiBJkieS0Wb4CeSIzLWecYx3iOcq8dcbnp0bxA==
   dependencies:
     fast-levenshtein "^2.0.6"
     global "^4.3.0"
@@ -16144,10 +15191,15 @@ react-i18next@^7.6.0:
     html-parse-stringify2 "2.0.1"
     prop-types "^15.6.0"
 
-react-is@^16.3.1, react-is@^16.5.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
-  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
+react-is@^16.3.1, react-is@^16.5.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
+  integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
+
+react-is@^16.6.3:
+  version "16.8.5"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.5.tgz#c54ac229dd66b5afe0de5acbe47647c3da692ff8"
+  integrity sha512-sudt2uq5P/2TznPV4Wtdi+Lnq3yaYW8LfvPKLM9BKD8jJNBkxMVyB0C9/GmVhLw7Jbdmndk/73n7XQGeN9A3QQ==
 
 react-lazy-load@^3.0.13:
   version "3.0.13"
@@ -16165,9 +15217,9 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, react-lifecycles
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
 react-native-animatable@^1.2.4:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.2.tgz#4783ee1a73dc98815aef234ce6b819f80bfe7d80"
-  integrity sha512-rmah3KQ63ft8DxkzFUwJSuZeq+oSYwldoGF4DTOR5WM2WR5wiWLgBAtrAHlI3Di3by323uOR21s+MlqPcHz2Kw==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.1.tgz#f004a7e9de6838d0fbf210d642593cff7affd9ef"
+  integrity sha512-NoE6OAgCrhggWBRV6rBJup5vLAGoTjx168Tku1RZmjUGIdYRAyGesP/MoqvxiNJjhTAgwYx2LT63VTT1xO8g4Q==
   dependencies:
     prop-types "^15.5.10"
 
@@ -16177,11 +15229,9 @@ react-native-branch@2.2.5:
   integrity sha1-QHTdY7SXPmOX2c5Q6XtXx3pRjp0=
 
 react-native-camera-roll-picker@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/react-native-camera-roll-picker/-/react-native-camera-roll-picker-1.3.0.tgz#7d28465da32f66155da7e8ae2ce79b0debeb6743"
-  integrity sha512-D9rG0jjyhcfB5GKvC9dU3wjlRf+1Dj4H/B9sZmBU1CppDBofHjNCTtVQsLQMhXAG6XbHZqHUqqJik0RKCuPZEQ==
-  dependencies:
-    prop-types "^15.6.0"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/react-native-camera-roll-picker/-/react-native-camera-roll-picker-1.2.3.tgz#b117fd3a2b9012dcccee1261a9bc427226b8d6d2"
+  integrity sha1-sRf9OiuQEtzM7hJhqbxCcia41tI=
 
 react-native-collapsible@^0.9.0:
   version "0.9.0"
@@ -16246,9 +15296,9 @@ react-native-elements@^0.19.1:
     prop-types "^15.5.8"
 
 react-native-flip-card@^3.4.1:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/react-native-flip-card/-/react-native-flip-card-3.5.5.tgz#14f13d5178660e5365e7be4ed8dbb6ff289dd1e8"
-  integrity sha512-7PCMfsQ/7K8oN0NVusYNgK4sanY7KLimnPVj5TadkQaSm0zEi7/Jy/rHfnNQQibNBImov6zzQkmcP8ch6RN5Yw==
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/react-native-flip-card/-/react-native-flip-card-3.5.3.tgz#92157d9bf40103d04294c5fc754ce88c2bb94202"
+  integrity sha512-GyLIoit1n1hjFKdayP5vvay6mYS3UOYC6j8bqidTFJJeAxeVSNAVhW+uqlSNOX6bAVhRgXrbSSwa9ZNmZVS79g==
   dependencies:
     prop-types "^15.5.10"
 
@@ -16288,9 +15338,9 @@ react-native-invertible-scroll-view@^1.1.0:
     react-native-scrollable-mixin "^1.0.1"
 
 react-native-iphone-x-helper@^1.0.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz#645e2ffbbb49e80844bb4cbbe34a126fda1e6772"
-  integrity sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796"
+  integrity sha512-xIeTo4s77wwKgBZLVRIZC9tM9/PkXS46Ul76NXmvmixEb3ZwqGdQesR3zRiLMOoIdfOURB6N9bba9po7+x9Bag==
 
 react-native-keyboard-aware-scroll-view@0.8.0:
   version "0.8.0"
@@ -16312,7 +15362,7 @@ react-native-lightbox@^0.7.0:
   dependencies:
     prop-types "^15.5.10"
 
-"react-native-maps@github:expo/react-native-maps#v0.22.1-exp.0":
+react-native-maps@expo/react-native-maps#v0.22.1-exp.0:
   version "0.22.1"
   resolved "https://codeload.github.com/expo/react-native-maps/tar.gz/e6f98ff7272e5d0a7fe974a41f28593af2d77bb2"
 
@@ -16353,10 +15403,10 @@ react-native-reanimated@1.0.0-alpha.11:
   resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.0.0-alpha.11.tgz#b78c839bae878d149561b56a3c750414957ea86d"
   integrity sha512-lDakjY8CXmZiSN71hyc276b3d7M9mKV9ZyYw4W/rTnnJbgBFaqdIxSHq4S4LxSbVqpAoQMfUJqPTE0BKbAz7Aw==
 
-react-native-safe-area-view@^0.14.1:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.5.tgz#eeded66bbeb0807f0a7f5f449e7fb2871f7ecf76"
-  integrity sha512-1NxWK1G0gzwCOuyNV/zf4n18s6FWsiqgwkzU3P9C0Iu8AErjhstK1jUqpRwzLH8+/7hGLsrQedmn+ZbQTOrJPg==
+react-native-safe-area-view@^0.13.0:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.13.1.tgz#834bbb6d22f76a7ff07de56725ee5667ba1386b0"
+  integrity sha512-d/pu2866jApSwLtK/xWAvMXZkNTIQcFrjjbcTATBrmIfFNnu8TNFUcMRFpfJ+eOn5nmx7uGmDvs9B53Ft7JGpQ==
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
@@ -16402,10 +15452,17 @@ react-native-swipeout@^2.2.2:
     prop-types "^15.5.10"
     react-tween-state "^0.1.5"
 
-react-native-tab-view@^1.2.0, react-native-tab-view@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.4.1.tgz#f113cd87485808f0c991abec937f70fa380478b9"
-  integrity sha512-Bke8KkDcDhvB/z0AS7MnQKMD2p6Kwfc1rSKlMOvg9CC5CnClQ2QEnhPSbwegKDYhUkBI92iH/BYy7hNSm5kbUQ==
+react-native-tab-view@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.3.2.tgz#c4e43a538dcacce151938745cea09176beeccbc3"
+  integrity sha512-2U+HxDQdjzExoC6gZ+wUhC8v8JjntppsFVU4v4pRvC/1dkN7DJv1k8UEy9+p7ucEaNrcAzu/j5N09Jf4qG36vw==
+  dependencies:
+    prop-types "^15.6.1"
+
+react-native-tab-view@^1.2.0:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.3.4.tgz#63fc3eb09652651d0ea0e016cff0f3a5e535f4de"
+  integrity sha512-iufNROTPr4+Z/IKijlp5faEANiDBWxhpgx9NSCg3esZ+HN5+UtFwB0xkn4XpNRqCvbzeBkgKMRJL3V6kr5NhWg==
   dependencies:
     prop-types "^15.6.1"
 
@@ -16488,38 +15545,38 @@ react-native-view-shot@2.5.0:
     xmldoc "^0.4.0"
     yargs "^9.0.0"
 
-react-navigation-drawer@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.2.1.tgz#7bd5efeee7d2f611d3ebb0933e0c8e8eb7cafe52"
-  integrity sha512-T2kaBjY2c4/3I6noWFnaf/c18ntNH5DsST38i+pdc2NPxn5Yi5lkK+ZZTeKuHSFD4a7G0jWY9OGf1iRkHWLMAQ==
+react-navigation-drawer@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.3.0.tgz#0bb8022003b36e919e3ae55394a81384f36a14f0"
+  integrity sha512-IDOaMseBeH1PutxRXkqDZTboZ/1mXVd4991JetsE5VmYvedmeh6z1AtBaCJu2rwRdV4U9K2I0xMyjwI0Nijqjg==
   dependencies:
     react-native-tab-view "^1.2.0"
 
-react-navigation-stack@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.4.0.tgz#69cdb029ea4ee5877d7e933b3117dc90bc841eb2"
-  integrity sha512-zEe9wCA0Ot8agarYb//0nSWYW1GM+1R0tY/nydUV0EizeJ27At0EklYVWvYEuYU6C48va6cu8OPL7QD/CcJACw==
+react-navigation-stack@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.1.1.tgz#f9d70db678b50ba581c6aeea1171ad6b1a212693"
+  integrity sha512-x7dpMHIlwMNHNUa91lUXtHoslbD+LcXT9EPagxQJH7JHVECxyo4iDLE1w9yABiJXuVDdNvBeVHYwLk3sjafbTA==
 
-react-navigation-tabs@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.1.4.tgz#00a312250df3c519c60b7815a523ace5ee11163a"
-  integrity sha512-py2hLCRxPwXOzmY1W9XcY1rWXxdK6RGW/aXh56G9gIf8cpHNDhy/bJV4e46/JrVcse3ybFaN0liT09/DM/NdwQ==
+react-navigation-tabs@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.0.2.tgz#cc6c61db0c61054388ef6f726a8ffc183d6095b5"
+  integrity sha512-ffWPVdo+L0GLbQlLAzH7ITYqh9V9NdqT/juj8QtESH5/2yUqfvqTxQoSowvFIrtiIHHFH6tLoQy1sZZciTxmeg==
   dependencies:
     hoist-non-react-statics "^2.5.0"
     prop-types "^15.6.1"
     react-lifecycles-compat "^3.0.4"
-    react-native-tab-view "^1.4.1"
+    react-native-tab-view "^1.0.0"
 
 react-navigation@^3.5.1:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.11.0.tgz#2c82217c452d07d8b9b0929bc7e77e2bcfaf9388"
-  integrity sha512-wlPcDtNiIdPeYxNQ/MN4arY5Xe9EphD2QVpRuvvuPWW+BamF3AJaIy060r3Yz59DODAoWllscabat/yqnih8Tg==
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.5.1.tgz#73e6f71f89d428e3567fbc5241e935bfaff6b62a"
+  integrity sha512-uyKCvk8BaNhpVfjclIbr+lnAbHCPhpvo/RlgigvCJwAtzWZXTgX73PfDxX5n2wCGzhKayzN+MByByXobwTL06g==
   dependencies:
-    "@react-navigation/core" "~3.4.1"
-    "@react-navigation/native" "~3.5.0"
-    react-navigation-drawer "~1.2.1"
-    react-navigation-stack "~1.4.0"
-    react-navigation-tabs "~1.1.4"
+    "@react-navigation/core" "3.2.0"
+    "@react-navigation/native" "~3.3.0"
+    react-navigation-drawer "1.3.0"
+    react-navigation-stack "1.1.1"
+    react-navigation-tabs "1.0.2"
 
 react-popper@^0.8.3:
   version "0.8.3"
@@ -16602,15 +15659,16 @@ react-side-effect@^1.1.0:
     exenv "^1.2.1"
     shallowequal "^1.0.1"
 
-react-slick@~0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.24.0.tgz#1a4e078a82de4e9458255d9ce26aa6f3b17b168b"
-  integrity sha512-Pvo0B74ohumQdYOf0qP+pdQpj9iUbAav7+2qiF3uTc5XeQp/Y/cnIeDBM2tB3txthfSe05jKIqLMJTS6qVvt5g==
+react-slick@~0.23.2:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.23.2.tgz#8d8bdbc77a6678e8ad36f50c32578c7c0f1c54f6"
+  integrity sha512-fM6DXX7+22eOcYE9cgaXUfioZL/Zw6fwS6aPMDBt0kLHl4H4fFNEbp4JsJQdEWMLUNFtUytNcvd9KRml22Tp5w==
   dependencies:
     classnames "^2.2.5"
     enquire.js "^2.1.6"
     json2mq "^0.2.0"
     lodash.debounce "^4.0.8"
+    prettier "^1.14.3"
     resize-observer-polyfill "^1.5.0"
 
 react-test-renderer@16.5.0:
@@ -16624,14 +15682,14 @@ react-test-renderer@16.5.0:
     schedule "^0.3.0"
 
 react-test-renderer@^16.5.0, react-test-renderer@^16.8.1:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
-  integrity sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.4.tgz#abee4c2c3bf967a8892a7b37f77370c5570d5329"
+  integrity sha512-jQ9Tf/ilIGSr55Cz23AZ/7H3ABEdo9oy2zF9nDHZyhLHDSLKuoILxw2ifpBfuuwQvj4LCoqdru9iZf7gwFH28A==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    react-is "^16.8.6"
-    scheduler "^0.13.6"
+    react-is "^16.8.4"
+    scheduler "^0.13.4"
 
 react-testing-library@^3.0.2:
   version "3.1.7"
@@ -16655,11 +15713,11 @@ react-transform-hmr@^1.0.4:
     react-proxy "^1.1.7"
 
 react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
-  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.6.1.tgz#abf4a95e2f13fb9ba83a970a896fedbc5c4856a2"
+  integrity sha512-9DHwCy0aOYEe35frlEN68N9ut/THDQBLnVoQuKTvzF4/s3tk7lqkefCqxK2Nv96fOh6JXk6tQtliygk6tl3bQA==
   dependencies:
-    dom-helpers "^3.4.0"
+    dom-helpers "^3.3.1"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
@@ -16683,14 +15741,14 @@ react@16.5.0:
     schedule "^0.3.0"
 
 react@^16.0.0, react@^16.8.0:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
-  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768"
+  integrity sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
+    scheduler "^0.13.4"
 
 reactstrap@^5.0.0-beta:
   version "5.0.0"
@@ -16721,9 +15779,9 @@ read-cmd-shim@^1.0.1:
     graceful-fs "^4.1.2"
 
 read-last-lines@^1.6.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/read-last-lines/-/read-last-lines-1.7.1.tgz#7a3b2ccd96c67e2d03e1903cc65edd9d08ff6502"
-  integrity sha512-X98EcfP8dUNBg52Mhwdu/WTNI9TaGHnBeximG9Wp/bV6PmILeS9gQ0FHkrqcPIvbbZb/2jjWCzvA2r1HScnEqA==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/read-last-lines/-/read-last-lines-1.7.0.tgz#20ef2f97637b96596d54cc2a97380e11567e158e"
+  integrity sha512-hm2Wd9F9SrfgWrjb4qlfdsg9R4inL+hqH4xC/4BnBBUc9cC3n9HZhWg6RBBirzCkNQt/VtHDbRQbs/lkN1KWiQ==
   dependencies:
     mz "^2.7.0"
 
@@ -16774,14 +15832,6 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -16838,10 +15888,10 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
+  integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -16866,7 +15916,7 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-realpath-native@^1.0.0, realpath-native@^1.1.0:
+realpath-native@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
   integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
@@ -16927,9 +15977,9 @@ redux@^3.6.0:
     symbol-observable "^1.0.3"
 
 regenerate-unicode-properties@^8.0.2:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
-  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"
+  integrity sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==
   dependencies:
     regenerate "^1.4.0"
 
@@ -16948,15 +15998,15 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
-  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
+regenerator-runtime@^0.12.0:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
+  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-transform@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
-  integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
+regenerator-transform@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
+  integrity sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==
   dependencies:
     private "^0.1.6"
 
@@ -16980,10 +16030,10 @@ regex-parser@^2.2.9:
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz#9e66a8f73d89a107616e63b39d4deddfee912b37"
   integrity sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==
 
-regexp-tree@^0.1.6:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.10.tgz#d837816a039c7af8a8d64d7a7c3cf6a1d93450bc"
-  integrity sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==
+regexp-tree@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.5.tgz#7cd71fca17198d04b4176efd79713f2998009397"
+  integrity sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ==
 
 regexpp@^1.0.1:
   version "1.1.0"
@@ -16999,7 +16049,7 @@ regexpu-core@^1.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.5.4:
+regexpu-core@^4.1.3, regexpu-core@^4.2.0:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
   integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
@@ -17012,9 +16062,9 @@ regexpu-core@^4.5.4:
     unicode-match-property-value-ecmascript "^1.1.0"
 
 registry-auth-token@^3.0.1, registry-auth-token@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
-  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
+  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -17155,11 +16205,6 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -17183,7 +16228,7 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
-resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
+resize-observer-polyfill@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
@@ -17248,10 +16293,10 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
-  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
+resolve@1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
   dependencies:
     path-parse "^1.0.6"
 
@@ -17301,7 +16346,7 @@ rework@^1.0.1:
     convert-source-map "^0.3.3"
     css "^2.0.0"
 
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -17338,14 +16383,14 @@ rmc-cascader@~5.0.0:
     rmc-picker "~5.0.0"
 
 rmc-date-picker@^6.0.8:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/rmc-date-picker/-/rmc-date-picker-6.0.9.tgz#7b59538a048002e33f215da9bef2e5e4eda53476"
-  integrity sha512-3XRfkTwBeDjJzQuAHq8VOKBaj8qZaqzbudg1KkvggVEdF67HAzIMEzjXrOH1MR2MmSJ7Z3NxTKJXY8P8WddYSg==
+  version "6.0.8"
+  resolved "https://registry.yarnpkg.com/rmc-date-picker/-/rmc-date-picker-6.0.8.tgz#9aab87b3aa8dc9c5a57349d8f0b05de4e8f4808a"
+  integrity sha512-Llohv+eNzv4pdo0WsOUNIYKOTjVeA3bZzY8J/YUE3bDxIXJEawcjxuB/QDLH2ewveL/cv/EpkYwt+r544CyL9g==
   dependencies:
     babel-runtime "6.x"
     rmc-picker "~5.0.0"
 
-rmc-dialog@^1.0.1, rmc-dialog@^1.1.1:
+rmc-dialog@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/rmc-dialog/-/rmc-dialog-1.1.1.tgz#1d7fbc6b2cad5b0b53fbab71fe29636d76f78217"
   integrity sha512-28aJqtPTX6v13Z/aU1WBy1AFIXkE74PxZXde7JvtEIy9hQDTjH8fqOi822BpzAbXCyNE7jF9iFomy3H2ClsDJA==
@@ -17371,13 +16416,13 @@ rmc-input-number@^1.0.0:
     rmc-feedback "^2.0.0"
 
 rmc-picker@~5.0.0:
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/rmc-picker/-/rmc-picker-5.0.9.tgz#749e847f802261c944996b79717ab017d7a8aede"
-  integrity sha512-loulflyMa6SCReU/LcbWxNvy46gpoW5DEZW78GqkPuAEjwQVQjKtpvq/VzBND8Yt0SBetWUTAZ3AOKTVH3qxcQ==
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/rmc-picker/-/rmc-picker-5.0.5.tgz#2a33244ced1f4e6b10611ff6e0384a5dbbfc566e"
+  integrity sha512-Gycgsf3S6/sluI71WPUx167jdUHYe8kJ5seYxQN1m8z/g401V7bwr/G66d9Az7T44jlxywcQ3w3leuo1E+54Kw==
   dependencies:
     babel-runtime "6.x"
-    classnames "^2.2.6"
-    rmc-dialog "^1.1.1"
+    classnames "^2.2.0"
+    rmc-dialog "^1.0.1"
     rmc-feedback "^2.0.0"
 
 rmc-tabs@~1.2.0:
@@ -17403,11 +16448,6 @@ rsvp@^3.3.3:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
   integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
-rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
-
 rtl-detect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.0.2.tgz#8eca316f5c6563d54df4e406171dd7819adda67f"
@@ -17457,9 +16497,9 @@ rxjs@^5.4.2, rxjs@^5.5.2:
     symbol-observable "1.0.1"
 
 rxjs@^6.3.3, rxjs@^6.4.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
@@ -17506,21 +16546,6 @@ sane@^2.0.0:
   optionalDependencies:
     fsevents "^1.2.3"
 
-sane@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
-  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
-  dependencies:
-    "@cnakazawa/watch" "^1.0.3"
-    anymatch "^2.0.0"
-    capture-exit "^2.0.0"
-    exec-sh "^0.3.2"
-    execa "^1.0.0"
-    fb-watchman "^2.0.0"
-    micromatch "^3.1.4"
-    minimist "^1.1.1"
-    walker "~1.0.5"
-
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -17565,10 +16590,10 @@ schedule@^0.3.0:
   dependencies:
     object-assign "^4.1.1"
 
-scheduler@^0.13.6:
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
-  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
+scheduler@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298"
+  integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -17603,7 +16628,7 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.10.4:
+selfsigned@^1.9.1:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -17616,20 +16641,15 @@ semver-compare@^1.0.0:
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
 "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 semver@4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
   integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
-  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
-
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -17654,25 +16674,6 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.7.2"
-    mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
-
 seq-queue@^0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
@@ -17683,12 +16684,12 @@ serialize-error@^2.1.0:
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
   integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=
 
-serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
-  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
+serialize-javascript@^1.4.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
-serve-index@^1.9.1:
+serve-index@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -17701,7 +16702,7 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.2:
+serve-static@1.13.2, serve-static@^1.13.1:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
@@ -17711,16 +16712,6 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.14.1, serve-static@^1.13.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
-
 session-file-store@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/session-file-store/-/session-file-store-1.2.0.tgz#35a994a7fb0cbf7f784067bf9059939c520b7c44"
@@ -17767,11 +16758,6 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -17889,11 +16875,6 @@ sisteransi@^0.1.1:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
   integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
 
-sisteransi@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
-  integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ==
-
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -18035,9 +17016,9 @@ source-map-support@^0.4.1, source-map-support@^0.4.15, source-map-support@^0.4.2
     source-map "^0.5.6"
 
 source-map-support@^0.5.0, source-map-support@^0.5.11, source-map-support@^0.5.6, source-map-support@^0.5.9, source-map-support@~0.5.10:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
+  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -18118,9 +17099,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
-  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
+  integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -18145,11 +17126,6 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
-
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -18184,11 +17160,11 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sqlite3@^4.0.0:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.8.tgz#81ee60d54befaa52f5421fe6337050bd43d4bb95"
-  integrity sha512-kgwHu4j10KhpCHtx//dejd/tVQot7jc3sw+Sn0vMuKOw0X00Ckyg9VceKgzPyGmmz+zEoYue9tOLriWTvYy0ww==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.6.tgz#e587b583b5acc6cb38d4437dedb2572359c080ad"
+  integrity sha512-EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw==
   dependencies:
-    nan "^2.12.1"
+    nan "~2.10.0"
     node-pre-gyp "^0.11.0"
     request "^2.87.0"
 
@@ -18242,11 +17218,9 @@ stackframe@^1.0.4:
   integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
 
 stacktrace-parser@^0.1.3:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.6.tgz#c17d466d15ba51bee2f753d064f17327a886ff37"
-  integrity sha512-wXhu0Z8YgCGigUtHQq+J7pjXCppk3Um5DwH4qskOKHMlJmKwuuUSm+wDAgU7t4sbVjvuDTNGwOfFKgjMEqSflA==
-  dependencies:
-    type-fest "^0.3.0"
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e"
+  integrity sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4=
 
 staged-git-files@1.1.1:
   version "1.1.1"
@@ -18261,11 +17235,16 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
+
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
@@ -18409,10 +17388,10 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+strip-ansi@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.1.0.tgz#55aaa54e33b4c0649a7338a43437b1887d153ec4"
+  integrity sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==
   dependencies:
     ansi-regex "^4.1.0"
 
@@ -18625,36 +17604,36 @@ tapable@^0.1.8:
   integrity sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
+  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
 
 tar@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
-  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
-    fstream "^1.0.12"
+    fstream "^1.0.2"
     inherits "2"
 
 tar@^4, tar@^4.0.2, tar@^4.4.6, tar@^4.4.8:
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
-  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.5"
-    minizlib "^1.2.1"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
-    yallist "^3.0.3"
+    yallist "^3.0.2"
 
 tarn@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.5.tgz#7be88622e951738b9fa3fb77477309242cdddc2d"
-  integrity sha512-PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.4.tgz#aeeb85964b1afa0bbf381359c1167df237c27b6a"
+  integrity sha512-j4samMCQCP5+6Il9/cxCqBd3x4vvlLeVdoyGex0KixPKl4F8LpNbDSC6NDhjianZgUngElRr9UI1ryZqJDhwGg==
 
 temp-dir@^1.0.0:
   version "1.0.0"
@@ -18690,25 +17669,23 @@ tempfile@^1.1.1:
     uuid "^2.0.1"
 
 terser-webpack-plugin@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
-  integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
   dependencies:
-    cacache "^11.3.2"
+    cacache "^11.0.2"
     find-cache-dir "^2.0.0"
-    is-wsl "^1.1.0"
-    loader-utils "^1.2.3"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.7.0"
+    serialize-javascript "^1.4.0"
     source-map "^0.6.1"
-    terser "^4.0.0"
-    webpack-sources "^1.3.0"
-    worker-farm "^1.7.0"
+    terser "^3.16.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
 
-terser@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
-  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
+terser@^3.16.1:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
   dependencies:
     commander "^2.19.0"
     source-map "~0.6.1"
@@ -18725,26 +17702,11 @@ test-exclude@^4.2.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
-  dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
-
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
-text-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6"
-  integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==
-
 text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -18786,13 +17748,6 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through2@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
-  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
-  dependencies:
-    readable-stream "2 || 3"
-
 through@2, through@2.3.x, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -18827,17 +17782,12 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-tiny-invariant@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.4.tgz#346b5415fd93cb696b0c4e8a96697ff590f92463"
-  integrity sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g==
-
 tiny-queue@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046"
   integrity sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY=
 
-tiny-warning@^1.0.0, tiny-warning@^1.0.2:
+tiny-warning@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28"
   integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==
@@ -18906,16 +17856,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toggle-selection@^1.0.6:
+toggle-selection@^1.0.3:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
 topo@2.x.x:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
@@ -18990,10 +17935,10 @@ trim-right@^1.0.1:
   dependencies:
     glob "^7.1.2"
 
-ts-invariant@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
-  integrity sha512-PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q==
+ts-invariant@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz#3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f"
+  integrity sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==
   dependencies:
     tslib "^1.9.3"
 
@@ -19012,21 +17957,6 @@ ts-jest@^23.10.4:
     semver "^5.5"
     yargs-parser "10.x"
 
-ts-jest@^24.0.2:
-  version "24.0.2"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
-  integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
-  dependencies:
-    bs-logger "0.x"
-    buffer-from "1.x"
-    fast-json-stable-stringify "2.x"
-    json5 "2.x"
-    make-error "1.x"
-    mkdirp "0.x"
-    resolve "1.x"
-    semver "^5.5"
-    yargs-parser "10.x"
-
 ts-loader@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.5.0.tgz#a1ce70b2dc799941fb2197605f0d67874097859b"
@@ -19058,17 +17988,17 @@ tslint-plugin-prettier@^2.0.0:
     tslib "^1.7.1"
 
 tslint@^5.11.0:
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.17.0.tgz#f9f0ce2011d8e90debaa6e9b4975f24cd16852b8"
-  integrity sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e"
+  integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
+    babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
     chalk "^2.3.0"
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.13.1"
+    js-yaml "^3.7.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
@@ -19117,18 +18047,13 @@ type-detect@^4.0.0, type-detect@^4.0.5:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
-
-type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.24"
+    mime-types "~2.1.18"
 
 typedarray@^0.0.6:
   version "0.0.6"
@@ -19136,9 +18061,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.2.4:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
-  integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==
+  version "3.3.3333"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
+  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
 
 ua-parser-js@^0.7.18, ua-parser-js@^0.7.19:
   version "0.7.19"
@@ -19153,20 +18078,12 @@ uglify-es@^3.1.9, uglify-es@^3.3.4:
     commander "~2.13.0"
     source-map "~0.6.1"
 
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
-  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
-  dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
-
-uglify-js@^3.1.4:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
-  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+uglify-js@3.4.x, uglify-js@^3.1.4:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
-    commander "~2.20.0"
+    commander "~2.17.1"
     source-map "~0.6.1"
 
 uglifyjs-webpack-plugin@^1.2.7, uglifyjs-webpack-plugin@^1.3.0:
@@ -19292,10 +18209,10 @@ universal-cookie@^2.2.0:
     cookie "^0.3.1"
     object-assign "^4.1.0"
 
-universal-user-agent@^2.0.0, universal-user-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.1.0.tgz#5abfbcc036a1ba490cb941f8fd68c46d3669e8e4"
-  integrity sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q==
+universal-user-agent@^2.0.0, universal-user-agent@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.3.tgz#9f6f09f9cc33de867bb720d84c08069b14937c6c"
+  integrity sha512-eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g==
   dependencies:
     os-name "^3.0.0"
 
@@ -19327,7 +18244,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.1.0, upath@^1.1.1:
+upath@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -19383,11 +18300,11 @@ url-parse-lax@^3.0.0:
     prepend-http "^2.0.0"
 
 url-parse@^1.4.3:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
+  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
   dependencies:
-    querystringify "^2.1.1"
+    querystringify "^2.0.0"
     requires-port "^1.0.0"
 
 url-template@^2.0.8:
@@ -19481,9 +18398,9 @@ uuid@^2.0.1:
   integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
 
 v8flags@^3.0.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
-  integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.2.tgz#fc5cd0c227428181e6c29b2992e4f8f1da5e0c9f"
+  integrity sha512-MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
@@ -19554,14 +18471,14 @@ vscode-languageserver-types@^3.13.0:
   integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
 
 vscode-nls@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
-  integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
+  integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
 
 vscode-uri@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
-  integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
+  integrity sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
@@ -19580,10 +18497,10 @@ wait-for-expect@^0.5.0:
   resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-0.5.0.tgz#cc935a94c6039967bd7760c9e9cc557f4674887a"
   integrity sha512-C/fK4EhAWGT1z2FATE0X+w0LVrPmaZas9hvVHypnkgdt/vW7U5YkPe4ADGRtkLs+w+8GmoJ/F65vRHyWjBHmaA==
 
-wait-for-expect@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.2.0.tgz#fdab6a26e87d2039101db88bff3d8158e5c3e13f"
-  integrity sha512-EJhKpA+5UHixduMBEGhTFuLuVgQBKWxkFbefOdj2bbk2/OpA5Opsc4aUTGmF+qJ+v3kTGxDRNYwKaT4j6g5n8Q==
+wait-for-expect@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.1.0.tgz#6607375c3f79d32add35cd2c87ce13f351a3d453"
+  integrity sha512-vQDokqxyMyknfX3luCDn16bSaRcOyH6gGuUXMIbxBLeTo6nWuEWYqMTT9a+44FmW8c2m6TRWBdNvBBjA1hwEKg==
 
 wait-on@^3.0.1:
   version "3.2.0"
@@ -19596,7 +18513,7 @@ wait-on@^3.0.1:
     request "^2.88.0"
     rx "^4.1.0"
 
-walker@^1.0.7, walker@~1.0.5:
+walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
@@ -19652,56 +18569,56 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-dev-middleware@^3.1.3, webpack-dev-middleware@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
-  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
+webpack-dev-middleware@^3.1.3, webpack-dev-middleware@^3.5.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
+  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
   dependencies:
     memory-fs "^0.4.1"
-    mime "^2.4.2"
-    range-parser "^1.2.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
 webpack-dev-server@^3.1.5:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.0.tgz#7da016e4f5abec61c7b4af95a264d623bde4df3c"
-  integrity sha512-B/c/aJoyOlhjgeGnxTWeJlDBvIEN/aBI2R6G1DiFHVluEs0KtuxylFcoDR2K6Um/edo4/BvZqMXS2tK+U7fsHw==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
+  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.1.6"
-    compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
+    chokidar "^2.0.0"
+    compression "^1.5.2"
+    connect-history-api-fallback "^1.3.0"
     debug "^4.1.1"
-    del "^4.1.1"
-    express "^4.17.1"
-    html-entities "^1.2.1"
+    del "^3.0.0"
+    express "^4.16.2"
+    html-entities "^1.2.0"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^4.3.0"
+    internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.1"
-    loglevel "^1.6.2"
-    opn "^5.5.0"
-    portfinder "^1.0.20"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
     schema-utils "^1.0.0"
-    selfsigned "^1.10.4"
-    semver "^6.1.1"
-    serve-index "^1.9.1"
+    selfsigned "^1.9.1"
+    semver "^5.6.0"
+    serve-index "^1.7.2"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.1"
+    strip-ansi "^3.0.0"
     supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.7.0"
+    webpack-dev-middleware "^3.5.1"
     webpack-log "^2.0.0"
-    yargs "12.0.5"
+    yargs "12.0.2"
 
 webpack-hot-middleware@^2.22.1, webpack-hot-middleware@^2.22.3:
-  version "2.25.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706"
-  integrity sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA==
+  version "2.24.3"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.24.3.tgz#5bb76259a8fc0d97463ab517640ba91d3382d4a6"
+  integrity sha512-pPlmcdoR2Fn6UhYjAhp1g/IJy1Yc9hD+T6O9mjRcWV2pFbBjIFoJXhP0CoD0xPOhWJuWXuZXGBga9ybbOdzXpg==
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
@@ -19753,9 +18670,9 @@ webpack-virtual-modules@^0.1.10:
     debug "^3.0.0"
 
 webpack@^4.12.0, webpack@^4.29.3:
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e"
-  integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
+  version "4.29.6"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
+  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -19872,11 +18789,11 @@ win-release@^1.0.0:
     semver "^5.0.1"
 
 windows-release@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
-  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
+  integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==
   dependencies:
-    execa "^1.0.0"
+    execa "^0.10.0"
 
 winston@^2.3.1:
   version "2.4.4"
@@ -19900,10 +18817,10 @@ wordwrap@~0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-worker-farm@^1.5.2, worker-farm@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
-  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+worker-farm@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
   dependencies:
     errno "~0.1.7"
 
@@ -19937,15 +18854,6 @@ write-file-atomic@1.3.1:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-write-file-atomic@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
-  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
 write-file-atomic@^1.2.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
@@ -19956,9 +18864,9 @@ write-file-atomic@^1.2.0:
     slide "^1.1.5"
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -20207,6 +19115,11 @@ xpipe@^1.0.5:
   resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf"
   integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98=
 
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
+
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -20227,12 +19140,12 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@10.x:
+yargs-parser@10.x, yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
@@ -20268,13 +19181,13 @@ yargs-parser@^9.0.2:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@12.0.5, yargs@^12.0.1, yargs@^12.0.2:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+yargs@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.2.0"
+    decamelize "^2.0.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -20284,7 +19197,7 @@ yargs@12.0.5, yargs@^12.0.1, yargs@^12.0.2:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+    yargs-parser "^10.1.0"
 
 yargs@^11.0.0:
   version "11.1.0"
@@ -20304,6 +19217,24 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
+yargs@^12.0.1:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"

From e964240898c3a17fd2b1dedcd4ddad306ad5c2d3 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 7 Jun 2019 13:22:13 +0300
Subject: [PATCH 095/104] Move MetaData to look module

---
 .../components => look/client-react}/MetaData.tsx    |  2 +-
 modules/look/client-react/look.ts                    |  1 +
 .../client-react/profile/components/ProfileView.tsx  |  3 +--
 .../signUp/components/ForgotPasswordView.tsx         |  3 +--
 .../client-react/signUp/components/LoginView.tsx     | 12 ++++++++++--
 .../client-react/signUp/components/RegisterView.tsx  |  3 +--
 .../signUp/components/ResetPasswordView.tsx          |  3 +--
 .../client-react/users/components/UserAddView.tsx    |  3 +--
 .../client-react/users/components/UserEditView.tsx   |  3 +--
 modules/user/client-react/users/containers/Users.tsx |  3 +--
 10 files changed, 19 insertions(+), 17 deletions(-)
 rename modules/{user/client-react/components => look/client-react}/MetaData.tsx (89%)

diff --git a/modules/user/client-react/components/MetaData.tsx b/modules/look/client-react/MetaData.tsx
similarity index 89%
rename from modules/user/client-react/components/MetaData.tsx
rename to modules/look/client-react/MetaData.tsx
index b28b4d2..77aa6e3 100644
--- a/modules/user/client-react/components/MetaData.tsx
+++ b/modules/look/client-react/MetaData.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import Helmet from 'react-helmet';
 
-import settings from '../../../../settings';
+import settings from '../../../settings';
 
 interface MetaDataProps {
   title: string;
diff --git a/modules/look/client-react/look.ts b/modules/look/client-react/look.ts
index 7ff71e1..c847448 100644
--- a/modules/look/client-react/look.ts
+++ b/modules/look/client-react/look.ts
@@ -2,3 +2,4 @@ export * from './ui-bootstrap';
 // export * from './ui-antd';
 
 export { default as LayoutCenter } from './LayoutCenter';
+export { default as MetaData } from './MetaData';
diff --git a/modules/user/client-react/profile/components/ProfileView.tsx b/modules/user/client-react/profile/components/ProfileView.tsx
index 2c74fd3..56675c7 100644
--- a/modules/user/client-react/profile/components/ProfileView.tsx
+++ b/modules/user/client-react/profile/components/ProfileView.tsx
@@ -2,10 +2,9 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { LayoutCenter, Card, CardGroup, CardTitle, CardText, PageLayout } from '@restapp/look-client-react';
+import { LayoutCenter, Card, CardGroup, CardTitle, CardText, PageLayout, MetaData } from '@restapp/look-client-react';
 
 import { User } from '../../types';
-import MetaData from '../../components/MetaData';
 
 interface ProfileViewProps {
   currentUserLoading: boolean;
diff --git a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
index c28ede4..076cf97 100644
--- a/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ForgotPasswordView.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
 
-import { LayoutCenter, PageLayout } from '@restapp/look-client-react';
+import { LayoutCenter, PageLayout, MetaData } from '@restapp/look-client-react';
 
 import ForgotPasswordForm from './ForgotPasswordForm';
 import { CommonProps } from '../../types';
 import { ForgotPasswordSubmitProps } from '../types';
-import MetaData from '../../components/MetaData';
 
 interface ForgotPasswordViewProps extends CommonProps {
   onSubmit: (values: ForgotPasswordSubmitProps) => void;
diff --git a/modules/user/client-react/signUp/components/LoginView.tsx b/modules/user/client-react/signUp/components/LoginView.tsx
index 61bb5df..24a9096 100644
--- a/modules/user/client-react/signUp/components/LoginView.tsx
+++ b/modules/user/client-react/signUp/components/LoginView.tsx
@@ -1,12 +1,20 @@
 import React from 'react';
 
-import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText, Button } from '@restapp/look-client-react';
+import {
+  LayoutCenter,
+  PageLayout,
+  Card,
+  CardGroup,
+  CardTitle,
+  CardText,
+  Button,
+  MetaData
+} from '@restapp/look-client-react';
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
 
 import LoginForm from './LoginForm';
 import { LoginSubmitProps } from '../types';
 import { LoginProps } from '../containers/Login';
-import MetaData from '../../components/MetaData';
 
 interface LoginViewProps extends LoginProps {
   onSubmit: (values: LoginSubmitProps) => void;
diff --git a/modules/user/client-react/signUp/components/RegisterView.tsx b/modules/user/client-react/signUp/components/RegisterView.tsx
index 6b64be0..efceff5 100644
--- a/modules/user/client-react/signUp/components/RegisterView.tsx
+++ b/modules/user/client-react/signUp/components/RegisterView.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText } from '@restapp/look-client-react';
+import { LayoutCenter, PageLayout, Card, CardGroup, CardTitle, CardText, MetaData } from '@restapp/look-client-react';
 
 import RegisterForm from './RegisterForm';
 import settings from '../../../../../settings';
 import { RegisterSubmitProps } from '../types';
-import MetaData from '../../components/MetaData';
 
 interface RegisterViewProps {
   t: TranslateFunction;
diff --git a/modules/user/client-react/signUp/components/ResetPasswordView.tsx b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
index 2c4f726..5885828 100644
--- a/modules/user/client-react/signUp/components/ResetPasswordView.tsx
+++ b/modules/user/client-react/signUp/components/ResetPasswordView.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
 
-import { PageLayout } from '@restapp/look-client-react';
+import { PageLayout, MetaData } from '@restapp/look-client-react';
 
 import ResetPasswordForm from './ResetPasswordForm';
 import { CommonProps } from '../../types';
 import { ResetPasswordSubmitProps } from '../types';
-import MetaData from '../../components/MetaData';
 
 interface ResetPasswordViewProps extends CommonProps {
   onSubmit: (values: ResetPasswordSubmitProps) => void;
diff --git a/modules/user/client-react/users/components/UserAddView.tsx b/modules/user/client-react/users/components/UserAddView.tsx
index 68a7e89..7278043 100644
--- a/modules/user/client-react/users/components/UserAddView.tsx
+++ b/modules/user/client-react/users/components/UserAddView.tsx
@@ -2,11 +2,10 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { PageLayout } from '@restapp/look-client-react';
+import { PageLayout, MetaData } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
 import { User } from '../../types';
-import MetaData from '../../components/MetaData';
 
 interface FormValues extends User {
   password: string;
diff --git a/modules/user/client-react/users/components/UserEditView.tsx b/modules/user/client-react/users/components/UserEditView.tsx
index 5fae11e..41dbce0 100644
--- a/modules/user/client-react/users/components/UserEditView.tsx
+++ b/modules/user/client-react/users/components/UserEditView.tsx
@@ -2,10 +2,9 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 
 import { translate, TranslateFunction } from '@restapp/i18n-client-react';
-import { PageLayout } from '@restapp/look-client-react';
+import { PageLayout, MetaData } from '@restapp/look-client-react';
 
 import UserForm from './UserForm';
-import MetaData from '../../components/MetaData';
 import { User } from '../../types';
 
 interface FormValues extends User {
diff --git a/modules/user/client-react/users/containers/Users.tsx b/modules/user/client-react/users/containers/Users.tsx
index f2e3e9a..6b21a1f 100644
--- a/modules/user/client-react/users/containers/Users.tsx
+++ b/modules/user/client-react/users/containers/Users.tsx
@@ -3,12 +3,11 @@ import { compose } from 'redux';
 import { Link } from 'react-router-dom';
 
 import { translate } from '@restapp/i18n-client-react';
-import { Button, PageLayout } from '@restapp/look-client-react';
+import { Button, PageLayout, MetaData } from '@restapp/look-client-react';
 
 import UsersFilterView, { UsersFilterViewProps } from '../components/UsersFilterView';
 import UsersListView, { UsersViewProps } from '../components/UsersListView';
 import { withSortAndFilter, withUsers, withUsersDeleting } from './UserOperations';
-import MetaData from '../../components/MetaData';
 
 interface UsersProps extends UsersViewProps, UsersFilterViewProps {}
 

From 916beb1e09ff921b4d9b9ded6b43627586f1d0df Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 7 Jun 2019 13:30:36 +0300
Subject: [PATCH 096/104] Revert "Fix prew commit"

This reverts commit 83f442b1
---
 .eslintrc.base.json                           |    2 +-
 .travis.yml                                   |    2 +-
 config/app.js                                 |    2 +-
 jest-transform-i18next.js                     |   24 +
 modules/core/client-react-native/App.tsx      |    5 +-
 .../{Intro.jest.tsx => Intro.test.native.tsx} |    0
 modules/core/client-react/Main.tsx            |   12 +-
 modules/core/client-react/RedBox.tsx          |    2 +-
 modules/core/client-react/app.tsx             |    4 +-
 modules/core/common/log.ts                    |    2 +-
 modules/core/server-ts/app.ts                 |    9 +-
 modules/favicon/common/index.js               |   13 +-
 .../client-react-native/ClientModule.ts       |    2 +-
 modules/module/client-react/BaseModule.ts     |    2 +-
 modules/module/client-react/ClientModule.ts   |   32 +-
 modules/module/common/CommonModule.ts         |    2 +-
 modules/module/server-ts/ServerModule.ts      |    2 +-
 ...eNotFound.spec.js => PageNotFound.test.ts} |    3 +-
 modules/testing/client-react/Renderer.tsx     |   21 +-
 modules/testing/server-ts/integrationSetup.ts |   15 +-
 ...{Validation.spec.ts => Validation.test.ts} |   33 +-
 package.json                                  |   12 +-
 packages/client/.zenrc.js                     |    1 -
 packages/client/babel.config.js               |   52 +-
 packages/client/jest.config.js                |   22 +
 packages/client/package.json                  |    6 +-
 packages/client/src/index.ts                  |    4 +-
 packages/common/.zenrc.js                     |   16 +-
 packages/common/package.json                  |    4 +-
 packages/mobile/.zenrc.js                     |    5 -
 packages/mobile/babel.config.js               |   62 +-
 packages/mobile/jest.config.js                |   21 +
 packages/mobile/package.json                  |   42 +-
 packages/mobile/src/index.ts                  |    4 +-
 packages/server/babel.config.js               |   50 +-
 packages/server/jest.config.js                |   27 +
 packages/server/jest.resolver.js              |   28 +
 packages/server/knexfile.js                   |   12 +-
 packages/server/package.json                  |    5 +-
 packages/server/src/__tests__/entry.ts        |    1 -
 packages/server/src/__tests__/jestSetup.js    |   26 +
 packages/server/src/index.ts                  |    4 +-
 tools/babel.config.js                         |   21 +
 tools/cli.js                                  |   11 +-
 .../client-react/__tests__/Module.spec.ts     |    4 +-
 typings/typings.d.ts                          |    5 -
 yarn.lock                                     | 4499 ++++++++++-------
 47 files changed, 3200 insertions(+), 1933 deletions(-)
 create mode 100644 jest-transform-i18next.js
 rename modules/core/client-react-native/__tests__/{Intro.jest.tsx => Intro.test.native.tsx} (100%)
 rename modules/page-not-found/client-react/__tests__/{PageNotFound.spec.js => PageNotFound.test.ts} (82%)
 rename modules/validation/common-react/__tests__/{Validation.spec.ts => Validation.test.ts} (83%)
 create mode 100644 packages/client/jest.config.js
 create mode 100644 packages/mobile/jest.config.js
 create mode 100644 packages/server/jest.config.js
 create mode 100644 packages/server/jest.resolver.js
 delete mode 100644 packages/server/src/__tests__/entry.ts
 create mode 100644 packages/server/src/__tests__/jestSetup.js
 create mode 100644 tools/babel.config.js

diff --git a/.eslintrc.base.json b/.eslintrc.base.json
index 7ba5122..6a4e909 100644
--- a/.eslintrc.base.json
+++ b/.eslintrc.base.json
@@ -31,7 +31,7 @@
     ]
   },
   "env": {
-    "mocha": true
+    "jest": true
   },
   "globals": {
     "fetch": true,
diff --git a/.travis.yml b/.travis.yml
index ae2c30b..ceee7d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '9'
+- '10'
 cache:
   directories:
   - "$HOME/.cache/yarn"
diff --git a/config/app.js b/config/app.js
index 9e590e4..cb8c9b8 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,7 +1,7 @@
 export default {
   name: 'REST App',
   logging: {
-    level: ['production'].indexOf(process.env.NODE_ENV) < 0 ? 'debug' : 'info',
+    level: (process.env.npm_config_argv || '').search(/(watch|start)/) >= 0 ? 'debug' : 'info',
     debugSQL: false
   },
   // Check here for Windows and Mac OS X: https://code.visualstudio.com/docs/editor/command-line#_opening-vs-code-with-urls
diff --git a/jest-transform-i18next.js b/jest-transform-i18next.js
new file mode 100644
index 0000000..4ebc274
--- /dev/null
+++ b/jest-transform-i18next.js
@@ -0,0 +1,24 @@
+const fs = require('fs');
+const path = require('path');
+
+module.exports = {
+  process: function() {
+    const pathname = arguments[1];
+    const dir = path.dirname(pathname);
+    const locales = fs.readdirSync(dir);
+    const result = {};
+    for (const locale of locales) {
+      if (fs.statSync(path.join(dir, locale)).isDirectory()) {
+        const localeFiles = fs.readdirSync(path.join(dir, locale));
+        for (const localeFile of localeFiles) {
+          if (localeFile.indexOf('.json') >= 0) {
+            result[locale] = JSON.parse(fs.readFileSync(path.join(dir, locale, localeFile), 'utf8'));
+          }
+        }
+      }
+    }
+    return {
+      code: `module.exports = ${JSON.stringify(result)};`
+    };
+  }
+};
diff --git a/modules/core/client-react-native/App.tsx b/modules/core/client-react-native/App.tsx
index 2603844..5cabe84 100644
--- a/modules/core/client-react-native/App.tsx
+++ b/modules/core/client-react-native/App.tsx
@@ -3,6 +3,7 @@ import { Provider } from 'react-redux';
 import url from 'url';
 
 import ClientModule from '@restapp/module-client-react-native';
+import settings from '../../../settings';
 import createReduxStore from '../../../packages/common/createReduxStore';
 import log from '../../../packages/common/log';
 const { protocol, pathname, port } = url.parse(__API_URL__);
@@ -30,7 +31,9 @@ export default class Main extends React.Component<MainProps> {
       modules.reduxMiddlewares
     );
 
-    log.info(`Connecting to REST backend at: ${apiUrl}`);
+    if (!__TEST__ || settings.app.logging.level === 'debug') {
+      log.info(`Connecting to REST backend at: ${apiUrl}`);
+    }
 
     return modules.getWrappedRoot(<Provider store={store}>{modules.getDataRoot(modules.router)}</Provider>);
   }
diff --git a/modules/core/client-react-native/__tests__/Intro.jest.tsx b/modules/core/client-react-native/__tests__/Intro.test.native.tsx
similarity index 100%
rename from modules/core/client-react-native/__tests__/Intro.jest.tsx
rename to modules/core/client-react-native/__tests__/Intro.test.native.tsx
diff --git a/modules/core/client-react/Main.tsx b/modules/core/client-react/Main.tsx
index 479b27d..4af0ba8 100644
--- a/modules/core/client-react/Main.tsx
+++ b/modules/core/client-react/Main.tsx
@@ -12,7 +12,9 @@ import createReduxStore, { getStoreReducer } from '../../../packages/common/crea
 import log from '../../../packages/common/log';
 import settings from '../../../settings';
 
-log.info(`Connecting to REST backend at: ${apiUrl}`);
+if (!__TEST__ || settings.app.logging.level === 'debug') {
+  log.info(`Connecting to REST backend at: ${apiUrl}`);
+}
 
 const ref: { modules: ClientModule; store: Store } = {
   modules: null,
@@ -35,9 +37,11 @@ const logPageView = (location: any) => {
   ReactGA.pageview(location.pathname);
 };
 
-// Initialize Google Analytics and send events on each location change
-ReactGA.initialize(settings.analytics.ga.trackingId);
-logPageView(window.location);
+if (!__TEST__) {
+  // Initialize Google Analytics and send events on each location change
+  ReactGA.initialize(settings.analytics.ga.trackingId);
+  logPageView(window.location);
+}
 
 history.listen(location => logPageView(location));
 
diff --git a/modules/core/client-react/RedBox.tsx b/modules/core/client-react/RedBox.tsx
index cb19e6b..91bad2f 100644
--- a/modules/core/client-react/RedBox.tsx
+++ b/modules/core/client-react/RedBox.tsx
@@ -23,7 +23,7 @@ export default class RedBox extends React.Component<RedBoxProps, RedBoxState> {
   }
 
   public componentDidMount() {
-    if (!this.state.mapped) {
+    if (!this.state.mapped && !__TEST__) {
       mapStackTrace(this.props.error.stack, (mappedStack: string[]) => {
         const processStack = __DEV__
           ? fetch('/servdir')
diff --git a/modules/core/client-react/app.tsx b/modules/core/client-react/app.tsx
index 1da39a1..8a36f22 100644
--- a/modules/core/client-react/app.tsx
+++ b/modules/core/client-react/app.tsx
@@ -4,13 +4,13 @@ import ClientModule from '@restapp/module-client-react';
 
 // Virtual module, generated in-memory by @larix/zen, contains count of backend rebuilds
 // tslint:disable-next-line
-import "backend_reload";
+import 'backend_reload';
 
 import log from '../../../packages/common/log';
 import { onAppCreate as onCreateMain, Main, onAppDispose } from './Main';
 
 const renderFunc = __SSR__ ? hydrate : render;
-const root = document.getElementById('root');
+const root = __TEST__ ? document.createElement('div') : document.getElementById('root');
 
 let frontendReloadCount = 0;
 
diff --git a/modules/core/common/log.ts b/modules/core/common/log.ts
index 4b28bb4..4920e80 100644
--- a/modules/core/common/log.ts
+++ b/modules/core/common/log.ts
@@ -9,7 +9,7 @@ const log = minilog(loggerName);
 (log as any).suggest.defaultResult = false;
 (log as any).suggest.clear().allow(loggerName, settings.app.logging.level);
 
-if (__DEV__ && __SERVER__) {
+if (__DEV__ && __SERVER__ && !__TEST__) {
   const consoleLog = global.console.log;
   global.console.log = (...args: any[]) => {
     if (args.length === 1 && typeof args[0] === 'string' && args[0].match(/^\[(HMR|WDS)\]/)) {
diff --git a/modules/core/server-ts/app.ts b/modules/core/server-ts/app.ts
index bfb733d..ae2b214 100644
--- a/modules/core/server-ts/app.ts
+++ b/modules/core/server-ts/app.ts
@@ -14,12 +14,9 @@ const createServerApp = (modules: ServerModule) => {
   // Don't rate limit heroku
   app.enable('trust proxy');
 
-  if (modules.beforeware) {
-    modules.beforeware.forEach(applyBeforeware => applyBeforeware(app, modules.appContext));
-  }
-  if (modules.middleware) {
-    modules.middleware.forEach(applyMiddleware => applyMiddleware(app, modules.appContext));
-  }
+  (modules.beforeware || []).forEach(applyBeforeware => applyBeforeware(app, modules.appContext));
+
+  (modules.middleware || []).forEach(applyMiddleware => applyMiddleware(app, modules.appContext));
 
   if (__DEV__) {
     app.get('/servdir', (req, res) => res.send(process.cwd() + path.sep));
diff --git a/modules/favicon/common/index.js b/modules/favicon/common/index.js
index b1729b3..6557286 100644
--- a/modules/favicon/common/index.js
+++ b/modules/favicon/common/index.js
@@ -1,6 +1,7 @@
-// Favicon.ico should not be hashed, since some browsers expect it to be exactly on /favicon.ico URL
-require('!file-loader?name=[name].[ext]!./assets/favicon.ico'); // eslint-disable-line
-
-// Require all files from assets dir recursively adding them into assets.json
-let req = require.context('!file-loader?name=[hash].[ext]!./assets', true, /.*/);
-req.keys().map(req);
+if (!__TEST__) {
+  // Favicon.ico should not be hashed, since some browsers expect it to be exactly on /favicon.ico URL
+  require('!file-loader?name=[name].[ext]!./assets/favicon.ico'); // eslint-disable-line
+  // Require all files from assets dir recursively addding them into assets.json
+  let req = require.context('!file-loader?name=[hash].[ext]!./assets', true, /.*/);
+  req.keys().map(req);
+}
diff --git a/modules/module/client-react-native/ClientModule.ts b/modules/module/client-react-native/ClientModule.ts
index 56357dd..cd141b6 100644
--- a/modules/module/client-react-native/ClientModule.ts
+++ b/modules/module/client-react-native/ClientModule.ts
@@ -32,7 +32,7 @@ class ClientModule extends BaseModule {
    * @returns item list for React Navigation drawer.
    */
   get drawerItems() {
-    return merge({}, ...this.drawerItem);
+    return merge({}, ...(this.drawerItem || []));
   }
 }
 
diff --git a/modules/module/client-react/BaseModule.ts b/modules/module/client-react/BaseModule.ts
index 8fd9aca..2236c76 100644
--- a/modules/module/client-react/BaseModule.ts
+++ b/modules/module/client-react/BaseModule.ts
@@ -48,7 +48,7 @@ class BaseModule extends CommonModule {
    * @returns Redux reducers
    */
   get reducers() {
-    return merge({}, ...this.reducer);
+    return merge({}, ...(this.reducer || []));
   }
 
   /**
diff --git a/modules/module/client-react/ClientModule.ts b/modules/module/client-react/ClientModule.ts
index f19cb31..d8c9216 100644
--- a/modules/module/client-react/ClientModule.ts
+++ b/modules/module/client-react/ClientModule.ts
@@ -40,8 +40,9 @@ class ClientModule extends BaseModule {
    * @returns client-side React route components list
    */
   get routes() {
-    return this.route.map((component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
-      React.cloneElement(component, { key: component.key || idx + items.length })
+    return (this.route || []).map(
+      (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
+        React.cloneElement(component, { key: component.key || idx + items.length })
     );
   }
 
@@ -49,27 +50,24 @@ class ClientModule extends BaseModule {
    * @returns client-side top left navbar link component list
    */
   get navItems() {
-    return this.navItem
-      ? this.navItem.map((component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
-          React.cloneElement(component, {
-            key: component.key || idx + items.length
-          })
-        )
-      : [];
+    return (this.navItem || []).map(
+      (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
+        React.cloneElement(component, {
+          key: component.key || idx + items.length
+        })
+    );
   }
 
   /**
    * @returns client-side top right navbar link component list
    */
   get navItemsRight() {
-    return this.navItemRight
-      ? this.navItemRight.map(
-          (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
-            React.cloneElement(component, {
-              key: component.key || idx + items.length
-            })
-        )
-      : [];
+    return (this.navItemRight || []).map(
+      (component: React.ReactElement<any>, idx: number, items: Array<React.ReactElement<any>>) =>
+        React.cloneElement(component, {
+          key: component.key || idx + items.length
+        })
+    );
   }
 
   /**
diff --git a/modules/module/common/CommonModule.ts b/modules/module/common/CommonModule.ts
index ea03668..b08a3c4 100644
--- a/modules/module/common/CommonModule.ts
+++ b/modules/module/common/CommonModule.ts
@@ -32,7 +32,7 @@ class CommonModule extends Module {
    * @returns localization for i18next library
    */
   get localizations() {
-    return this.localization;
+    return this.localization || [];
   }
 }
 
diff --git a/modules/module/server-ts/ServerModule.ts b/modules/module/server-ts/ServerModule.ts
index 7d6d8a3..fd07c5e 100644
--- a/modules/module/server-ts/ServerModule.ts
+++ b/modules/module/server-ts/ServerModule.ts
@@ -113,7 +113,7 @@ class ServerModule extends CommonModule {
     const appContext = this.appContext;
     let context = {};
 
-    for (const createContextFunc of this.createContextFunc) {
+    for (const createContextFunc of this.createContextFunc || []) {
       context = merge(context, await createContextFunc({ req, res, appContext }));
     }
     return context;
diff --git a/modules/page-not-found/client-react/__tests__/PageNotFound.spec.js b/modules/page-not-found/client-react/__tests__/PageNotFound.test.ts
similarity index 82%
rename from modules/page-not-found/client-react/__tests__/PageNotFound.spec.js
rename to modules/page-not-found/client-react/__tests__/PageNotFound.test.ts
index 0c34aba..260a5c6 100644
--- a/modules/page-not-found/client-react/__tests__/PageNotFound.spec.js
+++ b/modules/page-not-found/client-react/__tests__/PageNotFound.test.ts
@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import { step } from 'mocha-steps';
 import { Renderer, updateContent } from '@restapp/testing-client-react';
 
 describe('Page not found example UI works', () => {
@@ -7,7 +6,7 @@ describe('Page not found example UI works', () => {
   let app;
   let content;
 
-  step('404 page renders with sample text', () => {
+  it('404 page renders with sample text', () => {
     app = renderer.mount();
     renderer.history.push('/non-existing-page');
     content = updateContent(app.container);
diff --git a/modules/testing/client-react/Renderer.tsx b/modules/testing/client-react/Renderer.tsx
index 9289ebb..c482e24 100644
--- a/modules/testing/client-react/Renderer.tsx
+++ b/modules/testing/client-react/Renderer.tsx
@@ -7,20 +7,21 @@ import { Provider } from 'react-redux';
 
 import ClientModule from '@restapp/module-client-react';
 
-const dom = new JSDOM('<!doctype html><html><body><div id="root"><div></body></html>');
-(global as any).document = dom.window.document;
-(global as any).window = dom.window;
-// Needed by Formik >= 1.x
-(global as any).HTMLButtonElement = dom.window.HTMLButtonElement;
-(global as any).navigator = dom.window.navigator;
+if (!process.env.JEST_WORKER_ID) {
+  const dom = new JSDOM('<!doctype html><html><body><div id="root"><div></body></html>');
+  (global as any).document = dom.window.document;
+  (global as any).window = dom.window;
+  // Needed by Formik >= 1.x
+  (global as any).HTMLButtonElement = dom.window.HTMLButtonElement;
+  (global as any).navigator = dom.window.navigator;
+  process.on('uncaughtException', ex => {
+    console.error('Uncaught error', ex.stack);
+  });
+}
 
 // tslint:disable-next-line
 const { render } = require('./testUtils');
 
-process.on('uncaughtException', ex => {
-  console.error('Uncaught error', ex.stack);
-});
-
 const ref: { clientModules: ClientModule } = { clientModules: null };
 
 export const initRenderer = (clientModules: ClientModule) => {
diff --git a/modules/testing/server-ts/integrationSetup.ts b/modules/testing/server-ts/integrationSetup.ts
index 321de47..fac70c8 100644
--- a/modules/testing/server-ts/integrationSetup.ts
+++ b/modules/testing/server-ts/integrationSetup.ts
@@ -1,34 +1,31 @@
 import chai from 'chai';
 import { Server } from 'http';
 import chaiHttp from 'chai-http';
-import WebSocket from 'ws';
 
 import { serverPromise } from '@restapp/core-server-ts';
-import { populateTestDb } from '@restapp/database-server-ts';
+import { populateTestDb, knex } from '@restapp/database-server-ts';
 
 chai.use(chaiHttp);
 chai.should();
 
 let server: Server;
 
-before(async () => {
+export const setup = async () => {
   if (!global._babelPolyfill) {
     // tslint:disable-next-line
-    require('@babel/register')({ cwd: __dirname + '/../../..', extensions: ['.js', '.ts'], ignore: [ /build\/main.js/ ] });
     require('@babel/polyfill');
   }
   await populateTestDb();
 
   server = await serverPromise;
+};
 
-  global.WebSocket = WebSocket;
-});
-
-after(() => {
+export const cleanup = () => {
+  knex.destroy();
   if (server) {
     server.close();
     delete global.__TEST_SESSION__;
   }
-});
+};
 
 export const getServer = () => server;
diff --git a/modules/validation/common-react/__tests__/Validation.spec.ts b/modules/validation/common-react/__tests__/Validation.test.ts
similarity index 83%
rename from modules/validation/common-react/__tests__/Validation.spec.ts
rename to modules/validation/common-react/__tests__/Validation.test.ts
index dd9b277..fa5ff89 100644
--- a/modules/validation/common-react/__tests__/Validation.spec.ts
+++ b/modules/validation/common-react/__tests__/Validation.test.ts
@@ -1,9 +1,8 @@
 // tslint:disable:no-unused-expression
 import { expect } from 'chai';
-import { step } from 'mocha-steps';
-import i18next from 'i18next';
 import CommonModule from '@restapp/module-common';
 import i18n from '@restapp/i18n-common-react';
+import i18next from 'i18next';
 import validation from '..';
 
 import {
@@ -21,31 +20,33 @@ import {
   Schema
 } from '../validation';
 
-new CommonModule(i18n, validation).createApp(module);
+(async () => {
+  await new CommonModule(i18n, validation).createApp(module);
+})();
 
 describe('Check if validation works', () => {
-  step('Validator "required"  works correctly', () => {
+  it('Validator "required"  works correctly', () => {
     expect(required('')).to.be.a('string');
     expect(required('work')).to.be.equal(undefined);
   });
 
-  step('Validator "match" works correctly', () => {
+  it('Validator "match" works correctly', () => {
     expect(match('name')('Login', { name: 'Login' })).to.be.an('undefined');
     expect(match('name')('Login', { name: 'Loginnn' })).to.be.a('string');
     expect(match('name')('Login', {})).to.be.a('string');
   });
 
-  step('Validator "maxLength" works correctly', () => {
+  it('Validator "maxLength" works correctly', () => {
     expect(maxLength(5)('Login')).to.be.an('undefined');
     expect(maxLength(5)('Loginn')).to.be.a('string');
   });
 
-  step('Validator "maxLength" works correctly', () => {
+  it('Validator "maxLength" works correctly', () => {
     expect(minLength(5)('Login')).to.be.an('undefined');
     expect(minLength(5)('Logi')).to.be.a('string');
   });
 
-  step('Validator "number" works correctly', () => {
+  it('Validator "number" works correctly', () => {
     expect(number(5)).to.be.an('undefined');
     expect(number('5')).to.be.an('undefined');
     expect(number('0')).to.be.an('undefined');
@@ -54,7 +55,7 @@ describe('Check if validation works', () => {
     expect(number('..11')).to.be.a('string');
   });
 
-  step('Validator "string" works correctly', () => {
+  it('Validator "string" works correctly', () => {
     expect(string('string')).to.be.an('undefined');
     expect(string('&*(&*(')).to.be.an('undefined');
     expect(string('!')).to.be.an('undefined');
@@ -65,19 +66,19 @@ describe('Check if validation works', () => {
     expect(string(/^[A-Z0-9._%+-]{2,4}$/)).to.be.a('string');
   });
 
-  step('Validator "minValue" works correctly', () => {
+  it('Validator "minValue" works correctly', () => {
     expect(minValue(5)(5)).to.be.an('undefined');
     expect(minValue(5)(4)).to.be.a('string');
   });
 
-  step('Validator "email" works correctly', () => {
+  it('Validator "email" works correctly', () => {
     expect(email('test@test.ru')).to.be.an('undefined');
     expect(email('te234st@te32st.com')).to.be.an('undefined');
     expect(email('te-234st@te32st.c')).to.be.a('string');
     expect(email('test*@te32st.com')).to.be.a('string');
   });
 
-  step('Validator "alphaNumeric" works correctly', () => {
+  it('Validator "alphaNumeric" works correctly', () => {
     expect(alphaNumeric('d')).to.be.an('undefined');
     expect(alphaNumeric('2')).to.be.an('undefined');
     expect(alphaNumeric('*')).to.be.a('string');
@@ -85,14 +86,14 @@ describe('Check if validation works', () => {
     expect(alphaNumeric('`')).to.be.a('string');
   });
 
-  step('Validator "phoneNumber" works correctly', () => {
+  it('Validator "phoneNumber" works correctly', () => {
     expect(phoneNumber('0639991122')).to.be.an('undefined');
     expect(phoneNumber('+380639991122')).to.be.an('undefined');
     expect(phoneNumber('+38 063 999 11 22')).to.be.an('undefined');
     expect(phoneNumber('639991122')).to.be.a('string');
   });
 
-  step('"validate" should compare the simple input object to input schema ', () => {
+  it('"validate" should compare the simple input object to input schema ', () => {
     let schema: Schema = { name: [required, minLength(5), maxLength(7)] };
     let dataToValidate: { [key: string]: any } = { name: 'login' };
     expect(validate(dataToValidate, schema)).to.be.an('undefined');
@@ -131,7 +132,7 @@ describe('Check if validation works', () => {
       .to.be.a('string');
   });
 
-  step('"validate" should compare the input object with nested objects to the input schema', () => {
+  it('"validate" should compare the input object with nested objects to the input schema', () => {
     let schema: Schema = { name: { firstName: [required, minLength(5), maxLength(8)] } };
     let dataToValidate: { [key: string]: any } = { name: { firstName: 'GoodName' } };
     expect(validate(dataToValidate, schema)).to.be.an('undefined');
@@ -144,7 +145,7 @@ describe('Check if validation works', () => {
       .to.be.a('string');
   });
 
-  step('Should change the language of the validation message from English to Russian and vice versa', () => {
+  it('Should change the language of the validation message from English to Russian and vice versa', () => {
     expect(required('')).to.match(/[a-zA-Z]/g);
     i18next.changeLanguage('ru-RU');
     expect(required('')).to.match(/[а-яА-Я]/g);
diff --git a/package.json b/package.json
index a658d38..85b4a98 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,9 @@
     "rollback": "lerna run --scope=server rollback",
     "exp": "yarn --cwd packages/mobile exp",
     "exp-publish": "lerna run --scope=mobile exp-publish --stream",
-    "jest": "lerna run jest --stream",
     "test": "yarn tests && yarn lint",
-    "tests": "lerna run tests --stream",
-    "tests:watch": "lerna run tests:watch --stream",
+    "tests": "lerna run --parallel tests --stream",
+    "tests:watch": "lerna run --parallel tests:watch --stream",
     "lint": "yarn eslint && yarn tslint",
     "eslint": "eslint --fix --ext js --ext jsx --ext json .",
     "tslint": "tslint --fix -p tsconfig.json -c tslint.json",
@@ -83,10 +82,11 @@
     "@babel/preset-typescript": "^7.0.0",
     "@babel/register": "^7.0.0",
     "@babel/runtime": "^7.0.0",
-    "@larix/zen": "^0.1.9",
+    "@larix/zen": "^0.1.20",
     "autoprefixer": "^9.5.0",
     "babel-core": "^7.0.0-0",
     "babel-eslint": "^8.2.6",
+    "babel-jest": "^24.8.0",
     "babel-plugin-import": "^1.7.0",
     "babel-plugin-styled-components": "^1.3.0",
     "babel-preset-minify": "^0.5.0-alpha.5a128fd5",
@@ -96,6 +96,7 @@
     "eslint-config-airbnb": "^16.1.0",
     "eslint-import-resolver-webpack": "^0.9.0",
     "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jest": "^22.6.4",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-mocha": "^5.0.0",
@@ -110,6 +111,8 @@
     "husky": "^1.1.2",
     "ignore-loader": "^0.1.2",
     "isomorphic-style-loader": "^4.0.0",
+    "jest": "^24.8.0",
+    "jest-transform-stub": "^2.0.0",
     "lerna": "^3.4.0",
     "less": "^3.0.2",
     "less-loader": "^4.1.0",
@@ -127,6 +130,7 @@
     "style-loader": "^0.23.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
+    "ts-jest": "^24.0.2",
     "ts-loader": "^4.5.0",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.5.0",
diff --git a/packages/client/.zenrc.js b/packages/client/.zenrc.js
index b7889a9..b5e8078 100644
--- a/packages/client/.zenrc.js
+++ b/packages/client/.zenrc.js
@@ -3,7 +3,6 @@ const url = require('url');
 const config = {
   builders: {
     web: {
-      openBrowser: true,
       dllExcludes: ['bootstrap'],
       dllBuildDir: '../../.cache/dll',
       defines: {
diff --git a/packages/client/babel.config.js b/packages/client/babel.config.js
index 6dac98d..76434f5 100644
--- a/packages/client/babel.config.js
+++ b/packages/client/babel.config.js
@@ -1,18 +1,38 @@
-module.exports = {
-  compact: false,
-  presets: ['@babel/preset-react', ['@babel/preset-env', { modules: false }]],
-  plugins: [
-    '@babel/plugin-transform-destructuring',
-    '@babel/plugin-transform-regenerator',
-    '@babel/plugin-transform-runtime',
-    ['@babel/plugin-proposal-decorators', { legacy: true }],
-    ['@babel/plugin-proposal-class-properties', { loose: true }],
-    '@babel/plugin-proposal-object-rest-spread',
-    ['styled-components', { ssr: true }]
-  ],
-  env: {
-    production: {
-      compact: true
-    }
+module.exports = api => {
+  const isTest = api.env('test');
+  api.cache(true);
+  if (isTest) {
+    return {
+      compact: false,
+      presets: ['@babel/preset-typescript', '@babel/preset-react', ['@babel/preset-env', { modules: 'commonjs' }]],
+      plugins: [
+        '@babel/plugin-transform-destructuring',
+        '@babel/plugin-transform-regenerator',
+        '@babel/plugin-transform-runtime',
+        ['@babel/plugin-proposal-decorators', { legacy: true }],
+        ['@babel/plugin-proposal-class-properties', { loose: true }],
+        '@babel/plugin-proposal-object-rest-spread',
+        ['styled-components', { ssr: true }]
+      ]
+    };
+  } else {
+    return {
+      compact: false,
+      presets: ['@babel/preset-react', ['@babel/preset-env', { modules: false }]],
+      plugins: [
+        '@babel/plugin-transform-destructuring',
+        '@babel/plugin-transform-regenerator',
+        '@babel/plugin-transform-runtime',
+        ['@babel/plugin-proposal-decorators', { legacy: true }],
+        ['@babel/plugin-proposal-class-properties', { loose: true }],
+        '@babel/plugin-proposal-object-rest-spread',
+        ['styled-components', { ssr: true }]
+      ],
+      env: {
+        production: {
+          compact: true
+        }
+      }
+    };
   }
 };
diff --git a/packages/client/jest.config.js b/packages/client/jest.config.js
new file mode 100644
index 0000000..cdba092
--- /dev/null
+++ b/packages/client/jest.config.js
@@ -0,0 +1,22 @@
+module.exports = {
+  testMatch: ['<rootDir>/modules/**/client-react/**/*.test.[jt]s?(x)'],
+  setupFilesAfterEnv: ['<rootDir>/packages/client/src/__tests__/entry.ts'],
+  moduleFileExtensions: ['js', 'web.js', 'json', 'jsx', 'web.jsx', 'ts', 'tsx', 'node'],
+  rootDir: '../..',
+  transform: {
+    'locales[\\/]index.[jt]s': '<rootDir>/jest-transform-i18next',
+    '.*': 'babel-jest'
+  },
+  moduleNameMapper: {
+    backend_reload: 'jest-transform-stub',
+    '^.+\\.(css|less|scss)$': 'babel-jest'
+  },
+  globals: {
+    __CLIENT__: true,
+    __SERVER__: false,
+    __DEV__: true,
+    __TEST__: true,
+    __SSR__: false,
+    __API_URL__: '/api'
+  }
+};
diff --git a/packages/client/package.json b/packages/client/package.json
index 8375cb5..b223dfd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -10,10 +10,10 @@
   "scripts": {
     "build": "cross-env NODE_ENV=production zen build",
     "clean": "rimraf build .tmp",
-    "tests": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace \"src/**/*.spec.*\" \"../../modules/**/client-react/**/*.spec.*\"",
-    "tests:watch": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace --watch \"src/**/*.spec.*\" \"../../modules/**/client-react/**/*.spec.*\"",
+    "tests": "jest",
+    "tests:watch": "jest --watch",
     "test": "yarn tests && yarn lint",
-    "eslint": "eslint --fix --ext js --ext jsx --ext json src",
+    "eslint": "eslint --fix --ext js --ext jsx --ext json .",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
     "lint": "yarn eslint && yarn tslint",
     "watch": "zen -v watch",
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 14824c0..dcdb9e3 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,5 +1,7 @@
 import modules from './modules';
 
-modules.createApp(module);
+(async () => {
+  await modules.createApp(module);
+})();
 
 export default modules;
diff --git a/packages/common/.zenrc.js b/packages/common/.zenrc.js
index cf45d00..8db975e 100644
--- a/packages/common/.zenrc.js
+++ b/packages/common/.zenrc.js
@@ -1,19 +1,7 @@
 const config = {
-  builders: {
-    test: {
-      stack: ['server'],
-      roles: ['test'],
-      defines: {
-        __DEV__: false,
-        __API_URL__: '"/api"',
-        __TEST__: true
-      }
-    }
-  },
   options: {
-    cache: '../../.cache',
-    stack: ['ts', 'webpack', 'i18next'],
+    cache: '../../.cache'
   }
 };
 
-module.exports = config;
\ No newline at end of file
+module.exports = config;
diff --git a/packages/common/package.json b/packages/common/package.json
index 7629d26..1aae558 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -5,9 +5,7 @@
   "scripts": {
     "eslint": "eslint --fix --ext js --ext jsx --ext json .",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
-    "lint": "yarn eslint && yarn tslint",
-    "tests": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --full-trace \"../../modules/**/common-react/**/*.spec.*\"",
-    "tests:watch": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --full-trace --watch \"../../modules/**/common-react/**/*.spec.*\""
+    "lint": "yarn eslint && yarn tslint"
   },
   "dependencies": {
     "i18next": "^11.2.3",
diff --git a/packages/mobile/.zenrc.js b/packages/mobile/.zenrc.js
index ffcfb00..2c099e0 100644
--- a/packages/mobile/.zenrc.js
+++ b/packages/mobile/.zenrc.js
@@ -4,7 +4,6 @@ const config = {
   builders: {
     android: {
       buildDir: 'build/android',
-      dllBuildDir: '../../.cache/dll',
       defines: {
         __CLIENT__: true
       },
@@ -12,7 +11,6 @@ const config = {
     },
     ios: {
       buildDir: 'build/ios',
-      dllBuildDir: '../../.cache/dll',
       defines: {
         __CLIENT__: true
       },
@@ -21,7 +19,6 @@ const config = {
   },
   options: {
     cache: '../../.cache',
-    webpackDll: true,
     defines: {
       __DEV__: process.env.NODE_ENV !== 'production',
       __API_URL__: '"http://localhost:8080/api"',
@@ -35,8 +32,6 @@ if (process.env.NODE_ENV === 'production') {
   config.builders.ios.enabled = true;
   config.options.defines.__API_URL__ = '"https://restapp.herokuapp.com/api"';
   config.options.defines.__WEBSITE_URL__ = '"https://restapp.herokuapp.com"';
-  // Generating source maps for production will slowdown compilation for roughly 25%
-  config.options.sourceMap = false;
 }
 
 const extraDefines = {};
diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js
index 34ddbe4..055ef22 100644
--- a/packages/mobile/babel.config.js
+++ b/packages/mobile/babel.config.js
@@ -1,23 +1,47 @@
-module.exports = {
-  compact: false,
-  presets: ['module:metro-react-native-babel-preset'],
-  plugins: [
-    'haul/src/utils/fixRequireIssues',
-    ['styled-components', { ssr: true }],
-    ['import', { libraryName: 'antd-mobile' }],
-    [
-      'babel-plugin-module-resolver',
-      {
-        alias: {
-          'react-native-vector-icons': '@expo/vector-icons'
+module.exports = api => {
+  const isTest = api.env('test');
+  api.cache(true);
+  if (isTest) {
+    return {
+      compact: false,
+      presets: [
+        '@babel/preset-typescript',
+        'module:metro-react-native-babel-preset',
+        ['@babel/preset-env', { modules: 'commonjs' }]
+      ],
+      plugins: [
+        '@babel/plugin-transform-destructuring',
+        '@babel/plugin-transform-regenerator',
+        '@babel/plugin-transform-runtime',
+        ['@babel/plugin-proposal-decorators', { legacy: true }],
+        ['@babel/plugin-proposal-class-properties', { loose: true }],
+        '@babel/plugin-proposal-object-rest-spread',
+        ['styled-components', { ssr: true }]
+      ]
+    };
+  } else {
+    return {
+      compact: false,
+      presets: ['module:metro-react-native-babel-preset'],
+      plugins: [
+        'haul/src/utils/fixRequireIssues',
+        ['styled-components', { ssr: true }],
+        ['import', { libraryName: 'antd-mobile' }],
+        [
+          'babel-plugin-module-resolver',
+          {
+            alias: {
+              'react-native-vector-icons': '@expo/vector-icons'
+            }
+          }
+        ],
+        ['@babel/plugin-proposal-decorators', { legacy: true }]
+      ],
+      env: {
+        production: {
+          compact: true
         }
       }
-    ],
-    ['@babel/plugin-proposal-decorators', { legacy: true }]
-  ],
-  env: {
-    production: {
-      compact: true
-    }
+    };
   }
 };
diff --git a/packages/mobile/jest.config.js b/packages/mobile/jest.config.js
new file mode 100644
index 0000000..0efe50a
--- /dev/null
+++ b/packages/mobile/jest.config.js
@@ -0,0 +1,21 @@
+module.exports = {
+  verbose: true,
+  preset: 'jest-expo',
+  testPathIgnorePatterns: ['node_modules', '.history'],
+  testMatch: ['<rootDir>/modules/**/client-react/**/*.test.native.[jt]s?(x)'],
+  rootDir: '../..',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  modulePathIgnorePatterns: [
+    '<rootDir>/node_modules/react-native/Libraries/react-native/',
+    '<rootDir>/node_modules/react-native/Libraries/vendor/core/whatwg-fetch.js',
+    '<rootDir>/node_modules/react-native/jest/',
+    '<rootDir>/node_modules/haul/',
+    '<rootDir>/packages/mobile/.expo/',
+    '<rootDir>/packages/mobile/node_modules/'
+  ],
+  globals: {
+    __CLIENT__: true,
+    __SERVER__: false,
+    __TEST__: true
+  }
+};
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index 8751d3e..7bb2993 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -13,8 +13,8 @@
     "exp": "cross-env NODE_ENV=production zen exp",
     "exp-login": "cross-env NODE_ENV=production zen exp login -u $EXP_USERNAME -p $EXP_PASSWORD --non-interactive",
     "exp-publish": "yarn exp-login && yarn exp -- p --non-interactive",
-    "jest": "cross-env NODE_ENV=jest PORT=7070 jest",
-    "jest:watch": "cross-env NODE_ENV=jest PORT=7070 jest --watch",
+    "tests": "jest",
+    "tests:watch": "jest --watch",
     "test": "yarn tests && yarn lint",
     "eslint": "eslint --fix --ext js --ext jsx --ext json src",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
@@ -51,7 +51,7 @@
     "filesize": "^3.5.11",
     "i18next": "^11.2.3",
     "immutability-helper": "^2.6.2",
-    "jest-expo": "^31.0.0",
+    "jest-expo": "^32.0.0",
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
     "native-base": "^2.3.5",
@@ -74,7 +74,7 @@
   "devDependencies": {
     "@types/expo": "^30.0.0",
     "@types/expo__vector-icons": "^6.2.3",
-    "@types/jest": "^23.3.1",
+    "@types/jest": "^24.0.13",
     "@types/react-native-keyboard-spacer": "^0.4.1",
     "@types/react-test-renderer": "^16.0.2",
     "apollo-utilities": "^1.0.3",
@@ -106,39 +106,5 @@
   },
   "peerDependencies": {
     "@larix/zen": "^0.1.0"
-  },
-  "jest": {
-    "verbose": true,
-    "preset": "jest-expo",
-    "testPathIgnorePatterns": [
-      "node_modules",
-      ".history"
-    ],
-    "testRegex": ".*/__tests__/.*\\.jest\\.(js|jsx|ts|tsx)$",
-    "rootDir": "../../modules",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "jsx"
-    ],
-    "transform": {
-      "^.+\\.jsx?$": "babel-jest",
-      "^.+\\.tsx?$": "ts-jest"
-    },
-    "modulePathIgnorePatterns": [
-      "<rootDir>/node_modules/react-native/Libraries/react-native/",
-      "<rootDir>/node_modules/react-native/jest/",
-      "<rootDir>/node_modules/haul/",
-      "<rootDir>/packages/mobile/.expo/"
-    ],
-    "globals": {
-      "__CLIENT__": true,
-      "__SERVER__": false,
-      "__TEST__": true,
-      "ts-jest": {
-        "tsConfig": "tsconfig.jest.json"
-      }
-    }
   }
 }
diff --git a/packages/mobile/src/index.ts b/packages/mobile/src/index.ts
index d61c589..2ab9843 100644
--- a/packages/mobile/src/index.ts
+++ b/packages/mobile/src/index.ts
@@ -1,7 +1,9 @@
 try {
   // tslint:disable-next-line
   const modules = require('./modules').default;
-  modules.createApp(module);
+  (async () => {
+    await modules.createApp(module);
+  })();
 } catch (e) {
   if (typeof ErrorUtils !== 'undefined') {
     (ErrorUtils as any).reportFatalError(e);
diff --git a/packages/server/babel.config.js b/packages/server/babel.config.js
index d073718..072a1a6 100644
--- a/packages/server/babel.config.js
+++ b/packages/server/babel.config.js
@@ -1,19 +1,35 @@
-module.exports = {
-  compact: false,
-  presets: ['@babel/preset-react', ['@babel/preset-env', { modules: false }]],
-  plugins: [
-    '@babel/plugin-transform-destructuring',
-    '@babel/plugin-transform-regenerator',
-    '@babel/plugin-transform-runtime',
-    ['@babel/plugin-proposal-decorators', { legacy: true }],
-    '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-object-rest-spread',
-    ['styled-components', { ssr: true }],
-    ['import', { libraryName: 'antd-mobile' }]
-  ],
-  env: {
-    production: {
-      compact: true
-    }
+module.exports = api => {
+  const isBabelRegister = api.caller(caller => caller.name === '@babel/register');
+  const isTest = api.env('test');
+  api.cache(true);
+  if (isTest || isBabelRegister) {
+    return {
+      presets: [
+        '@babel/preset-typescript',
+        '@babel/preset-react',
+        ['@babel/preset-env', { targets: { node: true }, modules: 'commonjs' }]
+      ],
+      plugins: [['@babel/plugin-proposal-class-properties', { loose: true }]]
+    };
+  } else {
+    return {
+      compact: false,
+      presets: ['@babel/preset-react', ['@babel/preset-env', { targets: { node: true }, modules: false }]],
+      plugins: [
+        '@babel/plugin-transform-destructuring',
+        '@babel/plugin-transform-regenerator',
+        '@babel/plugin-transform-runtime',
+        ['@babel/plugin-proposal-decorators', { legacy: true }],
+        '@babel/plugin-proposal-class-properties',
+        '@babel/plugin-proposal-object-rest-spread',
+        ['styled-components', { ssr: true }],
+        ['import', { libraryName: 'antd-mobile' }]
+      ],
+      env: {
+        production: {
+          compact: true
+        }
+      }
+    };
   }
 };
diff --git a/packages/server/jest.config.js b/packages/server/jest.config.js
new file mode 100644
index 0000000..e5a7d2f
--- /dev/null
+++ b/packages/server/jest.config.js
@@ -0,0 +1,27 @@
+module.exports = {
+  testMatch: [
+    '<rootDir>/modules/**/server-ts/**/*.test.[jt]s?(x)',
+    '<rootDir>/modules/**/common-react/**/*.test.[jt]s?(x)'
+  ],
+  globalSetup: '<rootDir>/packages/server/src/__tests__/jestSetup.js',
+  rootDir: '../..',
+  resolver: './packages/server/jest.resolver',
+  transform: {
+    'locales[\\/]index.[jt]s': '<rootDir>/jest-transform-i18next',
+    '.*': 'babel-jest'
+  },
+  moduleNameMapper: {
+    '^.+\\.(css|less|scss)$': 'babel-jest'
+  },
+  globals: {
+    __CLIENT__: false,
+    __SERVER__: true,
+    __DEV__: true,
+    __TEST__: true,
+    __SSR__: false,
+    __FRONTEND_BUILD_DIR__: __dirname + '/../client/build',
+    __DLL_BUILD_DIR__: __dirname + '/../../.cache/dll',
+    __API_URL__: '/api'
+  },
+  testEnvironment: 'node'
+};
diff --git a/packages/server/jest.resolver.js b/packages/server/jest.resolver.js
new file mode 100644
index 0000000..0126e56
--- /dev/null
+++ b/packages/server/jest.resolver.js
@@ -0,0 +1,28 @@
+const fs = require('fs');
+const glob = require('glob');
+const path = require('path');
+
+const modulesDir = __dirname + '/../../modules';
+const virtualDirs = {
+  [path.resolve('/module-migrations')]: glob.sync(path.join(modulesDir, '**/migrations')),
+  [path.resolve('/module-seeds')]: glob.sync(path.join(modulesDir, '**/seeds'))
+};
+const virtualFiles = {};
+
+for (const virtualDir of Object.keys(virtualDirs)) {
+  const realDirs = virtualDirs[virtualDir];
+  for (const realDir of realDirs) {
+    const realFiles = fs.readdirSync(realDir);
+    for (const file of realFiles) {
+      virtualFiles[path.join(virtualDir, file).replace(/\\/g, '/')] = path.join(realDir, file);
+    }
+  }
+}
+
+module.exports = (modPath, options) => {
+  if (modPath.indexOf('module-migrations') >= 0 || modPath.indexOf('module-seeds') >= 0) {
+    return virtualFiles[modPath];
+  } else {
+    return options.defaultResolver(modPath, options);
+  }
+};
diff --git a/packages/server/knexfile.js b/packages/server/knexfile.js
index 5a3c5ba..9b8f0cd 100644
--- a/packages/server/knexfile.js
+++ b/packages/server/knexfile.js
@@ -1,5 +1,15 @@
+const path = require('path');
+
+const root = path.resolve(__dirname + '/../..');
+
+require('@babel/register')({
+  root,
+  cwd: root,
+  configFile: root + '/packages/server/babel.config.js',
+  extensions: ['.js', '.jsx', '.ts', '.tsx']
+});
+
 require('dotenv/config');
-require('@babel/register')({ cwd: __dirname + '/../..', extensions: ['.js', '.ts'] });
 require('@babel/polyfill');
 
 module.exports = require('@restapp/database-server-ts/knexdata');
diff --git a/packages/server/package.json b/packages/server/package.json
index 9f62278..c068b48 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -11,9 +11,9 @@
     "build": "cross-env NODE_ENV=production zen build",
     "clean": "rimraf build .tmp",
     "start": "node --harmony build",
-    "tests": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace \"src/**/*.spec.*\" \"../../modules/**/server-ts/**/*.spec.*\"",
-    "tests:watch": "cross-env NODE_ENV=test PORT=7070 zen test -t 10000 --include src/__tests__/entry.ts --full-trace --watch \"src/**/*.spec.*\" \"../../modules/**/server-ts/**/*.spec.*\"",
     "test": "yarn tests && yarn lint",
+    "tests": "cross-env PORT=7070 jest --forceExit",
+    "tests:watch": "cross-env PORT=7070 jest --watch",
     "eslint": "eslint --fix --ext js --ext jsx --ext json src",
     "tslint": "tslint --fix -p tsconfig.json -c ../../tslint.json",
     "lint": "yarn eslint && yarn tslint",
@@ -66,6 +66,7 @@
     "express": "^4.16.2",
     "express-session": "^1.16.1",
     "filesize": "^3.5.11",
+    "glob": "^7.1.4",
     "humps": "^2.0.1",
     "i18next": "^11.3.3",
     "i18next-express-middleware": "^1.1.1",
diff --git a/packages/server/src/__tests__/entry.ts b/packages/server/src/__tests__/entry.ts
deleted file mode 100644
index bdeb683..0000000
--- a/packages/server/src/__tests__/entry.ts
+++ /dev/null
@@ -1 +0,0 @@
-import '..';
diff --git a/packages/server/src/__tests__/jestSetup.js b/packages/server/src/__tests__/jestSetup.js
new file mode 100644
index 0000000..3f5895a
--- /dev/null
+++ b/packages/server/src/__tests__/jestSetup.js
@@ -0,0 +1,26 @@
+const root = __dirname + '/../../../..';
+
+require('@babel/register')({
+  root,
+  cwd: root,
+  configFile: root + '/packages/server/babel.config.js',
+  extensions: ['.js', '.jsx', '.ts', '.tsx']
+});
+
+require.extensions['.scss'] = () => {};
+
+Object.assign(global, {
+  __CLIENT__: false,
+  __SERVER__: true,
+  __DEV__: true,
+  __TEST__: true,
+  __SSR__: false,
+  __FRONTEND_BUILD_DIR__: __dirname + '/../client/build',
+  __DLL_BUILD_DIR__: __dirname + '/../../.cache/dll',
+  __API_URL__: '/api'
+});
+
+const { setup } = require('@restapp/testing-server-ts');
+require('..');
+
+module.exports = setup;
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 406e9ed..8f89200 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -1,6 +1,8 @@
 import 'dotenv/config';
 import modules from './modules';
 
-modules.createApp(module);
+(async () => {
+  await modules.createApp(module);
+})();
 
 export default modules;
diff --git a/tools/babel.config.js b/tools/babel.config.js
new file mode 100644
index 0000000..563c2d8
--- /dev/null
+++ b/tools/babel.config.js
@@ -0,0 +1,21 @@
+module.exports = api => {
+  api.cache(true);
+  return {
+    compact: false,
+    presets: ['@babel/preset-typescript', '@babel/preset-react', ['@babel/preset-env', { modules: 'commonjs' }]],
+    plugins: [
+      '@babel/plugin-transform-modules-commonjs',
+      '@babel/plugin-transform-destructuring',
+      '@babel/plugin-transform-regenerator',
+      '@babel/plugin-transform-runtime',
+      ['@babel/plugin-proposal-decorators', { legacy: true }],
+      ['@babel/plugin-proposal-class-properties', { loose: true }],
+      '@babel/plugin-proposal-object-rest-spread'
+    ],
+    env: {
+      production: {
+        compact: true
+      }
+    }
+  };
+};
diff --git a/tools/cli.js b/tools/cli.js
index 128accd..8bd0bbd 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -1,5 +1,12 @@
-require('@babel/register')({ cwd: __dirname + '/..' });
-require('@babel/polyfill');
+const root = __dirname + '/..';
+
+require('@babel/register')({
+  root,
+  cwd: root,
+  configFile: root + '/tools/babel.config.js',
+  extensions: ['.js', '.jsx', '.ts', '.tsx']
+});
+
 const prog = require('caporal');
 
 const addModuleCommand = require('./cli/commands/addModule');
diff --git a/tools/templates/module/client-react/__tests__/Module.spec.ts b/tools/templates/module/client-react/__tests__/Module.spec.ts
index cb749ef..c30b8fa 100644
--- a/tools/templates/module/client-react/__tests__/Module.spec.ts
+++ b/tools/templates/module/client-react/__tests__/Module.spec.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { step } from 'mocha-steps';
 
-import Renderer from '../../../../packages/client/src/testHelpers/Renderer';
-import { updateContent } from '../../../../packages/client/src/testHelpers/testUtils';
+import Renderer from '../../../../../packages/client/src/testHelpers/Renderer';
+import { updateContent } from '@restapp/testing-client-react';
 
 describe('$Module$ UI works', () => {
   const renderer = new Renderer({});
diff --git a/typings/typings.d.ts b/typings/typings.d.ts
index 5c0af6b..5c40a44 100644
--- a/typings/typings.d.ts
+++ b/typings/typings.d.ts
@@ -9,8 +9,3 @@ declare module '*.scss' {
   const value: any;
   export = value;
 }
-
-declare module 'mocha-steps' {
-  const step: Mocha.TestFunction;
-  const xstep: Mocha.TestFunction;
-}
diff --git a/yarn.lock b/yarn.lock
index fb24521..055c1b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,35 +12,50 @@
     loader-utils "^1.1.0"
     lodash "^4.17.11"
 
-"@ant-design/icons-react@~1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons-react/-/icons-react-1.1.2.tgz#df25c4560864f8a3b687b305c3238daff048ed72"
-  integrity sha512-7Fgt9d8ABgxrhZxsFjHk/VpPcxodQJJhbJO8Lsh7u58pGN4NoxxW++92naeGTXCyqZsbDPBReP+SC0bdBtbsGQ==
+"@ant-design/colors@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-3.1.0.tgz#b7e2cc61a4e86d3d109494034acfb1222dacaa3c"
+  integrity sha512-Td7g1P53sNFyT4Gya6836e70TrhoVZ+HjZs6mpWIHrxl4/VqsjjOyzj/8ktOuw0lCx+BfYu9UO1CiJ0MoYYfhg==
+  dependencies:
+    tinycolor2 "^1.4.1"
+
+"@ant-design/create-react-context@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@ant-design/create-react-context/-/create-react-context-0.2.4.tgz#0fe9adad030350c0c9bb296dd6dcf5a8a36bd425"
+  integrity sha512-8sw+/w6r+aEbd+OJ62ojoSE4zDt/3yfQydmbWFznoftjr8v/opOswGjM+/MU0rSaREbluqzOmZ6xdecHpSaS2w==
+  dependencies:
+    gud "^1.0.0"
+    warning "^4.0.3"
+
+"@ant-design/icons-react@~2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons-react/-/icons-react-2.0.1.tgz#17a2513571ab317aca2927e58cea25dd31e536fb"
+  integrity sha512-r1QfoltMuruJZqdiKcbPim3d8LNsVPB733U0gZEUSxBLuqilwsW28K2rCTWSMTjmFX7Mfpf+v/wdiFe/XCqThw==
   dependencies:
-    ant-design-palettes "^1.1.3"
+    "@ant-design/colors" "^3.1.0"
     babel-runtime "^6.26.0"
 
-"@ant-design/icons@~1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-1.2.1.tgz#8e19301b1433ec67d6bbd0e892782e2ade561ff9"
-  integrity sha512-gQx3nH6m1xvebOWh5xibhzVK02aoqHY7JUXUS4doAidSDRWsj5iwKC8Gq9DemDZ4T+bW6xO7jJZN1UsbvcW7Uw==
+"@ant-design/icons@~2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-2.0.1.tgz#021c3f5c1df8b1d01c25b705366c597e7cbb3ca5"
+  integrity sha512-SqiNhgoivKczEqIJc/9hntgtvmq4R3Ef73ehibqDPAT059IjsXXM7nze0S5P8F4HP76jgPiv5od+2JUhQl/nig==
 
 "@babel/cli@^7.0.0":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.2.3.tgz#1b262e42a3e959d28ab3d205ba2718e1923cfee6"
-  integrity sha512-bfna97nmJV6nDJhXNPeEfxyMjWnt6+IjUAaDPiYRTBlm8L41n8nvw6UAqUCbvpFfU246gHPxW7sfWwqtF4FcYA==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.4.4.tgz#5454bb7112f29026a4069d8e6f0e1794e651966c"
+  integrity sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==
   dependencies:
     commander "^2.8.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mkdirp "^0.5.1"
     output-file-sync "^2.0.0"
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
-    chokidar "^2.0.3"
+    chokidar "^2.0.4"
 
 "@babel/code-frame@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -56,18 +71,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.3.4.tgz#921a5a13746c21e32445bf0798680e9d11a6530b"
-  integrity sha512-jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==
+"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a"
+  integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.3.4"
-    "@babel/helpers" "^7.2.0"
-    "@babel/parser" "^7.3.4"
-    "@babel/template" "^7.2.2"
-    "@babel/traverse" "^7.3.4"
-    "@babel/types" "^7.3.4"
+    "@babel/generator" "^7.4.4"
+    "@babel/helpers" "^7.4.4"
+    "@babel/parser" "^7.4.5"
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.5"
+    "@babel/types" "^7.4.4"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -87,12 +102,12 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.4.tgz#9aa48c1989257877a9d971296e5b73bfe72e446e"
-  integrity sha512-8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg==
+"@babel/generator@^7.0.0", "@babel/generator@^7.4.0", "@babel/generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
+  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
   dependencies:
-    "@babel/types" "^7.3.4"
+    "@babel/types" "^7.4.4"
     jsesc "^2.5.1"
     lodash "^4.17.11"
     source-map "^0.5.0"
@@ -121,35 +136,35 @@
     "@babel/types" "^7.3.0"
     esutils "^2.0.0"
 
-"@babel/helper-call-delegate@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
-  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
+"@babel/helper-call-delegate@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
+  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
-"@babel/helper-create-class-features-plugin@^7.3.0", "@babel/helper-create-class-features-plugin@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.4.tgz#092711a7a3ad8ea34de3e541644c2ce6af1f6f0c"
-  integrity sha512-uFpzw6L2omjibjxa8VGZsJUPL5wJH0zzGKpoz0ccBkzIa6C8kWNUbiBmQ0rgOKWlHJ6qzmfa6lTiGchiV8SC+g==
+"@babel/helper-create-class-features-plugin@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
+  integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.3.4"
-    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.4.4"
+    "@babel/helper-split-export-declaration" "^7.4.4"
 
-"@babel/helper-define-map@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
-  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
+"@babel/helper-define-map@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz#6969d1f570b46bdc900d1eba8e5d59c48ba2c12a"
+  integrity sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
+    "@babel/types" "^7.4.4"
+    lodash "^4.17.11"
 
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
@@ -191,12 +206,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-hoist-variables@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
-  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
+"@babel/helper-hoist-variables@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
+  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.4"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
@@ -212,17 +227,17 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-module-transforms@^7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
-  integrity sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==
+"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz#96115ea42a2f139e619e98ed46df6019b94414b8"
+  integrity sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.2.2"
-    "@babel/types" "^7.2.2"
-    lodash "^4.17.10"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/template" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    lodash "^4.17.11"
 
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
@@ -236,12 +251,12 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
   integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
-"@babel/helper-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
-  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
+"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.4.tgz#a47e02bc91fb259d2e6727c2a30013e3ac13c4a2"
+  integrity sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 "@babel/helper-remap-async-to-generator@^7.1.0":
   version "7.1.0"
@@ -254,15 +269,15 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz#a795208e9b911a6eeb08e5891faacf06e7013e13"
-  integrity sha512-pvObL9WVf2ADs+ePg0jrqlhHoxRXlOa+SHRHzAXIz2xkYuOHfGl+fKxPMaS4Fq+uje8JQPobnertBBvyrWnQ1A==
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz#aee41783ebe4f2d3ab3ae775e1cc6f1a90cefa27"
+  integrity sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.3.4"
-    "@babel/types" "^7.3.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
@@ -279,12 +294,12 @@
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
+"@babel/helper-split-export-declaration@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
+  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.4"
 
 "@babel/helper-wrap-function@^7.1.0":
   version "7.2.0"
@@ -296,14 +311,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.2.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
-  integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==
+"@babel/helpers@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
+  integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
   dependencies:
-    "@babel/template" "^7.1.2"
-    "@babel/traverse" "^7.1.5"
-    "@babel/types" "^7.3.0"
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
 "@babel/highlight@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -323,10 +338,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.4.tgz#a43357e4bbf4b92a437fb9e465c192848287f27c"
-  integrity sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
+  integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
 
 "@babel/plugin-external-helpers@^7.0.0":
   version "7.2.0"
@@ -344,20 +359,20 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.0.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.4.tgz#410f5173b3dc45939f9ab30ca26684d72901405e"
-  integrity sha512-lUf8D3HLs4yYlAo8zjuneLvfxN7qfKv1Yzbj5vjqaqMJxgJA3Ipwp4VUJ+OrOdz53Wbww6ahwB8UhB2HQyLotA==
+"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.4.0":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce"
+  integrity sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.3.4"
+    "@babel/helper-create-class-features-plugin" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-decorators@^7.0.0", "@babel/plugin-proposal-decorators@^7.1.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.3.0.tgz#637ba075fa780b1f75d08186e8fb4357d03a72a7"
-  integrity sha512-3W/oCUmsO43FmZIqermmq6TKaRSYhmh/vybPfVFwQWdSb8xwki38uAIvknCRzuyHRuYfCYmJzL9or1v0AffPjg==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
+  integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.3.0"
+    "@babel/helper-create-class-features-plugin" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-decorators" "^7.2.0"
 
@@ -378,17 +393,17 @@
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.2.0.tgz#c3fda766187b2f2162657354407247a758ee9cf9"
-  integrity sha512-QXj/YjFuFJd68oDvoc1e8aqLr2wz7Kofzvp6Ekd/o7MWZl+nZ0/cpStxND+hlZ7DpRWAp7OmuyT2areZ2V3YUA==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz#41c360d59481d88e0ce3a3f837df10121a769b39"
+  integrity sha512-Amph7Epui1Dh/xxUxS2+K22/MUi6+6JVTvy3P58tja3B6yKTSjwwx0/d83rF7551D6PVSSoplQb8GCwqec7HRw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz#47f73cf7f2a721aad5c0261205405c642e424654"
-  integrity sha512-j7VQmbbkA+qrzNqbKHrBsW3ddFnOeva6wzSe/zB7T+xaxGc+RCpwo44wCmRixAIGRoIpmVgvzFzNJqQcO3/9RA==
+"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.4.0", "@babel/plugin-proposal-object-rest-spread@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005"
+  integrity sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -409,14 +424,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-chaining" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
-  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
+  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.2.0"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.5.4"
 
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
@@ -474,7 +489,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.2.0":
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
   integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
@@ -509,10 +524,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.0.0", "@babel/plugin-transform-async-to-generator@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz#4e45408d3c3da231c0e7b823f407a53a7eb3048c"
-  integrity sha512-Y7nCzv2fw/jEZ9f678MuKdMo99MFDJMT/PvD9LisrR5JDFcJH6vYeH6RnjVt3p5tceyGRvTtEN0VOlU+rgHZjA==
+"@babel/plugin-transform-async-to-generator@^7.0.0", "@babel/plugin-transform-async-to-generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz#a3f1d01f2f21cadab20b33a82133116f14fb5894"
+  integrity sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -525,26 +540,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz#5c22c339de234076eee96c8783b2fed61202c5c4"
-  integrity sha512-blRr2O8IOZLAOJklXLV4WhcEzpYafYQKSGT3+R26lWG41u/FODJuBggehtOwilVAcFu393v3OFj+HmaE6tVjhA==
+"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz#c13279fabf6b916661531841a23c4b7dae29646d"
+  integrity sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz#dc173cb999c6c5297e0b5f2277fdaaec3739d0cc"
-  integrity sha512-J9fAvCFBkXEvBimgYxCjvaVDzL6thk0j0dBvCeZmIUDBwyt+nv6HfbImsSrWsYXfDNDivyANgJlFXDUWRTZBuA==
+"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz#0ce4094cdafd709721076d3b9c38ad31ca715eb6"
+  integrity sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.1.0"
+    "@babel/helper-define-map" "^7.4.4"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.3.4"
-    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.4.4"
+    "@babel/helper-split-export-declaration" "^7.4.4"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.2.0":
@@ -554,21 +569,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.2.0":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz#f2f5520be055ba1c38c41c0e094d8a461dd78f2d"
-  integrity sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==
+"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz#9d964717829cc9e4b601fc82a26a71a4d8faf20f"
+  integrity sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
-  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
+"@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
+  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.5.4"
 
 "@babel/plugin-transform-duplicate-keys@^7.2.0":
   version "7.2.0"
@@ -585,25 +600,25 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-flow-strip-types@^7.0.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.3.4.tgz#00156236defb7dedddc2d3c9477dcc01a4494327"
-  integrity sha512-PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA==
+"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.4.0":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7"
+  integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-flow" "^7.2.0"
 
-"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
-  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
+"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
+  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
-  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
+"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
+  integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -615,6 +630,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-member-expression-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
+  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-modules-amd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
@@ -623,21 +645,21 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
-  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
+"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e"
+  integrity sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz#813b34cd9acb6ba70a84939f3680be0eb2e58861"
-  integrity sha512-VZ4+jlGOF36S7TjKs8g4ojp4MEI+ebCQZdswWb/T9I4X84j8OtFAyjXjt/M16iIm5RIZn0UMQgg/VgIwo/87vw==
+"@babel/plugin-transform-modules-systemjs@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz#dc83c5665b07d6c2a7b224c00ac63659ea36a405"
+  integrity sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-umd@^7.2.0":
@@ -648,17 +670,17 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
-  integrity sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
+  integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
   dependencies:
-    regexp-tree "^0.1.0"
+    regexp-tree "^0.1.6"
 
-"@babel/plugin-transform-new-target@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
-  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
+"@babel/plugin-transform-new-target@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
+  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -677,15 +699,22 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
 
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.2.0":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz#3a873e07114e1a5bee17d04815662c8317f10e30"
-  integrity sha512-IrIP25VvXWu/VlBWTpsjGptpomtIkYrN/3aDp4UKm7xK6UxZY88kcJ1UwETbzHAlwN21MnNfwlar0u8y3KpiXw==
+"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
+  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
   dependencies:
-    "@babel/helper-call-delegate" "^7.1.0"
+    "@babel/helper-call-delegate" "^7.4.4"
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-property-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
+  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
@@ -709,7 +738,7 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-react-jsx@^7.0.0":
+"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.3.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290"
   integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==
@@ -718,17 +747,24 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz#1601655c362f5b38eead6a52631f5106b29fa46a"
-  integrity sha512-hvJg8EReQvXT6G9H2MvNPXkv9zK36Vxa1+csAVTpE1J3j0zlHplw76uudEbJxgvqZzAq9Yh45FLD4pk5mKRFQA==
+"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
+  integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
+  dependencies:
+    regenerator-transform "^0.14.0"
+
+"@babel/plugin-transform-reserved-words@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
+  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
   dependencies:
-    regenerator-transform "^0.13.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-runtime@^7.0.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz#57805ac8c1798d102ecd75c03b024a5b3ea9b431"
-  integrity sha512-PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz#a50f5d16e9c3a4ac18a1a9f9803c107c380bce08"
+  integrity sha512-aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -757,10 +793,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
-  integrity sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==
+"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
+  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -773,78 +809,83 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-typescript@^7.0.0", "@babel/plugin-transform-typescript@^7.3.2":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.3.2.tgz#59a7227163e55738842f043d9e5bd7c040447d96"
-  integrity sha512-Pvco0x0ZSCnexJnshMfaibQ5hnK8aUHSvjCQhC1JR8eeg+iBwt0AtCO7gWxJ358zZevuf9wPSO5rv+WJcbHPXQ==
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
+  integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-typescript" "^7.2.0"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0", "@babel/plugin-transform-unicode-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
-  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
+"@babel/plugin-transform-unicode-regex@^7.0.0", "@babel/plugin-transform-unicode-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
+  integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.5.4"
 
-"@babel/polyfill@^7.0.0":
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.2.5.tgz#6c54b964f71ad27edddc567d065e57e87ed7fa7d"
-  integrity sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==
+"@babel/polyfill@^7.0.0", "@babel/polyfill@^7.4.0":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.4.4.tgz#78801cf3dbe657844eeabf31c1cae3828051e893"
+  integrity sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==
   dependencies:
-    core-js "^2.5.7"
-    regenerator-runtime "^0.12.0"
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.2"
 
-"@babel/preset-env@^7.0.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.4.tgz#887cf38b6d23c82f19b5135298bdb160062e33e1"
-  integrity sha512-2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==
+"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.3.1", "@babel/preset-env@^7.4.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58"
+  integrity sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.3.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.4.4"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.3.4"
+    "@babel/plugin-transform-async-to-generator" "^7.4.4"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.3.4"
-    "@babel/plugin-transform-classes" "^7.3.4"
+    "@babel/plugin-transform-block-scoping" "^7.4.4"
+    "@babel/plugin-transform-classes" "^7.4.4"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.2.0"
-    "@babel/plugin-transform-dotall-regex" "^7.2.0"
+    "@babel/plugin-transform-destructuring" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/plugin-transform-duplicate-keys" "^7.2.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.2.0"
-    "@babel/plugin-transform-function-name" "^7.2.0"
+    "@babel/plugin-transform-for-of" "^7.4.4"
+    "@babel/plugin-transform-function-name" "^7.4.4"
     "@babel/plugin-transform-literals" "^7.2.0"
+    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.3.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.4.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.4.4"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
-    "@babel/plugin-transform-new-target" "^7.0.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
+    "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.3.4"
+    "@babel/plugin-transform-parameters" "^7.4.4"
+    "@babel/plugin-transform-property-literals" "^7.2.0"
+    "@babel/plugin-transform-regenerator" "^7.4.5"
+    "@babel/plugin-transform-reserved-words" "^7.2.0"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.2.0"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.2.0"
+    "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.2.0"
-    browserslist "^4.3.4"
+    "@babel/plugin-transform-unicode-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    browserslist "^4.6.0"
+    core-js-compat "^3.1.1"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
-    semver "^5.3.0"
+    semver "^5.5.0"
 
 "@babel/preset-flow@^7.0.0":
   version "7.0.0"
@@ -873,25 +914,24 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-typescript" "^7.3.2"
 
-"@babel/register@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0.tgz#fa634bae1bfa429f60615b754fc1f1d745edd827"
-  integrity sha512-f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g==
+"@babel/register@^7.0.0", "@babel/register@^7.4.0":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.4.4.tgz#370a68ba36f08f015a8b35d4864176c6b65d7a23"
+  integrity sha512-sn51H88GRa00+ZoMqCVgOphmswG4b7mhf9VOB0LUBAieykq2GnRFerlN+JQkO/ntT7wz4jaHNSRPg9IdMPEUkA==
   dependencies:
-    core-js "^2.5.7"
-    find-cache-dir "^1.0.0"
-    home-or-tmp "^3.0.0"
-    lodash "^4.17.10"
+    core-js "^3.0.0"
+    find-cache-dir "^2.0.0"
+    lodash "^4.17.11"
     mkdirp "^0.5.1"
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.38", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
-  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.38", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.3":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
+  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
   dependencies:
-    regenerator-runtime "^0.12.0"
+    regenerator-runtime "^0.13.2"
 
 "@babel/template@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -903,14 +943,14 @@
     babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
-"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
-  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
+"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
+  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
 "@babel/traverse@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -928,17 +968,17 @@
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.3.4.tgz#1330aab72234f8dea091b08c4f8b9d05c7119e06"
-  integrity sha512-TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
+  integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.3.4"
+    "@babel/generator" "^7.4.4"
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.3.4"
-    "@babel/types" "^7.3.4"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/parser" "^7.4.5"
+    "@babel/types" "^7.4.4"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.11"
@@ -952,15 +992,23 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.4.tgz#bf482eaeaffb367a28abbf9357a94963235d90ed"
-  integrity sha512-WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
+  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
+  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
 "@expo/bunyan@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-3.0.2.tgz#775680bd479a8b79ada4a5676936a58eef1579c9"
@@ -983,11 +1031,12 @@
     safe-json-stringify "~1"
 
 "@expo/json-file@^8.0.0", "@expo/json-file@^8.0.1", "@expo/json-file@^8.1.0":
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.1.1.tgz#10fd0e0a8dba81df851d099a0f6841327cbbc06a"
-  integrity sha512-cWTp9Ij9Mu3AYGt7MtWVZqz14vjj7HxvhjzZyA74TzLVfCSdsklSbihN+Wi6Jy00AC4nhkT4olRqxDZMS0JYpQ==
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.1.4.tgz#160f68a2ad08a1c1a34e9edfef6e87293ce0a6ac"
+  integrity sha512-0M6Hq2+iNV+wqc9hSffa05NgTwqmg08TVhpUSSBuHjOscYw2gxMi8JbTJ1v6fg5NqRW1AOga8mZb6Py8SE/b+g==
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.44"
+    fs-extra "^8.0.1"
     json5 "^1.0.1"
     lodash "^4.17.4"
     util.promisify "^1.0.0"
@@ -1078,9 +1127,9 @@
     uuid "^3.0.0"
 
 "@expo/osascript@^1.8.0", "@expo/osascript@^1.9.0":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@expo/osascript/-/osascript-1.9.1.tgz#120092657cece3c63430c7dedbdad3842ec64765"
-  integrity sha512-I/eACcarb7Bt7NKU+CQlPuk8uEvdOQ/N9oyE1FM8BkeZsXPnoO9RUrVAFEgPTxUNiksjY/7oTMLLBIdJu++aRQ==
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/@expo/osascript/-/osascript-1.9.2.tgz#09de523a07d38e5cefca0db55ac7984e5d5776ca"
+  integrity sha512-jsT+Nauqp+ZnWsTJEPSPYImJzGY1L22cQEmaOZvWzgc6MTdBgfWG9KoKVHvn3WvPYHio7sOMk1zGocM1CW95LQ==
   dependencies:
     "@expo/spawn-async" "^1.2.8"
     babel-runtime "^6.23.0"
@@ -1110,9 +1159,9 @@
     read-chunk "^2.0.0"
 
 "@expo/schemer@^1.2.1":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@expo/schemer/-/schemer-1.2.3.tgz#b45472a19a426fde23c74e75df08b4e2a4256894"
-  integrity sha512-SbxQ87T0uTSiwnpHQk5PZLvX/ZSO1kZ4NTYvy0ZBg5CHgch7XxR2IazpiZ1v7YkIlSVQs/CbIibMUm04xswB4w==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@expo/schemer/-/schemer-1.2.5.tgz#f2d457ee7aeae3edf29dd98d3dfa84af6b11dfc3"
+  integrity sha512-j74QDjk5gka5yeIgdiBFg1YQB3upnOedct6Ji8K1+iIQ1OErN4grf1YxCH/v81rhrsbBjKT5wgn0eKH7wqdsRw==
   dependencies:
     ajv "^5.2.2"
     babel-polyfill "^6.23.0"
@@ -1129,11 +1178,10 @@
   integrity sha1-sxRH3mDlECg3pO33AoOfzI9/MfM=
 
 "@expo/spawn-async@^1.2.8", "@expo/spawn-async@^1.3.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@expo/spawn-async/-/spawn-async-1.4.0.tgz#39f7777bdee22e1f48d03898c9ed2f150a7f4cbd"
-  integrity sha512-jE9zSZ14eOfKxXs+WJZofweKtsAeuQiOpntsb+zp8Ti9/wk+9ZjKkffdld7UfANr8asmzuJYnEoVyL+hMy3SWw==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@expo/spawn-async/-/spawn-async-1.5.0.tgz#799827edd8c10ef07eb1a2ff9dcfe081d596a395"
+  integrity sha512-LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==
   dependencies:
-    "@types/cross-spawn" "^6.0.0"
     cross-spawn "^6.0.5"
 
 "@expo/traveling-fastlane-darwin@1.5.0":
@@ -1204,18 +1252,161 @@
     humps "^2.0.1"
     prop-types "^15.5.10"
 
-"@jest/types@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.5.0.tgz#feee214a4d0167b0ca447284e95a57aa10b3ee95"
-  integrity sha512-kN7RFzNMf2R8UDadPOl6ReyI+MT8xfqRuAnuVL+i4gwjv/zubdDK+EDeLHYwq1j0CSSR2W/MmgaRlMZJzXdmVA==
+"@improved/node@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@improved/node/-/node-1.0.0.tgz#50b1cc6804ffb3d9c86bf91ed1900baa3cd8dd59"
+  integrity sha512-8r6WN+Qp2EsZ6G2F1y0vpJjGFVtoCQQ1aCrvBJ1ofy7SG96nG8FfeXWalxsCbh7zMrieOF45McAb50bYCLCuBQ==
+
+"@jest/console@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
+  integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==
+  dependencies:
+    "@jest/source-map" "^24.3.0"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
+"@jest/core@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz#fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b"
+  integrity sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/reporters" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-changed-files "^24.8.0"
+    jest-config "^24.8.0"
+    jest-haste-map "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve-dependencies "^24.8.0"
+    jest-runner "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-snapshot "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    jest-watcher "^24.8.0"
+    micromatch "^3.1.10"
+    p-each-series "^1.0.0"
+    pirates "^4.0.1"
+    realpath-native "^1.1.0"
+    rimraf "^2.5.4"
+    strip-ansi "^5.0.0"
+
+"@jest/environment@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz#0342261383c776bdd652168f68065ef144af0eac"
+  integrity sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==
+  dependencies:
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    jest-mock "^24.8.0"
+
+"@jest/fake-timers@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz#2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"
+  integrity sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-mock "^24.8.0"
+
+"@jest/reporters@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz#075169cd029bddec54b8f2c0fc489fd0b9e05729"
+  integrity sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==
+  dependencies:
+    "@jest/environment" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    istanbul-lib-coverage "^2.0.2"
+    istanbul-lib-instrument "^3.0.1"
+    istanbul-lib-report "^2.0.4"
+    istanbul-lib-source-maps "^3.0.1"
+    istanbul-reports "^2.1.1"
+    jest-haste-map "^24.8.0"
+    jest-resolve "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-util "^24.8.0"
+    jest-worker "^24.6.0"
+    node-notifier "^5.2.1"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+    string-length "^2.0.0"
+
+"@jest/source-map@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28"
+  integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.1.15"
+    source-map "^0.6.0"
+
+"@jest/test-result@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3"
+  integrity sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/types" "^24.8.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+
+"@jest/test-sequencer@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz#2f993bcf6ef5eb4e65e8233a95a3320248cf994b"
+  integrity sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==
+  dependencies:
+    "@jest/test-result" "^24.8.0"
+    jest-haste-map "^24.8.0"
+    jest-runner "^24.8.0"
+    jest-runtime "^24.8.0"
+
+"@jest/transform@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5"
+  integrity sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^24.8.0"
+    babel-plugin-istanbul "^5.1.0"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.15"
+    jest-haste-map "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-util "^24.8.0"
+    micromatch "^3.1.10"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "2.4.1"
+
+"@jest/types@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
+  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
   dependencies:
-    "@types/istanbul-lib-coverage" "^1.1.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^12.0.9"
 
-"@larix/zen@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@larix/zen/-/zen-0.1.9.tgz#1eaf21523b4f1049927c2420a46cdaeb21c3fd31"
-  integrity sha512-QSAbyLrycoOlRZ7Ec1b8qBy4pUu+6Ou+gS6um/PkmaKiPv76HZH68/SUDwfpTPM9Trj1Lm3BA0ETQkuDrWPWCg==
+"@larix/zen@^0.1.20":
+  version "0.1.20"
+  resolved "https://registry.yarnpkg.com/@larix/zen/-/zen-0.1.20.tgz#d0d35eb0ecb83d7b923b6ef626d881612674659d"
+  integrity sha512-X7qZkBAmYc4LHpESRrMX5jG/HvZVeYCAk46sGfGR883UXiNplICqPTSYfv8aAf5lJJKzZTcnbyj3PAFG8AJ1CA==
   dependencies:
     connect-cors "^0.5.6"
     debug "^3.1.0"
@@ -1238,14 +1429,14 @@
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-"@lerna/add@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.13.1.tgz#2cd7838857edb3b43ed73e3c21f69a20beb9b702"
-  integrity sha512-cXk42YbuhzEnADCK8Qte5laC9Qo03eJLVnr0qKY85jQUM/T4URe3IIUemqpg0CpVATrB+Vz+iNdeqw9ng1iALw==
+"@lerna/add@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.14.0.tgz#799d416e67d48c285967abf883be746557aefa48"
+  integrity sha512-Sa79Ju6HqF3heSVpBiYPNrGtuS56U/jMzVq4CcVvhNwB34USLrzJJncGFVcfnuUvsjKeFJv+jHxUycHeRE8XYw==
   dependencies:
-    "@lerna/bootstrap" "3.13.1"
-    "@lerna/command" "3.13.1"
-    "@lerna/filter-options" "3.13.0"
+    "@lerna/bootstrap" "3.14.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/filter-options" "3.14.0"
     "@lerna/npm-conf" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
@@ -1254,32 +1445,31 @@
     pacote "^9.5.0"
     semver "^5.5.0"
 
-"@lerna/batch-packages@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.13.0.tgz#697fde5be28822af9d9dca2f750250b90a89a000"
-  integrity sha512-TgLBTZ7ZlqilGnzJ3xh1KdAHcySfHytgNRTdG9YomfriTU6kVfp1HrXxKJYVGs7ClPUNt2CTFEOkw0tMBronjw==
+"@lerna/batch-packages@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.14.0.tgz#0208663bab3ddbf57956b370aaec4c9ebee6c800"
+  integrity sha512-RlBkQVNTqk1qvn6PFWiWNiskllUHh6tXbTVm43mZRNd+vhAyvrQC8RWJxH0ECVvnFAt9rSNGRIVbEJ31WnNQLg==
   dependencies:
-    "@lerna/package-graph" "3.13.0"
-    "@lerna/validation-error" "3.13.0"
+    "@lerna/package-graph" "3.14.0"
     npmlog "^4.1.2"
 
-"@lerna/bootstrap@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.13.1.tgz#f2edd7c8093c8b139e78b0ca5f845f23efd01f08"
-  integrity sha512-mKdi5Ds5f82PZwEFyB9/W60I3iELobi1i87sTeVrbJh/um7GvqpSPy7kG/JPxyOdMpB2njX6LiJgw+7b6BEPWw==
-  dependencies:
-    "@lerna/batch-packages" "3.13.0"
-    "@lerna/command" "3.13.1"
-    "@lerna/filter-options" "3.13.0"
-    "@lerna/has-npm-version" "3.13.0"
-    "@lerna/npm-install" "3.13.0"
-    "@lerna/package-graph" "3.13.0"
+"@lerna/bootstrap@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.14.0.tgz#dde35eac0a912097033e1daea237a50e5c3cb75b"
+  integrity sha512-AvnuDp8b0kX4zZgqD3v7ItPABhUsN5CmTEvZBD2JqM+xkQKhzCfz5ABcHEwDwOPWnNQmtH+/2iQdwaD7xBcAXw==
+  dependencies:
+    "@lerna/batch-packages" "3.14.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/filter-options" "3.14.0"
+    "@lerna/has-npm-version" "3.13.3"
+    "@lerna/npm-install" "3.13.3"
+    "@lerna/package-graph" "3.14.0"
     "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/rimraf-dir" "3.13.0"
-    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/rimraf-dir" "3.13.3"
+    "@lerna/run-lifecycle" "3.14.0"
     "@lerna/run-parallel-batches" "3.13.0"
-    "@lerna/symlink-binary" "3.13.0"
-    "@lerna/symlink-dependencies" "3.13.0"
+    "@lerna/symlink-binary" "3.14.0"
+    "@lerna/symlink-dependencies" "3.14.0"
     "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
     get-port "^3.2.0"
@@ -1293,44 +1483,45 @@
     read-package-tree "^5.1.6"
     semver "^5.5.0"
 
-"@lerna/changed@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.13.1.tgz#dc92476aad43c932fe741969bbd0bcf6146a4c52"
-  integrity sha512-BRXitEJGOkoudbxEewW7WhjkLxFD+tTk4PrYpHLyCBk63pNTWtQLRE6dc1hqwh4emwyGncoyW6RgXfLgMZgryw==
+"@lerna/changed@3.14.1":
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.14.1.tgz#274fa67a34f234546925c139aabe20765f07a8e4"
+  integrity sha512-G0RgYL/WLTFzbezRBLUO2J0v39EvgZIO5bHHUtYt7zUFSfzapkPfvpdpBj+5JlMtf0B2xfxwTk+lSA4LVnbfmA==
   dependencies:
-    "@lerna/collect-updates" "3.13.0"
-    "@lerna/command" "3.13.1"
-    "@lerna/listable" "3.13.0"
+    "@lerna/collect-updates" "3.14.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/listable" "3.14.0"
     "@lerna/output" "3.13.0"
-    "@lerna/version" "3.13.1"
+    "@lerna/version" "3.14.1"
 
-"@lerna/check-working-tree@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.13.0.tgz#1ddcd4d9b1aceb65efaaa4cd1333a66706d67c9c"
-  integrity sha512-dsdO15NXX5To+Q53SYeCrBEpiqv4m5VkaPZxbGQZNwoRen1MloXuqxSymJANQn+ZLEqarv5V56gydebeROPH5A==
+"@lerna/check-working-tree@3.14.1":
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.14.1.tgz#4102681c31e4cebed3968db27567e3180e519822"
+  integrity sha512-ae/sdZPNh4SS+6c4UDuWP/QKbtIFAn/TvKsPncA1Jdo0PqXLBlug4DzkHTGkvZ5F0nj+0JrSxYteInakJV99vg==
   dependencies:
-    "@lerna/describe-ref" "3.13.0"
+    "@lerna/collect-uncommitted" "3.14.1"
+    "@lerna/describe-ref" "3.13.3"
     "@lerna/validation-error" "3.13.0"
 
-"@lerna/child-process@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.13.0.tgz#84e35adf3217a6983edd28080657b9596a052674"
-  integrity sha512-0iDS8y2jiEucD4fJHEzKoc8aQJgm7s+hG+0RmDNtfT0MM3n17pZnf5JOMtS1FJp+SEXOjMKQndyyaDIPFsnp6A==
+"@lerna/child-process@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.13.3.tgz#6c084ee5cca9fc9e04d6bf4fc3f743ed26ff190c"
+  integrity sha512-3/e2uCLnbU+bydDnDwyadpOmuzazS01EcnOleAnuj9235CU2U97DH6OyoG1EW/fU59x11J+HjIqovh5vBaMQjQ==
   dependencies:
     chalk "^2.3.1"
     execa "^1.0.0"
     strong-log-transformer "^2.0.0"
 
-"@lerna/clean@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.13.1.tgz#9a7432efceccd720a51da5c76f849fc59c5a14ce"
-  integrity sha512-myGIaXv7RUO2qCFZXvx8SJeI+eN6y9SUD5zZ4/LvNogbOiEIlujC5lUAqK65rAHayQ9ltSa/yK6Xv510xhZXZQ==
+"@lerna/clean@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.14.0.tgz#4399f4a3289106b0b8ffbffd4a6cfd2e3fe935f2"
+  integrity sha512-wEuAqOS9VMqh2C20KD63IySzyEnyVDqDI3LUsXw+ByUf9AJDgEHv0TCOxbDjDYaaQw1tjSBNZMyYInNeoASwhA==
   dependencies:
-    "@lerna/command" "3.13.1"
-    "@lerna/filter-options" "3.13.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/filter-options" "3.14.0"
     "@lerna/prompt" "3.13.0"
     "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/rimraf-dir" "3.13.0"
+    "@lerna/rimraf-dir" "3.13.3"
     p-map "^1.2.0"
     p-map-series "^1.0.0"
     p-waterfall "^1.0.0"
@@ -1345,24 +1536,34 @@
     npmlog "^4.1.2"
     yargs "^12.0.1"
 
-"@lerna/collect-updates@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.13.0.tgz#f0828d84ff959ff153d006765659ffc4d68cdefc"
-  integrity sha512-uR3u6uTzrS1p46tHQ/mlHog/nRJGBqskTHYYJbgirujxm6FqNh7Do+I1Q/7zSee407G4lzsNxZdm8IL927HemQ==
+"@lerna/collect-uncommitted@3.14.1":
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-3.14.1.tgz#b3498c4c7f46efc79092ce4aa0a24edc535e5d1a"
+  integrity sha512-hQ67S+nlSJwsPylXbWlrQSZUcWa8tTNIdcMd9OY4+QxdJlZUG7CLbWSyaxi0g11WdoRJHT163mr9xQyAvIVT1A==
+  dependencies:
+    "@lerna/child-process" "3.13.3"
+    chalk "^2.3.1"
+    figgy-pudding "^3.5.1"
+    npmlog "^4.1.2"
+
+"@lerna/collect-updates@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.14.0.tgz#64d64ff1ec05ac53dfe6851be49d2ad261e6795e"
+  integrity sha512-siRHo2atAwj5KpKVOo6QTVIYDYbNs7dzTG6ow9VcFMLKX5shuaEyFA22Z3LmnxQ3sakVFdgvvVeediEz6cM3VA==
   dependencies:
-    "@lerna/child-process" "3.13.0"
-    "@lerna/describe-ref" "3.13.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/describe-ref" "3.13.3"
     minimatch "^3.0.4"
     npmlog "^4.1.2"
     slash "^1.0.0"
 
-"@lerna/command@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.13.1.tgz#b60dda2c0d9ffbb6030d61ddf7cceedc1e8f7e6e"
-  integrity sha512-SYWezxX+iheWvzRoHCrbs8v5zHPaxAx3kWvZhqi70vuGsdOVAWmaG4IvHLn11ztS+Vpd5PM+ztBWSbnykpLFKQ==
+"@lerna/command@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.14.0.tgz#5f5e68293c0ff1e85a20b4e96fa6bea33b7632df"
+  integrity sha512-PtFi5EtXB2VuSruoLsjfZdus56d7oKlZAI4iSRoaS/BBxE2Wyfn7//vW7Ow4hZCzuqb9tBcpDq+4u2pdXN1d2Q==
   dependencies:
-    "@lerna/child-process" "3.13.0"
-    "@lerna/package-graph" "3.13.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/package-graph" "3.14.0"
     "@lerna/project" "3.13.1"
     "@lerna/validation-error" "3.13.0"
     "@lerna/write-log-file" "3.13.0"
@@ -1372,10 +1573,10 @@
     lodash "^4.17.5"
     npmlog "^4.1.2"
 
-"@lerna/conventional-commits@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.13.0.tgz#877aa225ca34cca61c31ea02a5a6296af74e1144"
-  integrity sha512-BeAgcNXuocmLhPxnmKU2Vy8YkPd/Uo+vu2i/p3JGsUldzrPC8iF3IDxH7fuXpEFN2Nfogu7KHachd4tchtOppA==
+"@lerna/conventional-commits@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.14.0.tgz#24f643550dc29d4f1249cc26d0eb453d7a1c513d"
+  integrity sha512-hGZ2qQZ9uEGf2eeIiIpEodSs9Qkkf/2uYEtNT7QN1RYISPUh6/lKGBssc5dpbCF64aEuxmemWLdlDf1ogG6++w==
   dependencies:
     "@lerna/validation-error" "3.13.0"
     conventional-changelog-angular "^5.0.3"
@@ -1388,22 +1589,22 @@
     pify "^3.0.0"
     semver "^5.5.0"
 
-"@lerna/create-symlink@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.13.0.tgz#e01133082fe040779712c960683cb3a272b67809"
-  integrity sha512-PTvg3jAAJSAtLFoZDsuTMv1wTOC3XYIdtg54k7uxIHsP8Ztpt+vlilY/Cni0THAqEMHvfiToel76Xdta4TU21Q==
+"@lerna/create-symlink@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.14.0.tgz#f40ae06e8cebe70c694368ebf9a4af5ab380fbea"
+  integrity sha512-Kw51HYOOi6UfCKncqkgEU1k/SYueSBXgkNL91FR8HAZH7EPSRTEtp9mnJo568g0+Hog5C+3cOaWySwhHpRG29A==
   dependencies:
     cmd-shim "^2.0.2"
     fs-extra "^7.0.0"
     npmlog "^4.1.2"
 
-"@lerna/create@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.13.1.tgz#2c1284cfdc59f0d2b88286d78bc797f4ab330f79"
-  integrity sha512-pLENMXgTkQuvKxAopjKeoLOv9fVUCnpTUD7aLrY5d95/1xqSZlnsOcQfUYcpMf3GpOvHc8ILmI5OXkPqjAf54g==
+"@lerna/create@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.14.0.tgz#ec7a0d4aa81e60c918ea2ba06f3c71ee2855a936"
+  integrity sha512-J4PeGnzVBOSV7Cih8Uhv9xIauljR9bGcfSDN9aMzFtJhSX0xFXNvmnpXRORp7xNHV2lbxk7mNxRQxzR9CQRMuw==
   dependencies:
-    "@lerna/child-process" "3.13.0"
-    "@lerna/command" "3.13.1"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.14.0"
     "@lerna/npm-conf" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     camelcase "^5.0.0"
@@ -1421,42 +1622,42 @@
     validate-npm-package-name "^3.0.0"
     whatwg-url "^7.0.0"
 
-"@lerna/describe-ref@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.13.0.tgz#fb4c3863fd6bcccad67ce7b183887a5fc1942bb6"
-  integrity sha512-UJefF5mLxLae9I2Sbz5RLYGbqbikRuMqdgTam0MS5OhXnyuuKYBUpwBshCURNb1dPBXTQhSwc7+oUhORx8ojCg==
+"@lerna/describe-ref@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.13.3.tgz#13318513613f6a407d37fc5dc025ec2cfb705606"
+  integrity sha512-5KcLTvjdS4gU5evW8ESbZ0BF44NM5HrP3dQNtWnOUSKJRgsES8Gj0lq9AlB2+YglZfjEftFT03uOYOxnKto4Uw==
   dependencies:
-    "@lerna/child-process" "3.13.0"
+    "@lerna/child-process" "3.13.3"
     npmlog "^4.1.2"
 
-"@lerna/diff@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.13.1.tgz#5c734321b0f6c46a3c87f55c99afef3b01d46520"
-  integrity sha512-cKqmpONO57mdvxtp8e+l5+tjtmF04+7E+O0QEcLcNUAjC6UR2OSM77nwRCXDukou/1h72JtWs0jjcdYLwAmApg==
+"@lerna/diff@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.14.0.tgz#a4860c062faf990dd3c208dcf1c6fbde5a042bdb"
+  integrity sha512-H6FSj0jOiQ6unVCwOK6ReT5uZN6ZIn/j/cx4YwuOtU3SMcs3UfuQRIFNeKg/tKmOcQGd39Mn9zDhmt3TAYGROA==
   dependencies:
-    "@lerna/child-process" "3.13.0"
-    "@lerna/command" "3.13.1"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.14.0"
     "@lerna/validation-error" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/exec@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.13.1.tgz#4439e90fb0877ec38a6ef933c86580d43eeaf81b"
-  integrity sha512-I34wEP9lrAqqM7tTXLDxv/6454WFzrnXDWpNDbiKQiZs6SIrOOjmm6I4FiQsx+rU3o9d+HkC6tcUJRN5mlJUgA==
+"@lerna/exec@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.14.0.tgz#da632dac4a86d59f7fe8c566af8648f8272241ff"
+  integrity sha512-cNFO8hWsBVLeqVQ7LsQ4rYKbbQ2eN+Ne+hWKTlUQoyRbYzgJ22TXhjKR6IMr68q0xtclcDlasfcNO+XEWESh0g==
   dependencies:
-    "@lerna/batch-packages" "3.13.0"
-    "@lerna/child-process" "3.13.0"
-    "@lerna/command" "3.13.1"
-    "@lerna/filter-options" "3.13.0"
-    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.14.0"
+    "@lerna/filter-options" "3.14.0"
+    "@lerna/run-topologically" "3.14.0"
     "@lerna/validation-error" "3.13.0"
+    p-map "^1.2.0"
 
-"@lerna/filter-options@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.13.0.tgz#976e3d8b9fcd47001ab981d276565c1e9f767868"
-  integrity sha512-SRp7DCo9zrf+7NkQxZMkeyO1GRN6GICoB9UcBAbXhLbWisT37Cx5/6+jh49gYB63d/0/WYHSEPMlheUrpv1Srw==
+"@lerna/filter-options@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.14.0.tgz#6a2e60708633f54973bf31262b58e53efb537ef2"
+  integrity sha512-ZmNZK9m8evxHc+2ZnDyCm8XFIKVDKpIASG1wtizr3R14t49fuYE7nR+rm4t82u9oSSmER8gb8bGzh0SKZme/jg==
   dependencies:
-    "@lerna/collect-updates" "3.13.0"
+    "@lerna/collect-updates" "3.14.0"
     "@lerna/filter-packages" "3.13.0"
     dedent "^0.7.0"
 
@@ -1485,12 +1686,12 @@
     ssri "^6.0.1"
     tar "^4.4.8"
 
-"@lerna/github-client@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.13.1.tgz#cb9bf9f01685a0cee0fac63f287f6c3673e45aa3"
-  integrity sha512-iPLUp8FFoAKGURksYEYZzfuo9TRA+NepVlseRXFaWlmy36dCQN20AciINpoXiXGoHcEUHXUKHQvY3ARFdMlf3w==
+"@lerna/github-client@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.13.3.tgz#bcf9b4ff40bdd104cb40cd257322f052b41bb9ce"
+  integrity sha512-fcJkjab4kX0zcLLSa/DCUNvU3v8wmy2c1lhdIbL7s7gABmDcV0QZq93LhnEee3VkC9UpnJ6GKG4EkD7eIifBnA==
   dependencies:
-    "@lerna/child-process" "3.13.0"
+    "@lerna/child-process" "3.13.3"
     "@octokit/plugin-enterprise-rest" "^2.1.1"
     "@octokit/rest" "^16.16.0"
     git-url-parse "^11.1.2"
@@ -1501,21 +1702,21 @@
   resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1"
   integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==
 
-"@lerna/has-npm-version@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.13.0.tgz#6e1f7e9336cce3e029066f0175f06dd9d51ad09f"
-  integrity sha512-Oqu7DGLnrMENPm+bPFGOHnqxK8lCnuYr6bk3g/CoNn8/U0qgFvHcq6Iv8/Z04TsvleX+3/RgauSD2kMfRmbypg==
+"@lerna/has-npm-version@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.13.3.tgz#167e3f602a2fb58f84f93cf5df39705ca6432a2d"
+  integrity sha512-mQzoghRw4dBg0R9FFfHrj0TH0glvXyzdEZmYZ8Isvx5BSuEEwpsryoywuZSdppcvLu8o7NAdU5Tac8cJ/mT52w==
   dependencies:
-    "@lerna/child-process" "3.13.0"
+    "@lerna/child-process" "3.13.3"
     semver "^5.5.0"
 
-"@lerna/import@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.13.1.tgz#69d641341a38b79bd379129da1c717d51dd728c7"
-  integrity sha512-A1Vk1siYx1XkRl6w+zkaA0iptV5TIynVlHPR9S7NY0XAfhykjztYVvwtxarlh6+VcNrO9We6if0+FXCrfDEoIg==
+"@lerna/import@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.14.0.tgz#de5727dc18d21c50af14b481e47b424c5bbe107c"
+  integrity sha512-j8z/m85FX1QYPgl5TzMNupdxsQF/NFZSmdCR19HQzqiVKC8ULGzF30WJEk66+KeZ94wYMSakINtYD+41s34pNQ==
   dependencies:
-    "@lerna/child-process" "3.13.0"
-    "@lerna/command" "3.13.1"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.14.0"
     "@lerna/prompt" "3.13.0"
     "@lerna/pulse-till-done" "3.13.0"
     "@lerna/validation-error" "3.13.0"
@@ -1523,44 +1724,44 @@
     fs-extra "^7.0.0"
     p-map-series "^1.0.0"
 
-"@lerna/init@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.13.1.tgz#0392c822abb3d63a75be4916c5e761cfa7b34dda"
-  integrity sha512-M59WACqim8WkH5FQEGOCEZ89NDxCKBfFTx4ZD5ig3LkGyJ8RdcJq5KEfpW/aESuRE9JrZLzVr0IjKbZSxzwEMA==
+"@lerna/init@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.14.0.tgz#f5b92f171f9ed4168bd3d9305fffe6a46460a1d2"
+  integrity sha512-X3PQkQZds5ozA1xiarmVzAK6LPLNK3bBu24Api0w2KJXO7Ccs9ob/VcGdevZuzqdJo1Xg2H6oBhEqIClU9Uqqw==
   dependencies:
-    "@lerna/child-process" "3.13.0"
-    "@lerna/command" "3.13.1"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.14.0"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
     write-json-file "^2.3.0"
 
-"@lerna/link@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.13.1.tgz#7d8ed4774bfa198d1780f790a14abb8722a3aad1"
-  integrity sha512-N3h3Fj1dcea+1RaAoAdy4g2m3fvU7m89HoUn5X/Zcw5n2kPoK8kTO+NfhNAatfRV8VtMXst8vbNrWQQtfm0FFw==
+"@lerna/link@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.14.0.tgz#817243559b3d460a08bd65582e7632b1dbc6df69"
+  integrity sha512-xlwQhWTVOZrgAuoONY3/OIBWehDfZXmf5qFhnOy7lIxByRhEX5Vwx0ApaGxHTv3Flv7T+oI4s8UZVq5F6dT8Aw==
   dependencies:
-    "@lerna/command" "3.13.1"
-    "@lerna/package-graph" "3.13.0"
-    "@lerna/symlink-dependencies" "3.13.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/package-graph" "3.14.0"
+    "@lerna/symlink-dependencies" "3.14.0"
     p-map "^1.2.0"
     slash "^1.0.0"
 
-"@lerna/list@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.13.1.tgz#f9513ed143e52156c10ada4070f903c5847dcd10"
-  integrity sha512-635iRbdgd9gNvYLLIbYdQCQLr+HioM5FGJLFS0g3DPGygr6iDR8KS47hzCRGH91LU9NcM1mD1RoT/AChF+QbiA==
+"@lerna/list@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.14.0.tgz#cfe826937c63a3652003639eb7fd36bf4b0a3660"
+  integrity sha512-Gp+9gaIkBfXBwc9Ng0Y74IEfAqpQpLiXwOP4IOpdINxOeDpllhMaYP6SzLaMvrfSyHRayM7Cq5/PRnHkXQ5uuQ==
   dependencies:
-    "@lerna/command" "3.13.1"
-    "@lerna/filter-options" "3.13.0"
-    "@lerna/listable" "3.13.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/filter-options" "3.14.0"
+    "@lerna/listable" "3.14.0"
     "@lerna/output" "3.13.0"
 
-"@lerna/listable@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.13.0.tgz#babc18442c590b549cf0966d20d75fea066598d4"
-  integrity sha512-liYJ/WBUYP4N4MnSVZuLUgfa/jy3BZ02/1Om7xUY09xGVSuNVNEeB8uZUMSC+nHqFHIsMPZ8QK9HnmZb1E/eTA==
+"@lerna/listable@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.14.0.tgz#08f4c78e0466568e8e8a57d4ad09537f2bb7bbb9"
+  integrity sha512-ZK44Mo8xf/N97eQZ236SPSq0ek6+gk4HqHIx05foEMZVV1iIDH4a/nblLsJNjGQVsIdMYFPaqNJ0z+ZQfiJazQ==
   dependencies:
-    "@lerna/batch-packages" "3.13.0"
+    "@lerna/query-graph" "3.14.0"
     chalk "^2.3.1"
     columnify "^1.5.4"
 
@@ -1582,22 +1783,23 @@
     config-chain "^1.1.11"
     pify "^3.0.0"
 
-"@lerna/npm-dist-tag@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.13.0.tgz#49ecbe0e82cbe4ad4a8ea6de112982bf6c4e6cd4"
-  integrity sha512-mcuhw34JhSRFrbPn0vedbvgBTvveG52bR2lVE3M3tfE8gmR/cKS/EJFO4AUhfRKGCTFn9rjaSEzlFGYV87pemQ==
+"@lerna/npm-dist-tag@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.14.0.tgz#69b1f99ce9d777782afe646522cb14293d986eb5"
+  integrity sha512-DEyYEdufTGIC6E4RTJUsYPgqlz1Bs/XPeEQ5fd+ojWnICevj7dRrr2DfHucPiUCADlm2jbAraAQc3QPU0dXRhw==
   dependencies:
+    "@lerna/otplease" "3.14.0"
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.1.0"
     npm-registry-fetch "^3.9.0"
     npmlog "^4.1.2"
 
-"@lerna/npm-install@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.13.0.tgz#88f4cc39f4f737c8a8721256b915ea1bcc6a7227"
-  integrity sha512-qNyfts//isYQxore6fsPorNYJmPVKZ6tOThSH97tP0aV91zGMtrYRqlAoUnDwDdAjHPYEM16hNujg2wRmsqqIw==
+"@lerna/npm-install@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.13.3.tgz#9b09852732e51c16d2e060ff2fd8bfbbb49cf7ba"
+  integrity sha512-7Jig9MLpwAfcsdQ5UeanAjndChUjiTjTp50zJ+UZz4CbIBIDhoBehvNMTCL2G6pOEC7sGEg6sAqJINAqred6Tg==
   dependencies:
-    "@lerna/child-process" "3.13.0"
+    "@lerna/child-process" "3.13.3"
     "@lerna/get-npm-exec-opts" "3.13.0"
     fs-extra "^7.0.0"
     npm-package-arg "^6.1.0"
@@ -1605,28 +1807,38 @@
     signal-exit "^3.0.2"
     write-pkg "^3.1.0"
 
-"@lerna/npm-publish@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.13.0.tgz#5c74808376e778865ffdc5885fe83935e15e60c3"
-  integrity sha512-y4WO0XTaf9gNRkI7as6P2ItVDOxmYHwYto357fjybcnfXgMqEA94c3GJ++jU41j0A9vnmYC6/XxpTd9sVmH9tA==
+"@lerna/npm-publish@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.14.0.tgz#e3fc5613a2dd08cdd3323347ba87fad5dc5f11fb"
+  integrity sha512-ShG0qEnGkWxtjQvIRATgm/CzeoVaSyyoNRag5t8gDSR/r2u9ux72oROKQUEaE8OwcTS4rL2cyBECts8XMNmyYw==
   dependencies:
-    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/otplease" "3.14.0"
+    "@lerna/run-lifecycle" "3.14.0"
     figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
     libnpmpublish "^1.1.1"
+    npm-package-arg "^6.1.0"
     npmlog "^4.1.2"
     pify "^3.0.0"
     read-package-json "^2.0.13"
 
-"@lerna/npm-run-script@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.13.0.tgz#e5997f045402b9948bdc066033ebb36bf94fc9e4"
-  integrity sha512-hiL3/VeVp+NFatBjkGN8mUdX24EfZx9rQlSie0CMgtjc7iZrtd0jCguLomSCRHYjJuvqgbp+LLYo7nHVykfkaQ==
+"@lerna/npm-run-script@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.13.3.tgz#9bb6389ed70cd506905d6b05b6eab336b4266caf"
+  integrity sha512-qR4o9BFt5hI8Od5/DqLalOJydnKpiQFEeN0h9xZi7MwzuX1Ukwh3X22vqsX4YRbipIelSFtrDzleNVUm5jj0ow==
   dependencies:
-    "@lerna/child-process" "3.13.0"
+    "@lerna/child-process" "3.13.3"
     "@lerna/get-npm-exec-opts" "3.13.0"
     npmlog "^4.1.2"
 
+"@lerna/otplease@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-3.14.0.tgz#b539fd3e7a08452fc0db3b10010ca3cf0e4a73e7"
+  integrity sha512-rYAWzaYZ81bwnrmTkYWGgcc13bl/6DlG7pjWQWNGAJNLzO5zzj0xmXN5sMFJnNvDpSiS/ZS1sIuPvb4xnwLUkg==
+  dependencies:
+    "@lerna/prompt" "3.13.0"
+    figgy-pudding "^3.5.1"
+
 "@lerna/output@3.13.0":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989"
@@ -1634,27 +1846,29 @@
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/pack-directory@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.13.1.tgz#5ad4d0945f86a648f565e24d53c1e01bb3a912d1"
-  integrity sha512-kXnyqrkQbCIZOf1054N88+8h0ItC7tUN5v9ca/aWpx298gsURpxUx/1TIKqijL5TOnHMyIkj0YJmnH/PyBVLKA==
+"@lerna/pack-directory@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.14.0.tgz#229446c2e3f307a7932f2f779d7fb8b8ff7d93b0"
+  integrity sha512-E9PmC1oWYjYN8Z0Oeoj7X98NruMg/pcdDiRxnwJ5awnB0d/kyfoquHXCYwCQQFCnWUfto7m5lM4CSostcolEVQ==
   dependencies:
     "@lerna/get-packed" "3.13.0"
     "@lerna/package" "3.13.0"
-    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/run-lifecycle" "3.14.0"
     figgy-pudding "^3.5.1"
     npm-packlist "^1.4.1"
     npmlog "^4.1.2"
     tar "^4.4.8"
     temp-write "^3.4.0"
 
-"@lerna/package-graph@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.13.0.tgz#607062f8d2ce22b15f8d4a0623f384736e67f760"
-  integrity sha512-3mRF1zuqFE1HEFmMMAIggXy+f+9cvHhW/jzaPEVyrPNLKsyfJQtpTNzeI04nfRvbAh+Gd2aNksvaW/w3xGJnnw==
+"@lerna/package-graph@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.14.0.tgz#4ccdf446dccedfbbeb4efff3eb720cb6fcb109fc"
+  integrity sha512-dNpA/64STD5YXhaSlg4gT6Z474WPJVCHoX1ibsVIFu0fVgH609Y69bsdmbvTRdI7r6Dcu4ZfGxdR636RTrH+Eg==
   dependencies:
+    "@lerna/prerelease-id-from-version" "3.14.0"
     "@lerna/validation-error" "3.13.0"
     npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
     semver "^5.5.0"
 
 "@lerna/package@3.13.0":
@@ -1666,6 +1880,13 @@
     npm-package-arg "^6.1.0"
     write-pkg "^3.1.0"
 
+"@lerna/prerelease-id-from-version@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.14.0.tgz#d5da9c26ac4a0d0ecde09018f06e41ca4dd444c2"
+  integrity sha512-Ap3Z/dNhqQuSrKmK+JmzYvQYI2vowxHvUVxZJiDVilW8dyNnxkCsYFmkuZytk5sxVz4VeGLNPS2RSsU5eeSS+Q==
+  dependencies:
+    semver "^5.5.0"
+
 "@lerna/project@3.13.1":
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.13.1.tgz#bce890f60187bd950bcf36c04b5260642e295e79"
@@ -1692,29 +1913,29 @@
     inquirer "^6.2.0"
     npmlog "^4.1.2"
 
-"@lerna/publish@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.13.1.tgz#217e401dcb5824cdd6d36555a36303fb7520c514"
-  integrity sha512-KhCJ9UDx76HWCF03i5TD7z5lX+2yklHh5SyO8eDaLptgdLDQ0Z78lfGj3JhewHU2l46FztmqxL/ss0IkWHDL+g==
-  dependencies:
-    "@lerna/batch-packages" "3.13.0"
-    "@lerna/check-working-tree" "3.13.0"
-    "@lerna/child-process" "3.13.0"
-    "@lerna/collect-updates" "3.13.0"
-    "@lerna/command" "3.13.1"
-    "@lerna/describe-ref" "3.13.0"
+"@lerna/publish@3.14.1":
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.14.1.tgz#c1f7ad8d152947bb88a1755b4305a5a431d3e610"
+  integrity sha512-p+By/P84XJkndBzrmcnVLMcFpGAE+sQZCQK4e3aKQrEMLDrEwXkWt/XJxzeQskPxInFA/7Icj686LOADO7p0qg==
+  dependencies:
+    "@lerna/check-working-tree" "3.14.1"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/collect-updates" "3.14.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/describe-ref" "3.13.3"
     "@lerna/log-packed" "3.13.0"
     "@lerna/npm-conf" "3.13.0"
-    "@lerna/npm-dist-tag" "3.13.0"
-    "@lerna/npm-publish" "3.13.0"
+    "@lerna/npm-dist-tag" "3.14.0"
+    "@lerna/npm-publish" "3.14.0"
     "@lerna/output" "3.13.0"
-    "@lerna/pack-directory" "3.13.1"
+    "@lerna/pack-directory" "3.14.0"
+    "@lerna/prerelease-id-from-version" "3.14.0"
     "@lerna/prompt" "3.13.0"
     "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/run-lifecycle" "3.13.0"
-    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/run-topologically" "3.14.0"
     "@lerna/validation-error" "3.13.0"
-    "@lerna/version" "3.13.1"
+    "@lerna/version" "3.14.1"
     figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
     libnpmaccess "^3.0.1"
@@ -1724,7 +1945,6 @@
     p-finally "^1.0.0"
     p-map "^1.2.0"
     p-pipe "^1.2.0"
-    p-reduce "^1.0.0"
     pacote "^9.5.0"
     semver "^5.5.0"
 
@@ -1735,6 +1955,14 @@
   dependencies:
     npmlog "^4.1.2"
 
+"@lerna/query-graph@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-3.14.0.tgz#2abb36f445bd924d0f85ac7aec1445e9ef1e2c6c"
+  integrity sha512-6YTh3vDMW2hUxHdKeRvx4bosc9lZClKaN+DzC1XKTkwDbWrsjmEzLcemKL6QnyyeuryN2f/eto7P9iSe3z3pQQ==
+  dependencies:
+    "@lerna/package-graph" "3.14.0"
+    figgy-pudding "^3.5.1"
+
 "@lerna/resolve-symlink@3.13.0":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.13.0.tgz#3e6809ef53b63fe914814bfa071cd68012e22fbb"
@@ -1744,24 +1972,24 @@
     npmlog "^4.1.2"
     read-cmd-shim "^1.0.1"
 
-"@lerna/rimraf-dir@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.13.0.tgz#bb1006104b4aabcb6985624273254648f872b278"
-  integrity sha512-kte+pMemulre8cmPqljxIYjCmdLByz8DgHBHXB49kz2EiPf8JJ+hJFt0PzEubEyJZ2YE2EVAx5Tv5+NfGNUQyQ==
+"@lerna/rimraf-dir@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.13.3.tgz#3a8e71317fde853893ef0262bc9bba6a180b7227"
+  integrity sha512-d0T1Hxwu3gpYVv73ytSL+/Oy8JitsmvOYUR5ouRSABsmqS7ZZCh5t6FgVDDGVXeuhbw82+vuny1Og6Q0k4ilqw==
   dependencies:
-    "@lerna/child-process" "3.13.0"
+    "@lerna/child-process" "3.13.3"
     npmlog "^4.1.2"
     path-exists "^3.0.0"
     rimraf "^2.6.2"
 
-"@lerna/run-lifecycle@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.13.0.tgz#d8835ee83425edee40f687a55f81b502354d3261"
-  integrity sha512-oyiaL1biZdjpmjh6X/5C4w07wNFyiwXSSHH5GQB4Ay4BPwgq9oNhCcxRoi0UVZlZ1YwzSW8sTwLgj8emkIo3Yg==
+"@lerna/run-lifecycle@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.14.0.tgz#0499eca0e7f393faf4e24e6c8737302a9059c22b"
+  integrity sha512-GUM3L9MzGRSW0WQ8wbLW1+SYStU1OFjW0GBzShhBnFrO4nGRrU7VchsLpcLu0hk2uCzyhsrDKzifEdOdUyMoEQ==
   dependencies:
     "@lerna/npm-conf" "3.13.0"
     figgy-pudding "^3.5.1"
-    npm-lifecycle "^2.1.0"
+    npm-lifecycle "^2.1.1"
     npmlog "^4.1.2"
 
 "@lerna/run-parallel-batches@3.13.0":
@@ -1772,39 +2000,47 @@
     p-map "^1.2.0"
     p-map-series "^1.0.0"
 
-"@lerna/run@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.13.1.tgz#87e174c1d271894ddd29adc315c068fb7b1b0117"
-  integrity sha512-nv1oj7bsqppWm1M4ifN+/IIbVu9F4RixrbQD2okqDGYne4RQPAXyb5cEZuAzY/wyGTWWiVaZ1zpj5ogPWvH0bw==
+"@lerna/run-topologically@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-3.14.0.tgz#2a560cb657f0ef1565c680b6001b4b01b872dc07"
+  integrity sha512-y+KBpC1YExFzGynovt9MY4O/bc3RrJaKeuXieiPfKGKxrdtmZe/r33oj/xePTXZq65jnw3SaU3H8S5CrrdkwDg==
   dependencies:
-    "@lerna/batch-packages" "3.13.0"
-    "@lerna/command" "3.13.1"
-    "@lerna/filter-options" "3.13.0"
-    "@lerna/npm-run-script" "3.13.0"
+    "@lerna/query-graph" "3.14.0"
+    figgy-pudding "^3.5.1"
+    p-queue "^4.0.0"
+
+"@lerna/run@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.14.0.tgz#1a5d3330149fbf5092012707b775d5f57d9d0057"
+  integrity sha512-kGGFGLYPKozAN07CSJ7kOyLY6W3oLCQcxCathg1isSkBqQH29tWUg8qNduOlhIFLmnq/nf1JEJxxoXnF6IRLjQ==
+  dependencies:
+    "@lerna/command" "3.14.0"
+    "@lerna/filter-options" "3.14.0"
+    "@lerna/npm-run-script" "3.13.3"
     "@lerna/output" "3.13.0"
-    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/run-topologically" "3.14.0"
     "@lerna/timer" "3.13.0"
     "@lerna/validation-error" "3.13.0"
     p-map "^1.2.0"
 
-"@lerna/symlink-binary@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.13.0.tgz#36a9415d468afcb8105750296902f6f000a9680d"
-  integrity sha512-obc4Y6jxywkdaCe+DB0uTxYqP0IQ8mFWvN+k/YMbwH4G2h7M7lCBWgPy8e7xw/50+1II9tT2sxgx+jMus1sTJg==
+"@lerna/symlink-binary@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.14.0.tgz#db1c3204b83d91c4b43386302ee76cea4d20bc3f"
+  integrity sha512-AHFb4NlazxYmC+7guoamM3laIRbMSeKERMooKHJ7moe0ayGPBWsCGOH+ZFKZ+eXSDek+FnxdzayR3wf8B3LkTg==
   dependencies:
-    "@lerna/create-symlink" "3.13.0"
+    "@lerna/create-symlink" "3.14.0"
     "@lerna/package" "3.13.0"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
 
-"@lerna/symlink-dependencies@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.13.0.tgz#76c23ecabda7824db98a0561364f122b457509cf"
-  integrity sha512-7CyN5WYEPkbPLbqHBIQg/YiimBzb5cIGQB0E9IkLs3+racq2vmUNQZn38LOaazQacAA83seB+zWSxlI6H+eXSg==
+"@lerna/symlink-dependencies@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.14.0.tgz#f17e5cd704a0f067636038dafeaf42b5d2f28802"
+  integrity sha512-kuSXxwAWiVZqFcXfUBKH4yLUH3lrnGyZmCYon7UnZitw3AK3LQY7HvV2LNNw/oatfjOAiKhPBxnYjYijKiV4oA==
   dependencies:
-    "@lerna/create-symlink" "3.13.0"
+    "@lerna/create-symlink" "3.14.0"
     "@lerna/resolve-symlink" "3.13.0"
-    "@lerna/symlink-binary" "3.13.0"
+    "@lerna/symlink-binary" "3.14.0"
     fs-extra "^7.0.0"
     p-finally "^1.0.0"
     p-map "^1.2.0"
@@ -1822,21 +2058,23 @@
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/version@3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.13.1.tgz#5e919d13abb13a663dcc7922bb40931f12fb137b"
-  integrity sha512-WpfKc5jZBBOJ6bFS4atPJEbHSiywQ/Gcd+vrwaEGyQHWHQZnPTvhqLuq3q9fIb9sbuhH5pSY6eehhuBrKqTnjg==
-  dependencies:
-    "@lerna/batch-packages" "3.13.0"
-    "@lerna/check-working-tree" "3.13.0"
-    "@lerna/child-process" "3.13.0"
-    "@lerna/collect-updates" "3.13.0"
-    "@lerna/command" "3.13.1"
-    "@lerna/conventional-commits" "3.13.0"
-    "@lerna/github-client" "3.13.1"
+"@lerna/version@3.14.1":
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.14.1.tgz#df081fec70fcfdcd3c470648c49b035b44a373bf"
+  integrity sha512-H/jykoxVIt4oDEYkBgwDfO5dmZFl3G6vP1UEttRVP1FIkI+gCN+olby8S0Qd8XprDuR5OrLboiDWQs3p7nJhLw==
+  dependencies:
+    "@lerna/batch-packages" "3.14.0"
+    "@lerna/check-working-tree" "3.14.1"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/collect-updates" "3.14.0"
+    "@lerna/command" "3.14.0"
+    "@lerna/conventional-commits" "3.14.0"
+    "@lerna/github-client" "3.13.3"
     "@lerna/output" "3.13.0"
+    "@lerna/prerelease-id-from-version" "3.14.0"
     "@lerna/prompt" "3.13.0"
-    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/run-topologically" "3.14.0"
     "@lerna/validation-error" "3.13.0"
     chalk "^2.3.1"
     dedent "^0.7.0"
@@ -1871,42 +2109,53 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@octokit/endpoint@^3.2.0":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-3.2.3.tgz#bd9aea60cd94ce336656b57a5c9cb7f10be8f4f3"
-  integrity sha512-yUPCt4vMIOclox13CUxzuKiPJIFo46b/6GhUnUTw5QySczN1L0DtSxgmIZrZV4SAb9EyAqrceoyrWoYVnfF2AA==
+"@octokit/endpoint@^5.1.0":
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.1.4.tgz#e6bb3ceda8923fdc9703ded78c9acc28eff88c06"
+  integrity sha512-DypS8gbbcc9rlOCDW0wV9a+B18+ylduj6PpxeE+qa3IK1h5b0eW4CKj5pxxXWOZUYhEKwgOnh3+Q+Y/hx/bOPw==
   dependencies:
     deepmerge "3.2.0"
-    is-plain-object "^2.0.4"
-    universal-user-agent "^2.0.1"
+    is-plain-object "^3.0.0"
+    universal-user-agent "^2.1.0"
     url-template "^2.0.8"
 
 "@octokit/plugin-enterprise-rest@^2.1.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.1.tgz#47954271289cfc65607a8cfb0257f0d47fb2d486"
-  integrity sha512-Ssrh5D5uOqeS/Kjs6bbzn4ZaaaZQ2h6X/DgoDVv0Goa2ncpHwBN644hfYOL5ycigkpYbHKTjyb6cM49kPwQRPA==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.2.tgz#c0e22067a043e19f96ff9c7832e2a3019f9be75c"
+  integrity sha512-CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw==
 
-"@octokit/request@2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-2.4.2.tgz#87c36e820dd1e43b1629f4f35c95b00cd456320b"
-  integrity sha512-lxVlYYvwGbKSHXfbPk5vxEA8w4zHOH1wobado4a9EfsyD3Cbhuhus1w0Ye9Ro0eMubGO8kNy5d+xNFisM3Tvaw==
+"@octokit/request-error@^1.0.1", "@octokit/request-error@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.0.2.tgz#e6dbc5be13be1041ef8eca9225520982add574cf"
+  integrity sha512-T9swMS/Vc4QlfWrvyeSyp/GjhXtYaBzCcibjGywV4k4D2qVrQKfEMPy8OxMDEj7zkIIdpHwqdpVbKCvnUPqkXw==
   dependencies:
-    "@octokit/endpoint" "^3.2.0"
-    deprecation "^1.0.1"
-    is-plain-object "^2.0.4"
+    deprecation "^2.0.0"
+    once "^1.4.0"
+
+"@octokit/request@^4.0.1":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-4.1.0.tgz#e85dc377113baf2fe24433af8feb20e8a32e21b0"
+  integrity sha512-RvpQAba4i+BNH0z8i0gPRc1ShlHidj4puQjI/Tno6s+Q3/Mzb0XRSHJiOhpeFrZ22V7Mwjq1E7QS27P5CgpWYA==
+  dependencies:
+    "@octokit/endpoint" "^5.1.0"
+    "@octokit/request-error" "^1.0.1"
+    deprecation "^2.0.0"
+    is-plain-object "^3.0.0"
     node-fetch "^2.3.0"
     once "^1.4.0"
-    universal-user-agent "^2.0.1"
+    universal-user-agent "^2.1.0"
 
 "@octokit/rest@^16.16.0":
-  version "16.18.1"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.18.1.tgz#e6cbf111a8afc3d5ad44c98edf264124f1568ea0"
-  integrity sha512-ozKUH4KCusmPQ6xHxF2q1IDVM5tPbmmAUP69yRLd98BH16mqOVwMkm6zLCUJPD03IVhG+YNHShJDc077CTkIWg==
+  version "16.27.3"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.27.3.tgz#20ad5d0c7043364d1e1f72fa74f825c181771fc0"
+  integrity sha512-WWH/SHF4kus6FG+EAfX7/JYH70EjgFYa4AAd2Lf1hgmgzodhrsoxpXPSZliZ5BdJruZPMP7ZYaPoTrYCCKYzmQ==
   dependencies:
-    "@octokit/request" "2.4.2"
+    "@octokit/request" "^4.0.1"
+    "@octokit/request-error" "^1.0.2"
+    atob-lite "^2.0.0"
     before-after-hook "^1.4.0"
     btoa-lite "^1.0.0"
-    deprecation "^1.0.1"
+    deprecation "^2.0.0"
     lodash.get "^4.4.2"
     lodash.set "^4.3.2"
     lodash.uniq "^4.5.0"
@@ -1915,24 +2164,23 @@
     universal-user-agent "^2.0.0"
     url-template "^2.0.8"
 
-"@react-navigation/core@3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.2.0.tgz#329dfe54f305ee22ed750d51cb09c5d18562d56f"
-  integrity sha512-MXjTqqPFbifXGlws4hSye9Ax4dEM2OvV7VMEJOJU9TbzQjyewi59Cjplbt8pYQ5ummvkKeRS2FlQYIygNR5oCQ==
+"@react-navigation/core@~3.4.1":
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.4.2.tgz#bec563e94fde40fbab3730cdc97f22afbb2a1498"
+  integrity sha512-7G+iDzLSTeOUU4vVZeRZKJ+Bd7ds7ZxYNqZcB8i0KlBeQEQfR74Ounfu/p0KIEq2RiNnaE3QT7WVP3C87sebzw==
   dependencies:
-    create-react-context "0.2.2"
-    hoist-non-react-statics "^2.5.5"
+    hoist-non-react-statics "^3.3.0"
     path-to-regexp "^1.7.0"
-    query-string "^6.2.0"
-    react-is "^16.6.3"
+    query-string "^6.4.2"
+    react-is "^16.8.6"
 
-"@react-navigation/native@~3.3.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.3.0.tgz#def7a94ef17581a404a3de2a3200f986e999dac1"
-  integrity sha512-w/+2B0qX441BpNkYb5QoPY8+Q4Q18adGTahVpc6o8Juj6odAxyIJ2RozXk7dCpN/w0dz4B+5ggqMKHVniE6K7w==
+"@react-navigation/native@~3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.5.0.tgz#f5d16e0845ac26d1147d1caa481f18a00740e7ae"
+  integrity sha512-TmGOis++ejEXG3sqNJhCSKqB0/qLu3FQgDtO959qpqif36R/diR8SQwJqeSdofoEiK3CepdhFlTCeHdS1/+MsQ==
   dependencies:
     hoist-non-react-statics "^3.0.1"
-    react-native-safe-area-view "^0.13.0"
+    react-native-safe-area-view "^0.14.1"
     react-native-screens "^1.0.0 || ^1.0.0-alpha"
 
 "@react-slate/components@0.2.0":
@@ -2001,15 +2249,48 @@
     passport-oauth2 "1.x.x"
     underscore "^1.7.0"
 
+"@types/babel__core@^7.1.0":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
+  integrity sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
+  integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2"
+  integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/bcryptjs@^2.4.2":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.2.tgz#e3530eac9dd136bfdfb0e43df2c4c5ce1f77dfae"
   integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
 
 "@types/bluebird@*":
-  version "3.5.26"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.26.tgz#a38c438ae84fa02431d6892edf86e46edcbca291"
-  integrity sha512-aj2mrBLn5ky0GmAg6IPXrQjnN0iB/ulozuJ+oZdrHRAzRbXjGmu4UXsNCjFvPbSaaPZmniocdOzsM392qLOlmQ==
+  version "3.5.27"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.27.tgz#61eb4d75dc6bfbce51cf49ee9bbebe941b2cb5d0"
+  integrity sha512-6BmYWSBea18+tSjjSC3QIyV93ZKAeNWGM7R6aYt1ryTZXrlHF+QLV0G2yV0viEGVyRkyQsWfMoJ0k/YghBX5sQ==
 
 "@types/body-parser@*":
   version "1.17.0"
@@ -2045,13 +2326,6 @@
   resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.1.tgz#90b68446364baf9efd8e8349bb36bd3852b75b80"
   integrity sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==
 
-"@types/cross-spawn@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.0.tgz#320aaf1d1a12979f1b84fe7a5590a7e860bf3a80"
-  integrity sha512-evp2ZGsFw9YKprDbg8ySgC9NA15g3YgiI8ANkGmKKvvi0P2aDGYLPxQIC5qfeKNUOe3TjABVGuah6omPRpIYhg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -2076,9 +2350,9 @@
     "@types/react-native-vector-icons" "*"
 
 "@types/express-serve-static-core@*":
-  version "4.16.1"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz#35df7b302299a4ab138a643617bd44078e74d44e"
-  integrity sha512-QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA==
+  version "4.16.7"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz#50ba6f8a691c08a3dd9fa7fba25ef3133d298049"
+  integrity sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==
   dependencies:
     "@types/node" "*"
     "@types/range-parser" "*"
@@ -2092,9 +2366,9 @@
     "@types/node" "*"
 
 "@types/express@*":
-  version "4.16.1"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.1.tgz#d756bd1a85c34d87eaf44c888bad27ba8a4b7cf0"
-  integrity sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287"
+  integrity sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -2105,7 +2379,7 @@
   resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
   integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
 
-"@types/glob@*":
+"@types/glob@*", "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
   integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
@@ -2152,15 +2426,37 @@
   resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.29.tgz#aa845204cd0a289f65d47e0de63a6a815e30cc66"
   integrity sha512-lRVw09gOvgviOfeUrKc/pmTiRZ7g7oDOU6OAutyuSHpm1/o2RaBQvRhgK8QEdu+FFuw/wnWb29A/iuxv9i8OpQ==
 
-"@types/istanbul-lib-coverage@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#2cc2ca41051498382b43157c8227fea60363f94a"
-  integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
+  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
 
-"@types/jest@^23.3.1":
-  version "23.3.14"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.14.tgz#37daaf78069e7948520474c87b80092ea912520a"
-  integrity sha512-Q5hTcfdudEL2yOmluA1zaSyPbzWPmJ3XfSWeP3RyoYvS9hnje1ZyagrZOuQ6+1nQC1Gw+7gap3pLNL3xL6UBug==
+"@types/istanbul-lib-report@*":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
+  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
+  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+    "@types/istanbul-lib-report" "*"
+
+"@types/jest-diff@*":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
+  integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==
+
+"@types/jest@^24.0.13":
+  version "24.0.13"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.13.tgz#10f50b64cb05fb02411fbba49e9042a3a11da3f9"
+  integrity sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==
+  dependencies:
+    "@types/jest-diff" "*"
 
 "@types/jsdom@^12.2.0":
   version "12.2.3"
@@ -2194,9 +2490,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.112":
-  version "4.14.123"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
-  integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
+  version "4.14.134"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.134.tgz#9032b440122db3a2a56200e91191996161dde5b9"
+  integrity sha512-2/O0khFUCFeDlbi7sZ7ZFRCcT812fAeOLm7Ev4KbwASkZ575TDrDcY7YyaoHdTOzKcNbfiwLYZqPmoC4wadrsw==
 
 "@types/mime@*":
   version "2.0.1"
@@ -2216,19 +2512,19 @@
     "@types/node" "*"
 
 "@types/mocha@^5.2.5":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.6.tgz#b8622d50557dd155e9f2f634b7d68fd38de5e94b"
-  integrity sha512-1axi39YdtBI7z957vdqXI4Ac25e7YihYQtJa+Clnxg1zTJEaIRbndt71O3sP4GAMgiAm0pY26/b9BrY4MR/PMw==
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
+  integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
 
 "@types/node@*":
-  version "11.11.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.3.tgz#7c6b0f8eaf16ae530795de2ad1b85d34bf2f5c58"
-  integrity sha512-wp6IOGu1lxsfnrD+5mX6qwSwWuqsdkKKxTN4aQc4wByHAKZJf9/D4KXPQ1POUjEbnCP5LMggB0OEFNY9OTsMqg==
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
+  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
 
 "@types/nodemailer@^4.6.2":
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-4.6.6.tgz#2ce2bde5dd5bb4546e11390e1babd80ba35e2154"
-  integrity sha512-N2czhXs7fbQhvoquEGzmHAWttnxLfrM3+cWMRFX4hTQq4GE3VyaSE3MOOse4VoNgvtti/H5ow/Hq9KXu/UMWqA==
+  version "4.6.8"
+  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-4.6.8.tgz#c14356e799fe1d4ee566126f901bc6031cc7b1b5"
+  integrity sha512-IX1P3bxDP1VIdZf6/kIWYNmSejkYm9MOyMEtoDFi4DVzKjJ3kY4GhOcOAKs6lZRjqVVmF9UjPOZXuQczlpZThw==
   dependencies:
     "@types/node" "*"
 
@@ -2307,19 +2603,19 @@
     "@types/express" "*"
 
 "@types/pdfmake@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@types/pdfmake/-/pdfmake-0.1.3.tgz#0f16bd71fc2ff1b9bed3b4ad042fd7119f08ae7e"
-  integrity sha512-b6/notpoQg/jXnbDMImRj/c7GUDzpvC2DF1gtatJlvQ7JXI4O5t3KlgW5F9xCLjd//7RtyoiTcD8gQshMj1pzQ==
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@types/pdfmake/-/pdfmake-0.1.7.tgz#7f4fa9e8925240a6eee8ded5c8a26e20eb0f59c3"
+  integrity sha512-UEfT5yAnydLwrEWGuAq+lw2K6uyd6fDtBh3R/1/oLRHHjahmiduWmTU+zBM7ZygCSUg7URg69o41vbEXGZ62Yw==
 
 "@types/prop-types@*":
-  version "15.7.0"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.0.tgz#4c48fed958d6dcf9487195a0ef6456d5f6e0163a"
-  integrity sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg==
+  version "15.7.1"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
+  integrity sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==
 
 "@types/qs@^6.5.1":
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.5.2.tgz#7f347062655056662845ba4bb79dcbfdc382cd61"
-  integrity sha512-47kAAs3yV/hROraCTQYDMh4p/6zI9+gtssjD0kq9OWsGdLcBge59rl49FnCuJ+iWxEKiqFz6KXzeGH5DRVjNJA==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.5.3.tgz#1c3b71b091eaeaf5924538006b7f70603ce63d38"
+  integrity sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==
 
 "@types/range-parser@*":
   version "1.2.3"
@@ -2327,9 +2623,9 @@
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
 "@types/react-dom@^16.8.0":
-  version "16.8.2"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.2.tgz#9bd7d33f908b243ff0692846ef36c81d4941ad12"
-  integrity sha512-MX7n1wq3G/De15RGAAqnmidzhr2Y9O/ClxPxyqaNg96pGyeXUYPSvujgzEVpLo9oIP4Wn1UETl+rxTN02KEpBw==
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.4.tgz#7fb7ba368857c7aa0f4e4511c4710ca2c5a12a88"
+  integrity sha512-eIRpEW73DCzPIMaNBDP5pPIpK1KXyZwNgfxiVagb5iGiz6da+9A5hslSX6GAQKdO7SayVCS/Fr2kjqprgAvkfA==
   dependencies:
     "@types/react" "*"
 
@@ -2357,17 +2653,17 @@
     "@types/react-native" "*"
 
 "@types/react-native-vector-icons@*":
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/@types/react-native-vector-icons/-/react-native-vector-icons-4.6.4.tgz#83c2d88f0c2615a44b9059eb75c11f92702c1ee2"
-  integrity sha512-G2JD98lrgjggA979WeTXlj6He1sN4Skpd4UJlcVDsD71u1yHf8raT9D7OP4vb3LZWX6ILYkVa4dzLtVkt4wyWA==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.1.tgz#d0862f3eb97bbe5720ab604f2f10ee07dacb31ef"
+  integrity sha512-2C9jyyJKEjzX0C4nP+9rNNjEhutWwalkRdaSTEYtNjUkkkTk68WGG2hgjrcBjdm4Gn1Vi9OgUd+FR8GNmCyp+A==
   dependencies:
     "@types/react" "*"
     "@types/react-native" "*"
 
 "@types/react-native@*":
-  version "0.57.40"
-  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.40.tgz#a227acb6b2c7372cb678202df4cfe716ace9ce94"
-  integrity sha512-nCcF9gNYp/VeV5QBtHbn/VnXZG+T8EsMxZFx8qqZfBe1gxJUsldXgOXYd1kcrrYzUX0LqG/KipDBX++fB2qQ0g==
+  version "0.57.60"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.60.tgz#61e97a84e2f64ed971e7d238bb30cec188898235"
+  integrity sha512-zObrnRsCbpM7qDm97d8+5qiSIMMYRaWgpqu6orjbjzLUAcJaKnpBMXgW6bRXWkFBjHgm3hjDAdVVGMWlrYJBdw==
   dependencies:
     "@types/prop-types" "*"
     "@types/react" "*"
@@ -2380,25 +2676,25 @@
     "@types/react" "*"
 
 "@types/react-navigation@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/react-navigation/-/react-navigation-3.0.5.tgz#0543fcaa590c994a65fa92a1a88e0269e7600a2f"
-  integrity sha512-LYQRe/tz8Moo35eN8QmNN5jKbQMrDGOEhzFjsT3K2inHnRQUknN38+L3xtN1wcBwI2576Vw4hpi9E79pBaU+8A==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/react-navigation/-/react-navigation-3.0.7.tgz#5d327b00de2bb58203977002c3ea21302da72034"
+  integrity sha512-JFsNeCAQEQGTpObiD1QczDyCyQkFBaQA/F85Fo2W8QML1b6UNYHlUDtEYJA6jcfXqPoL15dVPBVj9NBJlHToqA==
   dependencies:
     "@types/react" "*"
     "@types/react-native" "*"
 
 "@types/react-redux@^6.0.4":
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-6.0.13.tgz#490ace7b49e57281edf85671bb455b31cdfa7d0b"
-  integrity sha512-69lPYT69CSvzQ75Ut4MfT+oQU9TAjCycdL6BQOrPztqbzdhzSe1d4Qj8vrMkTOm454Xz151zh+YT6S4t2OBopw==
+  version "6.0.14"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-6.0.14.tgz#8ffeb52c4f4d578bf74418d9aff5af7289924e4f"
+  integrity sha512-bvpWqBOvz2V+EfZ9Qu1d3gFKYCIn/BYoGWAVt1c526tbiI9rtfaBbjutbbapmtEZaEfLuHj3Ljg9qho0SBSwUg==
   dependencies:
     "@types/react" "*"
     redux "^4.0.0"
 
 "@types/react-router-dom@^4.2.7":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.1.tgz#71fe2918f8f60474a891520def40a63997dafe04"
-  integrity sha512-GbztJAScOmQ/7RsQfO4cd55RuH1W4g6V1gDW3j4riLlt+8yxYLqqsiMzmyuXBLzdFmDtX/uU2Bpcm0cmudv44A==
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.3.tgz#7837e3e9fefbc84a8f6c8a51dca004f4e83e94e3"
+  integrity sha512-xj0DmFjgvAqRfh/kJPO7apD5G30yPQe+8slu/dugioQOkdKpyzc4Fgk4hoTelm6CSHz7pI2PPsW5+Y6GRBF2zw==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
@@ -2415,17 +2711,17 @@
     redux ">= 3.7.2"
 
 "@types/react-router@*":
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.4.5.tgz#1166997dc7eef2917b5ebce890ebecb32ee5c1b3"
-  integrity sha512-12+VOu1+xiC8RPc9yrgHCyLI79VswjtuqeS2gPrMcywH6tkc8rGIUhs4LaL3AJPqo5d+RPnfRpNKiJ7MK2Qhcg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.0.1.tgz#9f4548c75755c55b0cffdd743080e5afa87da6dd"
+  integrity sha512-vOyVO0u3Cs0w6G5DzYqNVqcTsurEnDgOmmkJf2s7VwtunWzpPgI6dHsCBX68vXqeICpP6jCfojgJcHkm5BV7hQ==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
 
 "@types/react-slick@^0.23.3":
-  version "0.23.3"
-  resolved "https://registry.yarnpkg.com/@types/react-slick/-/react-slick-0.23.3.tgz#c9d14323a75f54f46a652fb745fe553aad091ce0"
-  integrity sha512-B6wU5ynINOolrByhoeJ448qZPjCFPcuhyQI5sjihjG8gQJuoTH6a4YQhuDm4umvbRVielJQANhptc8hmxA85IA==
+  version "0.23.4"
+  resolved "https://registry.yarnpkg.com/@types/react-slick/-/react-slick-0.23.4.tgz#c97e2a9e7e3d1933c68593b8e82752fab1e8ce53"
+  integrity sha512-vXoIy4GUfB7/YgqubR4H7RALo+pRdMYCeLgWwV3MPwl5pggTlEkFBTF19R7u+LJc85uMqC7RfsbkqPLMQ4ab+A==
   dependencies:
     "@types/react" "*"
 
@@ -2437,9 +2733,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@^16.4.6":
-  version "16.8.8"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.8.tgz#4b60a469fd2469f7aa6eaa0f8cfbc51f6d76e662"
-  integrity sha512-xwEvyet96u7WnB96kqY0yY7qxx/pEpU51QeACkKFtrgjjXITQn0oO1iwPEraXVgh10ZFPix7gs1R4OJXF7P5sg==
+  version "16.8.19"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.19.tgz#629154ef05e2e1985cdde94477deefd823ad9be3"
+  integrity sha512-QzEzjrd1zFzY9cDlbIiFvdr+YUmefuuRYrPxmkwG0UQv5XF35gFIi7a95m1bNVcFU0VimxSZ5QVGSiBmlggQXQ==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -2462,6 +2758,11 @@
   resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-0.0.29.tgz#8093ee0416a6e2bf2aa6338109114b3fbffa0e9b"
   integrity sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=
 
+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
 "@types/superagent@*":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.1.tgz#61f0b43d7db93a3c286c124512b7c228183c32fa"
@@ -2506,10 +2807,10 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/yargs@^12.0.9":
-  version "12.0.9"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
-  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
+"@types/yargs@^12.0.2", "@types/yargs@^12.0.9":
+  version "12.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
+  integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==
 
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
@@ -2657,6 +2958,13 @@
     "@webassemblyjs/wast-parser" "1.8.5"
     "@xtuc/long" "4.2.2"
 
+"@wry/equality@^0.1.2":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
+  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
+  dependencies:
+    tslib "^1.9.3"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -2697,13 +3005,13 @@ absolute-path@^0.0.0:
   resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
   integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c=
 
-accepts@~1.3.3, accepts@~1.3.4, accepts@~1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
-    mime-types "~2.1.18"
-    negotiator "0.6.1"
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
 
 acorn-dynamic-import@^4.0.0:
   version "4.0.0"
@@ -2711,9 +3019,9 @@ acorn-dynamic-import@^4.0.0:
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
 acorn-globals@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
-  integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
+  integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
@@ -2758,9 +3066,9 @@ add-stream@^1.0.0:
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
 address@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
-  integrity sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709"
+  integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==
 
 adjust-sourcemap-loader@^1.1.0:
   version "1.2.0"
@@ -2775,7 +3083,14 @@ adjust-sourcemap-loader@^1.1.0:
     object-path "^0.9.2"
     regex-parser "^2.2.9"
 
-agent-base@4, agent-base@^4.1.0, agent-base@~4.2.1:
+agent-base@4, agent-base@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -2934,13 +3249,6 @@ ansi@^0.3.0, ansi@~0.3.1:
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
 
-ant-design-palettes@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/ant-design-palettes/-/ant-design-palettes-1.1.3.tgz#84119b1a4d86363adc52a38d587e65336a0a27dd"
-  integrity sha512-UpkkTp8egEN21KZNvY7sTcabLlkHvLvS71EVPk4CYi77Z9AaGGCaVn7i72tbOgWDrQp2wjIg8WgMbKBdK7GtWA==
-  dependencies:
-    tinycolor2 "^1.4.1"
-
 antd-mobile-rn@^2.2.1:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/antd-mobile-rn/-/antd-mobile-rn-2.3.3.tgz#be386da77b763737365ca68abb258bf6816783b3"
@@ -2964,19 +3272,18 @@ antd-mobile-rn@^2.2.1:
     utility-types "^2.1.0"
 
 antd@^3.10.0:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-3.15.0.tgz#af187ce62902edf261d7251fc9105407527fad9d"
-  integrity sha512-gSoVmQN7rfYmhfpv0dL2sL9gk0Pu9JHgGiExjLJZaSnbPjpCOTAYjIzxG/oo8GzCSeK5abgN5F1saWR5ggLVFQ==
+  version "3.19.2"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-3.19.2.tgz#18829f7bbc6acb3f4b43a77349c2bf2c3e733408"
+  integrity sha512-s1nFRNXQiNZpUfIpyQN89OBrZg9hz2qgPiBeR5b/GgMacHRNzB4sOAD3XBUYeojmUo2UkOgZOUL9jTdiUOf2ZA==
   dependencies:
-    "@ant-design/icons" "~1.2.0"
-    "@ant-design/icons-react" "~1.1.2"
+    "@ant-design/create-react-context" "^0.2.4"
+    "@ant-design/icons" "~2.0.0"
+    "@ant-design/icons-react" "~2.0.0"
     "@types/react-slick" "^0.23.3"
     array-tree-filter "^2.1.0"
     babel-runtime "6.x"
     classnames "~2.2.6"
     copy-to-clipboard "^3.0.8"
-    create-react-class "^15.6.3"
-    create-react-context "0.2.2"
     css-animation "^1.5.0"
     dom-closest "^0.2.0"
     enquire.js "^2.1.6"
@@ -2986,37 +3293,38 @@ antd@^3.10.0:
     prop-types "^15.6.2"
     raf "^3.4.0"
     rc-animate "^2.5.4"
-    rc-calendar "~9.10.3"
+    rc-calendar "~9.14.0"
     rc-cascader "~0.17.0"
     rc-checkbox "~2.1.5"
     rc-collapse "~1.11.1"
-    rc-dialog "~7.3.0"
-    rc-drawer "~1.7.6"
+    rc-dialog "~7.4.0"
+    rc-drawer "~1.9.3"
     rc-dropdown "~2.4.1"
     rc-editor-mention "^1.1.7"
     rc-form "^2.4.0"
     rc-input-number "~4.4.0"
+    rc-mentions "~0.3.1"
     rc-menu "~7.4.12"
     rc-notification "~3.3.0"
-    rc-pagination "~1.17.7"
+    rc-pagination "~1.20.1"
     rc-progress "~2.3.0"
     rc-rate "~2.5.0"
-    rc-select "~9.0.0"
+    rc-select "~9.1.0"
     rc-slider "~8.6.5"
-    rc-steps "~3.3.0"
+    rc-steps "~3.4.1"
     rc-switch "~1.9.0"
-    rc-table "~6.4.0"
+    rc-table "~6.5.0"
     rc-tabs "~9.6.0"
     rc-time-picker "~3.6.1"
     rc-tooltip "~3.7.3"
-    rc-tree "~1.14.6"
-    rc-tree-select "~2.6.0"
+    rc-tree "~2.1.0"
+    rc-tree-select "~2.9.1"
     rc-trigger "^2.6.2"
     rc-upload "~2.6.0"
     rc-util "^4.5.1"
     react-lazy-load "^3.0.13"
     react-lifecycles-compat "^3.0.4"
-    react-slick "~0.23.2"
+    react-slick "~0.24.0"
     resize-observer-polyfill "^1.5.0"
     shallowequal "^1.1.0"
     warning "~4.0.2"
@@ -3040,12 +3348,13 @@ anymatch@^2.0.0:
     normalize-path "^2.1.1"
 
 apollo-utilities@^1.0.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
-  integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
+  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
   dependencies:
+    "@wry/equality" "^0.1.2"
     fast-json-stable-stringify "^2.0.0"
-    ts-invariant "^0.2.1"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
 append-transform@^0.4.0:
@@ -3270,10 +3579,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1, assert@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
   dependencies:
+    object-assign "^4.1.1"
     util "0.10.3"
 
 assertion-error@^1.1.0:
@@ -3297,9 +3607,9 @@ astral-regex@^1.0.0:
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
-  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-foreach@^0.1.3:
   version "0.1.3"
@@ -3328,7 +3638,7 @@ async@^1.5.0, async@^1.5.2, async@~1.5:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.1.4, async@^2.3.0, async@^2.4.0, async@^2.5.0:
+async@^2.1.4, async@^2.3.0, async@^2.4.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
@@ -3345,6 +3655,11 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+atob-lite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
+  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
+
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -3370,15 +3685,16 @@ autoprefixer@^8.3.0:
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.0.tgz#7e51d0355c11596e6cf9a0afc9a44e86d1596c70"
-  integrity sha512-hMKcyHsZn5+qL6AUeP3c8OyuteZ4VaUlg+fWbyl8z7PqsKHF/Bf8/px3K6AT8aMzDkBo8Bc11245MM+itDBOxQ==
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.0.tgz#0111c6bde2ad20c6f17995a33fad7cf6854b4c87"
+  integrity sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==
   dependencies:
-    browserslist "^4.4.2"
-    caniuse-lite "^1.0.30000947"
+    browserslist "^4.6.1"
+    caniuse-lite "^1.0.30000971"
+    chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.14"
+    postcss "^7.0.16"
     postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.7.0:
@@ -3614,15 +3930,28 @@ babel-jest@^23.6.0:
     babel-plugin-istanbul "^4.1.6"
     babel-preset-jest "^23.2.0"
 
+babel-jest@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"
+  integrity sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==
+  dependencies:
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/babel__core" "^7.1.0"
+    babel-plugin-istanbul "^5.1.0"
+    babel-preset-jest "^24.6.0"
+    chalk "^2.4.2"
+    slash "^2.0.0"
+
 babel-loader@^8.0.2:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz#225322d7509c2157655840bba52e46b6c2f2fe33"
-  integrity sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
+  integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
   dependencies:
     find-cache-dir "^2.0.0"
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
-    util.promisify "^1.0.0"
+    pify "^4.0.1"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -3639,9 +3968,9 @@ babel-plugin-check-es2015-constants@6.22.0, babel-plugin-check-es2015-constants@
     babel-runtime "^6.22.0"
 
 babel-plugin-import@^1.7.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.11.0.tgz#78ac908e6b225206babb734e19eae5f78d6d1035"
-  integrity sha512-de9dWdU1YjmWRPYurlHRKD2hTd24z0bIQ0/JgyXqLMXML+TsvEkVhtqzOsNtu9MmCuvwBiTTTjZBbZXA1Xu7TQ==
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.12.0.tgz#12d50950aecfd8de3f10880730221f0f0843a755"
+  integrity sha512-3Fo7sJ2Hm71y1VJS7eMA/E7J5+roKJmzwia5BxzUQREBs6CRylwtvQq8m39W8nplG4Y7rZwOCndh5MzRTSmHpA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/runtime" "^7.0.0"
@@ -3656,11 +3985,27 @@ babel-plugin-istanbul@^4.1.6:
     istanbul-lib-instrument "^1.10.1"
     test-exclude "^4.2.1"
 
+babel-plugin-istanbul@^5.1.0:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz#841d16b9a58eeb407a0ddce622ba02fe87a752ba"
+  integrity sha512-dySz4VJMH+dpndj0wjJ8JPs/7i1TdSPb1nRrn56/92pKOF9VKC1FMFJmMXjzlGGusnCAqujP6PBCiKq0sVA+YQ==
+  dependencies:
+    find-up "^3.0.0"
+    istanbul-lib-instrument "^3.3.0"
+    test-exclude "^5.2.3"
+
 babel-plugin-jest-hoist@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
   integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
 
+babel-plugin-jest-hoist@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"
+  integrity sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==
+  dependencies:
+    "@types/babel__traverse" "^7.0.6"
+
 babel-plugin-minify-builtins@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
@@ -3746,6 +4091,11 @@ babel-plugin-module-resolver@^3.1.1:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
+babel-plugin-react-native-web@^0.9.6:
+  version "0.9.13"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.9.13.tgz#20d76e8e78815582b3d983efa19b3116168e7784"
+  integrity sha512-cgHJcA+jDIcEH0g0JSCjRxGlKIMVR5GWCgVSFwfjIP1HCvjFOtjUWGHPEnlMShp9mHl/WtL2v59sRWzVnoK3CA==
+
 babel-plugin-styled-components@^1.3.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.0.tgz#ff1f42ad2cc78c21f26b62266b8f564dbc862939"
@@ -4053,12 +4403,15 @@ babel-polyfill@^6.23.0, babel-polyfill@^6.26.0:
     regenerator-runtime "^0.10.5"
 
 babel-preset-expo@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-5.0.0.tgz#d1569579c7326391d589b031ed688061f959e378"
-  integrity sha512-pDtkAIafvQLAZ5dQ/6I9okkiZLw9IBR8ItRzAyUO4j2rUMB9ey6yZTTE77AKWq5HhxhY53Hic8Zl0vSDMTXI0A==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-5.1.1.tgz#2fb9e14013ee872b1716d857e3c583981a47e3b9"
+  integrity sha512-aboINGtepZW4s5IKu9dpNY7RUzTlM4S55xw2cuQ39DiEWY1fr8TsbLyK4lMC5LXrGhoTGypnn85/Y4yPEdnK5g==
   dependencies:
+    "@babel/core" "^7.1.0"
     "@babel/plugin-proposal-decorators" "^7.1.0"
+    "@babel/preset-env" "^7.3.1"
     babel-plugin-module-resolver "^3.1.1"
+    babel-plugin-react-native-web "^0.9.6"
     metro-react-native-babel-preset "^0.49.0"
 
 babel-preset-fbjs@2.3.0, babel-preset-fbjs@^2.1.2:
@@ -4110,6 +4463,14 @@ babel-preset-jest@^23.2.0:
     babel-plugin-jest-hoist "^23.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
+babel-preset-jest@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984"
+  integrity sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==
+  dependencies:
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    babel-plugin-jest-hoist "^24.6.0"
+
 babel-preset-minify@^0.5.0-alpha.5a128fd5:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz#e25bb8d3590087af02b650967159a77c19bfb96b"
@@ -4231,6 +4592,11 @@ base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.2.3:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
   integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
+base64url@3.x.x:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
+  integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
+
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -4274,9 +4640,9 @@ before-after-hook@^1.4.0:
   integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==
 
 big-integer@^1.6.7:
-  version "1.6.42"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.42.tgz#91623ae5ceeff9a47416c56c9440a66f12f534f1"
-  integrity sha512-3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q==
+  version "1.6.43"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.43.tgz#8ac15bf13e93e509500859061233e19d8d0d99d1"
+  integrity sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==
 
 big.js@^3.1.3:
   version "3.2.0"
@@ -4289,9 +4655,9 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
-  integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 block-stream@*:
   version "0.0.9"
@@ -4301,9 +4667,9 @@ block-stream@*:
     inherits "~2.0.0"
 
 bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
+  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
 
 blueimp-md5@^2.5.0:
   version "2.10.0"
@@ -4315,7 +4681,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@1.18.3, body-parser@^1.15.2, body-parser@^1.18.3:
+body-parser@1.18.3:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
   integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
@@ -4331,6 +4697,22 @@ body-parser@1.18.3, body-parser@^1.15.2, body-parser@^1.18.3:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
+body-parser@1.19.0, body-parser@^1.15.2, body-parser@^1.18.3:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
@@ -4489,23 +4871,14 @@ browserslist@^3.2.8:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.3.4:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2"
-  integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==
-  dependencies:
-    caniuse-lite "^1.0.30000939"
-    electron-to-chromium "^1.3.113"
-    node-releases "^1.1.8"
-
-browserslist@^4.4.2:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.1.tgz#2226cada1947b33f4cfcf7b608dcb519b6128106"
-  integrity sha512-/pPw5IAUyqaQXGuD5vS8tcbudyPZ241jk1W5pQBsGDfcjNQt7p8qxZhgMNuygDShte1PibLFexecWUPgmVLfrg==
+browserslist@^4.6.0, browserslist@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
   dependencies:
-    caniuse-lite "^1.0.30000949"
-    electron-to-chromium "^1.3.116"
-    node-releases "^1.1.11"
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -4616,6 +4989,11 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
@@ -4635,7 +5013,7 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.2.0, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -4734,6 +5112,11 @@ callsites@^2.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
   integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -4780,24 +5163,19 @@ camelcase@^4.1.0:
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
-  integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelize@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
   integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000939:
-  version "1.0.30000948"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000948.tgz#793ed7c28fe664856beb92b43fc013fc22b81633"
-  integrity sha512-Lw4y7oz1X5MOMZm+2IFaSISqVVQvUuD+ZUSfeYK/SlYiMjkHN/eJ2PDfJehW5NA6JjrxYSSnIWfwjeObQMEjFQ==
-
-caniuse-lite@^1.0.30000947, caniuse-lite@^1.0.30000949:
-  version "1.0.30000950"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000950.tgz#8c559d66e332b34e919d1086cc6d29c1948856ae"
-  integrity sha512-Cs+4U9T0okW2ftBsCIHuEYXXkki7mjXmjCh4c6PzYShk04qDEr76/iC7KwhLoWoY65wcra1XOsRD+S7BptEb5A==
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000971:
+  version "1.0.30000974"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
+  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
 
 canvas-prebuilt@^1.6.5-prerelease.1:
   version "1.6.11"
@@ -4830,6 +5208,13 @@ capture-exit@^1.2.0:
   dependencies:
     rsvp "^3.3.3"
 
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  dependencies:
+    rsvp "^4.8.4"
+
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
@@ -4854,9 +5239,9 @@ caseless@~0.12.0:
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chai-http@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-4.2.1.tgz#d4db6ae491e46b7d5029b2c103b6af45cd5ae290"
-  integrity sha512-S2Ezy5uSVuOYleeXppfUKtTU/xbHCZyKkwjheNJ/76SGFTUPDpDkkpVdPNgC3sAO1Ap5J5LJ+/rXdLG8EGhCDA==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-4.3.0.tgz#3c37c675c1f4fe685185a307e345de7599337c1a"
+  integrity sha512-zFTxlN7HLMv+7+SPXZdkd5wUlK+KxH6Q7bIEMiEx0FK3zuuMqL7cwICAQ0V1+yYRozBburYuxN1qZstgHpFZQg==
   dependencies:
     "@types/chai" "4"
     "@types/superagent" "^3.8.3"
@@ -4938,10 +5323,10 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
+chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -4953,7 +5338,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.0"
+    upath "^1.1.1"
   optionalDependencies:
     fsevents "^1.2.7"
 
@@ -4963,9 +5348,9 @@ chownr@^1.0.1, chownr@^1.1.1:
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
 
 chrome-trace-event@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
-  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -5231,9 +5616,9 @@ columnify@^1.5.4:
     wcwidth "^1.0.0"
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -5243,30 +5628,37 @@ command-exists@^1.2.7:
   integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
 
 command-join@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
-  integrity sha1-Uui5hPSHLZUv8b3IuYOX0nxxRM8=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.1.tgz#0a9e58a84e94bd0d1b6c75ce1078723d8a7645cb"
+  integrity sha512-LBA9kSxtg2SA8itaBeuitpn4pZQOhGVP1dyU1cnXLYrBpF3sikaPhjWPqyqVh7oGpneI05RtJs9a0fftIEgXcA==
+  dependencies:
+    "@improved/node" "^1.0.0"
 
 commander@2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@2.17.x, commander@~2.17.1:
+commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.15.1, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.15.1, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0, commander@~2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
   integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
 
+commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -5288,9 +5680,9 @@ component-classes@1.x, component-classes@^1.2.5, component-classes@^1.2.6:
     component-indexof "0.0.3"
 
 component-emitter@^1.2.0, component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 component-indexof@0.0.3:
   version "0.0.3"
@@ -5302,23 +5694,23 @@ component-type@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
   integrity sha1-ikeQFwAjjk/DIml3EjAibyS0Fak=
 
-compressible@~2.0.14:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
-  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
+compressible@~2.0.16:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
+  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
   dependencies:
-    mime-db ">= 1.38.0 < 2"
+    mime-db ">= 1.40.0 < 2"
 
-compression@^1.5.2, compression@^1.7.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
+compression@^1.7.1, compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
@@ -5337,6 +5729,16 @@ concat-stream@^1.4.10, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.0.2"
+    typedarray "^0.0.6"
+
 config-chain@^1.1.11:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
@@ -5352,19 +5754,19 @@ connect-cors@^0.5.6:
   dependencies:
     connect ">= 1.6.4"
 
-connect-history-api-fallback@^1.3.0:
+connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
 "connect@>= 1.6.4", connect@^3.6.5:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
   dependencies:
     debug "2.6.9"
-    finalhandler "1.1.0"
-    parseurl "~1.3.2"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
     utils-merge "1.0.1"
 
 console-browserify@^1.1.0:
@@ -5394,6 +5796,13 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -5460,12 +5869,12 @@ conventional-changelog-core@^2.0.11:
     through2 "^2.0.0"
 
 conventional-changelog-core@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f"
-  integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
   dependencies:
-    conventional-changelog-writer "^4.0.3"
-    conventional-commits-parser "^3.0.1"
+    conventional-changelog-writer "^4.0.5"
+    conventional-commits-parser "^3.0.2"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
@@ -5476,7 +5885,7 @@ conventional-changelog-core@^3.1.6:
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog-ember@^0.3.12:
   version "0.3.12"
@@ -5526,10 +5935,10 @@ conventional-changelog-preset-loader@^1.1.8:
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
   integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
 
-conventional-changelog-preset-loader@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
-  integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
+conventional-changelog-preset-loader@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
+  integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
 
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
@@ -5547,21 +5956,21 @@ conventional-changelog-writer@^3.0.9:
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-changelog-writer@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1"
-  integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA==
+conventional-changelog-writer@^4.0.5:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.6.tgz#24db578ac8e7c89a409ef9bba12cf3c095990148"
+  integrity sha512-ou/sbrplJMM6KQpR5rKFYNVQYesFjN7WpNGdudQSWNi6X+RgyFUcSv871YBYkrUYV9EX8ijMohYVzn9RUb+4ag==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.1"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
     handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
     lodash "^4.2.1"
     meow "^4.0.0"
-    semver "^5.5.0"
+    semver "^6.0.0"
     split "^1.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog@^1.1.24:
   version "1.1.24"
@@ -5588,12 +5997,12 @@ conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.6:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-filter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
-  integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A==
+conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
   dependencies:
-    is-subset "^0.1.1"
+    lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
 conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7:
@@ -5609,17 +6018,17 @@ conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-commits-parser@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
-  integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg==
+conventional-commits-parser@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d"
+  integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==
   dependencies:
     JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
+    is-text-path "^2.0.0"
     lodash "^4.2.1"
     meow "^4.0.0"
     split2 "^2.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
 conventional-recommended-bump@^1.2.1:
@@ -5636,14 +6045,14 @@ conventional-recommended-bump@^1.2.1:
     object-assign "^4.0.1"
 
 conventional-recommended-bump@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
-  integrity sha512-9mY5Yoblq+ZMqJpBzgS+RpSq+SUfP2miOR3H/NR9drGf08WCrY9B6HAGJZEm6+ThsVP917VHAahSOjM6k1vhPg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.1.1.tgz#37014fadeda267d0607e2fc81124da840a585127"
+  integrity sha512-JT2vKfSP9kR18RXXf55BRY1O3AHG8FPg5btP3l7LYfcWJsiXI6MCf30DepQ98E8Qhowvgv7a8iev0J1bEDkTFA==
   dependencies:
-    concat-stream "^1.6.0"
-    conventional-changelog-preset-loader "^2.0.2"
-    conventional-commits-filter "^2.0.1"
-    conventional-commits-parser "^3.0.1"
+    concat-stream "^2.0.0"
+    conventional-changelog-preset-loader "^2.1.1"
+    conventional-commits-filter "^2.0.2"
+    conventional-commits-parser "^3.0.2"
     git-raw-commits "2.0.0"
     git-semver-tags "^2.0.2"
     meow "^4.0.0"
@@ -5671,6 +6080,11 @@ cookie@0.3.1, cookie@^0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
 cookiejar@^2.1.0, cookiejar@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
@@ -5702,21 +6116,40 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-to-clipboard@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz#f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9"
-  integrity sha512-c3GdeY8qxCHGezVb1EFQfHYK/8NZRemgcTIzPq7PuxjHAf/raKibn2QdhHPb/y6q74PMgH6yizaDZlRmw6QyKw==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz#d2724a3ccbfed89706fac8a894872c979ac74467"
+  integrity sha512-eOZERzvCmxS8HWzugj4Uxl8OJxa7T2k1Gi0X5qavwydHIfuSHq2dTD09LOg/XyGq4Zpb5IsR/2OJ5lbOegz78w==
+  dependencies:
+    toggle-selection "^1.0.6"
+
+core-js-compat@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.3.tgz#0cc3ba4c7f62928c2837e1cffbe8dc78b4f1ae14"
+  integrity sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA==
   dependencies:
-    toggle-selection "^1.0.3"
+    browserslist "^4.6.0"
+    core-js-pure "3.1.3"
+    semver "^6.1.0"
+
+core-js-pure@3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5"
+  integrity sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA==
 
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3, core-js@^2.5.7:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
-  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
+core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3, core-js@^2.5.7, core-js@^2.6.5:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
+  integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
+
+core-js@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -5734,14 +6167,13 @@ cosmiconfig@^4.0.0:
     require-from-string "^2.0.1"
 
 cosmiconfig@^5.0.2, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
+    js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
 create-ecdh@^4.0.0:
@@ -5931,9 +6363,9 @@ css-selector-tokenizer@^0.7.0:
     regexpu-core "^1.0.0"
 
 css-to-react-native@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.3.0.tgz#bf80d24ec4a08e430306ef429c0586e6ed5485f7"
-  integrity sha512-IhR7bNIrCFwbJbKZOAjNDZdwpsbjTN6f1agXeELHDqg1wHPA8c2QLruttKOW7hgMGetkfraRJCIEMrptifBfVw==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.3.1.tgz#cf0f61e0514846e2d4dc188b0886e29d8bef64a2"
+  integrity sha512-yO+oEx1Lf+hDKasqQRVrAvzMCz825Huh1VMlEEDlRWyAhFb/FWb6I0KpEF1PkyKQ7NEdcx9d5M2ZEWgJAsgPvQ==
   dependencies:
     camelize "^1.0.0"
     css-color-keywords "^1.0.0"
@@ -5965,16 +6397,16 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==
 
 cssstyle@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.1.tgz#3aceb2759eaf514ac1a21628d723d6043a819495"
-  integrity sha512-7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz#427ea4d585b18624f6fdbf9de7a2a1a3ba713077"
+  integrity sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==
   dependencies:
     cssom "0.3.x"
 
 csstype@^2.2.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.3.tgz#b701e5968245bf9b08d54ac83d00b624e622a9fa"
-  integrity sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.5.tgz#1cd1dff742ebf4d7c991470ae71e12bb6751e034"
+  integrity sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
@@ -5994,9 +6426,9 @@ cyclist@~0.2.2:
   integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 damerau-levenshtein@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
-  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"
+  integrity sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==
 
 dargs@^4.0.1:
   version "4.1.0"
@@ -6043,7 +6475,7 @@ debug@*, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -6089,13 +6521,6 @@ decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -6160,7 +6585,7 @@ deepmerge@^2.1.1:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
   integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
 
-default-gateway@^4.0.1:
+default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
   integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
@@ -6211,17 +6636,18 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+del@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
+    "@types/glob" "^7.1.1"
     globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
 
 delay-async@^1.0.0:
   version "1.1.0"
@@ -6244,9 +6670,9 @@ denodeify@^1.2.1:
   integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE=
 
 denque@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.0.tgz#79e2f0490195502107f24d9553f374837dabc916"
-  integrity sha512-gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
+  integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
 
 depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
@@ -6258,10 +6684,10 @@ depd@~2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-deprecation@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711"
-  integrity sha512-ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg==
+deprecation@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.0.0.tgz#dd0427cd920c78bc575ec39dab2f22e7c304fb9d"
+  integrity sha512-lbQN037mB3VfA2JFuguM5GCJ+zPinMeCrFe+AfSZ6eqrnJA/Fs+EYMnd6Nb2mn9lf2jO9xwEd9o9lic+D4vkcw==
 
 des.js@^1.0.0:
   version "1.0.0"
@@ -6324,6 +6750,11 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
+diff-sequences@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975"
+  integrity sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==
+
 diff@3.5.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -6354,9 +6785,9 @@ dir-glob@^2.0.0:
     path-type "^3.0.0"
 
 dlv@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5"
-  integrity sha512-xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
+  integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
 dns-equal@^1.0.0:
   version "1.0.0"
@@ -6394,9 +6825,9 @@ doctrine@^2.1.0:
     esutils "^2.0.2"
 
 dom-align@^1.7.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.8.2.tgz#fdcd36bce25ba8d34fe3582efd57ac767df490bd"
-  integrity sha512-17vInOylbB7H4qua7QRsmQT05FFTZemO8BhnOPgF9BPqjAPDyQr/9V8fmJbn05vQ31m2gu3EJSSYN2u94szUZg==
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.8.3.tgz#f1fc197228109eca24f04cc6ad3b06f6eb8a54bb"
+  integrity sha512-thE1qB8mvtRZgwN4+IGFz1rv7zVsr08c2/IEYtOJIeTzW4YDadIOd5nQ4BpiiAvUWg55xTeGq7zLTDxDYWDrnw==
 
 dom-closest@^0.2.0:
   version "0.2.0"
@@ -6412,7 +6843,7 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
-dom-helpers@^3.3.1:
+dom-helpers@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
   integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
@@ -6448,14 +6879,14 @@ dom-testing-library@^2.3.1:
     wait-for-expect "^0.4.0"
 
 dom-testing-library@^3.13.0:
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.17.1.tgz#3291bc3cf68c555ba5e663697ee77d604aaa122b"
-  integrity sha512-SbkaRfQvuLjnv+xFgSo/cmKoN9tjBL6Rh1f3nQH9jnjUe5q+keRwacYSi3uSpcB4D1K768iavCayKH3ZN9ea+g==
+  version "3.19.4"
+  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.19.4.tgz#f5b737f59ee9749a4568fa353f1f59be97c888c3"
+  integrity sha512-GJOx8CLpnkvM3takILOsld/itUUc9+7Qh6caN1Spj6+9jIgNPY36fsvoH7sEgYokC0lBRdttO7G7fIFYCXlmcA==
   dependencies:
-    "@babel/runtime" "^7.3.4"
+    "@babel/runtime" "^7.4.3"
     "@sheerun/mutationobserver-shim" "^0.3.2"
-    pretty-format "^24.0.0"
-    wait-for-expect "^1.1.0"
+    pretty-format "^24.7.0"
+    wait-for-expect "^1.1.1"
 
 dom-walk@^0.1.0:
   version "0.1.1"
@@ -6570,10 +7001,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.113, electron-to-chromium@^1.3.116, electron-to-chromium@^1.3.47:
-  version "1.3.116"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.116.tgz#1dbfee6a592a0c14ade77dbdfe54fef86387d702"
-  integrity sha512-NKwKAXzur5vFCZYBHpdWjTMO8QptNLNP80nItkSIgUOapPAo9Uia+RvkCaZJtO7fhQaVElSvBPWEc2ku6cKsPA==
+electron-to-chromium@^1.3.137, electron-to-chromium@^1.3.47:
+  version "1.3.150"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.150.tgz#afb972b53a702b37c76db843c39c967e9f68464b"
+  integrity sha512-5wuYlaXhXbBvavSTij5ZyidICB6sAK/1BwgZZoPCgsniid1oDgzVvDOV/Dw6J25lKV9QZ9ZdQCp8MEfF0/OIKA==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -6603,7 +7034,7 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
-encodeurl@~1.0.1, encodeurl@~1.0.2:
+encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
@@ -6693,11 +7124,11 @@ error-stack-parser@^2.0.1:
     stackframe "^1.0.4"
 
 errorhandler@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.0.tgz#eaba64ca5d542a311ac945f582defc336165d9f4"
-  integrity sha1-6rpkyl1UKjEayUX1gt78M2Fl2fQ=
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91"
+  integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==
   dependencies:
-    accepts "~1.3.3"
+    accepts "~1.3.7"
     escape-html "~1.0.3"
 
 es-abstract@^1.11.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
@@ -6732,9 +7163,9 @@ es6-error@^4.0.2:
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
 es6-promise@^4.0.3:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
-  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -6804,29 +7235,35 @@ eslint-import-resolver-webpack@^0.9.0:
     resolve "^1.4.0"
     semver "^5.3.0"
 
-eslint-module-utils@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
-  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
+eslint-module-utils@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
+  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
   dependencies:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
 
 eslint-plugin-import@^2.14.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz#97ac3e75d0791c4fac0e15ef388510217be7f66f"
-  integrity sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==
+  version "2.17.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189"
+  integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==
   dependencies:
+    array-includes "^3.0.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.3.0"
+    eslint-module-utils "^2.4.0"
     has "^1.0.3"
     lodash "^4.17.11"
     minimatch "^3.0.4"
     read-pkg-up "^2.0.0"
-    resolve "^1.9.0"
+    resolve "^1.11.0"
+
+eslint-plugin-jest@^22.6.4:
+  version "22.6.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.6.4.tgz#2895b047dd82f90f43a58a25cf136220a21c9104"
+  integrity sha512-36OqnZR/uMCDxXGmTsqU4RwllR0IiB/XF8GW3ODmhsjiITKuI0GpgultWFt193ipN3HARkaIcKowpE6HBvRHNg==
 
 eslint-plugin-json@^1.2.0:
   version "1.4.0"
@@ -6865,29 +7302,29 @@ eslint-plugin-prettier@^2.2.0:
     jest-docblock "^21.0.0"
 
 eslint-plugin-prettier@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.0.1.tgz#19d521e3981f69dd6d14f64aec8c6a6ac6eb0b0d"
-  integrity sha512-/PMttrarPAY78PLvV3xfWibMOdMDl57hmlQ2XqFeA37wd+CJ7WSxV7txqjVPHi/AAFKd2lX0ZqfsOc/i5yFCSQ==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d"
+  integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
 eslint-plugin-react-hooks@^1.0.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.5.1.tgz#3c601326914ee0e1fedd709115db4940bdbbed4a"
-  integrity sha512-i3dIrmZ+Ssrm0LrbbtuGcRf7EEpe1FaMuL8XnnpZO0X4tk3dZNzevWxD0/7nMAFa5yZQfNnYkfEP0MmwLvbdHw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.6.0.tgz#348efcda8fb426399ac7b8609607c7b4025a6f5f"
+  integrity sha512-lHBVRIaz5ibnIgNG07JNiAuBUeKhEf8l4etNx5vfAEwqQ5tcuK3jV9yjmopPgQDagQb7HwIuQVsE3IVcGrRnag==
 
 eslint-plugin-react@^7.5.1:
-  version "7.12.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz#b1ecf26479d61aee650da612e425c53a99f48c8c"
-  integrity sha512-1puHJkXJY+oS1t467MjbqjvX53uQ05HXwjqDgdbGBqf5j9eeydI54G3KwiJmWciQ0HTBacIKw2jgwSBSH3yfgQ==
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.13.0.tgz#bc13fd7101de67996ea51b33873cd9dc2b7e5758"
+  integrity sha512-uA5LrHylu8lW/eAH3bEQe9YdzpPaFd9yAJTwTi/i/BKTD7j6aQMKVAdGM/ML72zD6womuSK7EiGtMKuK06lWjQ==
   dependencies:
     array-includes "^3.0.3"
     doctrine "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.0.1"
+    jsx-ast-utils "^2.1.0"
     object.fromentries "^2.0.0"
-    prop-types "^15.6.2"
-    resolve "^1.9.0"
+    prop-types "^15.7.2"
+    resolve "^1.10.1"
 
 eslint-restricted-globals@^0.1.1:
   version "0.1.1"
@@ -7019,10 +7456,10 @@ event-target-shim@^1.0.5:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-1.1.1.tgz#a86e5ee6bdaa16054475da797ccddf0c55698491"
   integrity sha1-qG5e5r2qFgVEddp5fM3fDFVphJE=
 
-eventemitter3@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+eventemitter3@^3.0.0, eventemitter3@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
 eventlistener@0.0.1:
   version "0.0.1"
@@ -7061,18 +7498,10 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.2.0"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
+exec-sh@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
+  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
 
 execa@^0.7.0:
   version "0.7.0"
@@ -7229,6 +7658,18 @@ expect@^23.6.0:
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
 
+expect@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d"
+  integrity sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    ansi-styles "^3.2.0"
+    jest-get-type "^24.8.0"
+    jest-matcher-utils "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-regex-util "^24.3.0"
+
 expo-ads-admob@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/expo-ads-admob/-/expo-ads-admob-2.0.0.tgz#53b78a5ac5eee4f306ff461256160990ab96936b"
@@ -7667,7 +8108,7 @@ express-session@^1.16.1:
     safe-buffer "5.1.2"
     uid-safe "~2.1.5"
 
-express@4.16.4, express@^4.13.4, express@^4.15.2, express@^4.16.2:
+express@4.16.4:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -7703,6 +8144,42 @@ express@4.16.4, express@^4.13.4, express@^4.15.2, express@^4.16.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.13.4, express@^4.15.2, express@^4.16.2, express@^4.17.1:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
@@ -7826,9 +8303,9 @@ fast-diff@^1.1.1, fast-diff@^1.1.2:
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
 fast-glob@^2.0.2:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
-  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.1.2"
@@ -7999,30 +8476,30 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.1"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
     parseurl "~1.3.2"
-    statuses "~1.3.1"
+    statuses "~1.4.0"
     unpipe "~1.0.0"
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
     unpipe "~1.0.0"
 
 find-babel-config@^1.1.0:
@@ -8094,9 +8571,9 @@ findup-sync@^2.0.0:
     resolve-dir "^1.0.1"
 
 fined@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.1.tgz#95d88ff329123dd1a6950fdfcd321f746271e01f"
-  integrity sha512-jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
   dependencies:
     expand-tilde "^2.0.2"
     is-plain-object "^2.0.3"
@@ -8199,13 +8676,13 @@ formidable@^1.2.0:
   integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==
 
 formik@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/formik/-/formik-1.5.1.tgz#ef5687e1ade5b1fe5f1d51435b422238aad107e9"
-  integrity sha512-FBWGBKQkcCE4d5b5l2fKccD9d1QxNxw/0bQTRvp3EjzA8Bnjmsm9H/Oy0375UA8P3FPmfJkF4cXLLdEqK7fP5A==
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/formik/-/formik-1.5.7.tgz#2fc5fc2f0c693cdc4e8c9dad3a10eb4c4e131ff5"
+  integrity sha512-kZo8lS4WzfC2uivnSkE9DOuX9x+jVjCtIZOlb1A4lHGeURyuLt6eDfwGJzNlcP0lXIwmpANKzegiB8j60B54TA==
   dependencies:
     create-react-context "^0.2.2"
     deepmerge "^2.1.1"
-    hoist-non-react-statics "^2.5.5"
+    hoist-non-react-statics "^3.3.0"
     lodash "^4.17.11"
     lodash-es "^4.17.11"
     prop-types "^15.6.1"
@@ -8292,10 +8769,19 @@ fs-extra@^7.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.0.1.tgz#90294081f978b1f182f347a440a209154344285b"
+  integrity sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
+  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
   dependencies:
     minipass "^2.2.1"
 
@@ -8320,17 +8806,17 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.3, fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
   dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
+fstream@^1.0.0, fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -8607,10 +9093,10 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -8648,9 +9134,9 @@ global@^4.3.0:
     process "~0.5.1"
 
 globals@^11.0.1, globals@^11.1.0:
-  version "11.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
-  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^9.18.0:
   version "9.18.0"
@@ -8772,12 +9258,12 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@^4.0.2, handlebars@^4.0.3, handlebars@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
-  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
+handlebars@^4.0.2, handlebars@^4.0.3, handlebars@^4.1.0, handlebars@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
@@ -8910,18 +9396,18 @@ hashids@^1.1.4:
   integrity sha512-dEHCG2LraR6PNvSGxosZHIRgxF5sNLOIBFEHbj8lfP9WWmu/PWPMzsip1drdVSOFi51N2pU7gZavrgn7sbGFuw==
 
 haul@^1.0.0-rc.9:
-  version "1.0.0-rc.13"
-  resolved "https://registry.yarnpkg.com/haul/-/haul-1.0.0-rc.13.tgz#46d2b3ee16a4a5b630b71bcf79ca95bbe9f61ec9"
-  integrity sha512-sB3frdVGflJ01PABePnjINn7sOdVxsyjoI0UG2tfPtts+yqcGIffEpTWP6DtqQfjUcas67yfQIi3BFLg4JNxUQ==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/polyfill" "^7.0.0"
-    "@babel/preset-env" "^7.0.0"
-    "@babel/register" "^7.0.0"
+  version "1.0.0-rc.15"
+  resolved "https://registry.yarnpkg.com/haul/-/haul-1.0.0-rc.15.tgz#2d247610baadc0a046a54502ad17bfec5fb7cf61"
+  integrity sha512-KrtEFBbbTCv4ffMehESxhQwrd+ht6OA1sN2p1Y38Goltk7NXYmVAeMIJAljPxVhaDVHtf9xpvX5qACUXydRXbQ==
+  dependencies:
+    "@babel/core" "^7.4.0"
+    "@babel/plugin-proposal-class-properties" "^7.4.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.4.0"
+    "@babel/plugin-transform-flow-strip-types" "^7.4.0"
+    "@babel/plugin-transform-react-jsx" "^7.3.0"
+    "@babel/polyfill" "^7.4.0"
+    "@babel/preset-env" "^7.4.0"
+    "@babel/register" "^7.4.0"
     "@react-slate/components" "0.2.0"
     "@react-slate/core" "0.7.0"
     "@react-slate/utils" "0.2.2"
@@ -8993,15 +9479,16 @@ heroku-babel-loader@^8.0.4:
     util.promisify "^1.0.0"
 
 history@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
-  integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca"
+  integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==
   dependencies:
-    invariant "^2.2.1"
+    "@babel/runtime" "^7.1.2"
     loose-envify "^1.2.0"
     resolve-pathname "^2.2.0"
+    tiny-invariant "^1.0.2"
+    tiny-warning "^1.0.0"
     value-equal "^0.4.0"
-    warning "^3.0.0"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -9023,16 +9510,16 @@ hoek@5.x.x:
   integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==
 
 hoek@6.x.x:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
-  integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
 hoist-non-react-statics@^1.0.5:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
-hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
+hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
@@ -9057,11 +9544,6 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-home-or-tmp@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"
-  integrity sha1-V6j+JM8zzdUkhgoVgh3cJchmcfs=
-
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -9091,7 +9573,7 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-html-entities@^1.2.0:
+html-entities@^1.2.0, html-entities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
@@ -9161,6 +9643,17 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
@@ -9249,9 +9742,9 @@ i18next-browser-languagedetector@^2.1.0:
   integrity sha512-wPbtH18FdOuB245I8Bhma5/XSDdN/HpYlX+wga1eMy+slhaFQSnrWX6fp+aYSL2eEuj0RlfHeEVz6Fo/lxAj6A==
 
 i18next-express-middleware@^1.1.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/i18next-express-middleware/-/i18next-express-middleware-1.7.1.tgz#00436776113ff2e87d3befa81a9aa8a359af1193"
-  integrity sha512-e8JhShjL2sVkWFrO0ySVsmM9Ge7sQ8iDsNXSmpAD/2Fvg/P4uo7Kqm0R+yWWsRYCr+uu8tWsSDiEbmbjrnsyVg==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/i18next-express-middleware/-/i18next-express-middleware-1.8.0.tgz#8ef73a56036b404b162d81d4aec23cfa0ab2a609"
+  integrity sha512-vbEV+YbGoXNpv59WM7MHvdbBpPUS6itMIgpX21mjmu8/naS/NlmZe6vMNFGUIWs5PbXGnKWm7ucKxYmc2RV8vA==
   dependencies:
     cookies "0.7.1"
 
@@ -9287,14 +9780,14 @@ icss-utils@^2.1.0:
     postcss "^6.0.1"
 
 idx@^2.1.0:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.5.tgz#609a011b7c9e092380f30908389d64ecd1102f70"
-  integrity sha512-pp6pulm8tbJag/Z3PXTq+PMfjlWTavze4hp/ajH9hQdNql62kuTHhzn9AP0buQ4n80zJlgaBeruWvGcA5DUdIw==
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.6.tgz#1f824595070100ae9ad585c86db08dc74f83a59d"
+  integrity sha512-WFXLF7JgPytbMgelpRY46nHz5tyDcedJ76pLV+RJWdb8h33bxFq4bdZau38DhNSzk5eVniBf1K3jwfK+Lb5nYA==
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -9531,9 +10024,9 @@ inquirer@^5.0.1:
     through "^2.3.6"
 
 inquirer@^6.2.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
-  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -9546,7 +10039,7 @@ inquirer@^6.2.0:
     run-async "^2.2.0"
     rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 instapromise@^2.0.7:
@@ -9554,12 +10047,12 @@ instapromise@^2.0.7:
   resolved "https://registry.yarnpkg.com/instapromise/-/instapromise-2.0.7.tgz#85e66b31021194da11214c865127ef04ec30167a"
   integrity sha1-heZrMQIRlNoRIUyGUSfvBOwwFno=
 
-internal-ip@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
-  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
+internal-ip@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^4.0.1"
+    default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
 interpret@^1.0.0, interpret@^1.0.1, interpret@^1.1.0:
@@ -9575,7 +10068,7 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -9602,12 +10095,7 @@ ip@^1.1.0, ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
-
-ipaddr.js@^1.9.0:
+ipaddr.js@1.9.0, ipaddr.js@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
   integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
@@ -9793,6 +10281,11 @@ is-generator-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
   integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
 
+is-generator-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -9808,9 +10301,9 @@ is-glob@^3.1.0:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -9821,11 +10314,6 @@ is-ip@^2.0.0:
   dependencies:
     ip-regex "^2.0.0"
 
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -9862,24 +10350,24 @@ is-observable@^1.1.0:
   dependencies:
     symbol-observable "^1.1.0"
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+is-path-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
+  integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
 
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
   dependencies:
-    is-path-inside "^1.0.0"
+    is-path-inside "^2.1.0"
 
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
   dependencies:
-    path-is-inside "^1.0.1"
+    path-is-inside "^1.0.2"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
@@ -9893,6 +10381,13 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
+  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
+  dependencies:
+    isobject "^4.0.0"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -9985,6 +10480,13 @@ is-text-path@^1.0.0:
   dependencies:
     text-extensions "^1.0.0"
 
+is-text-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636"
+  integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==
+  dependencies:
+    text-extensions "^2.0.0"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -10052,9 +10554,9 @@ isexe@^2.0.0:
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 ismobilejs@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/ismobilejs/-/ismobilejs-0.5.1.tgz#0e3f825e29e32f84ad5ddbb60e9e04a894046488"
-  integrity sha512-QX4STsOcBYqlTjVGuAdP1MiRVxtiUbRHOKH0v7Gn1EvfUVIQnrSdgCM4zB4VCZuIejnb2NUMUx0Bwd3EIG6yyA==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/ismobilejs/-/ismobilejs-0.5.2.tgz#e81bacf6187c532ad8348355f4fecd6e6adfdce1"
+  integrity sha512-ta9UdV60xVZk/ZafFtSFslQaE76SvNkcs1r73d2PVR21zVzx9xuYv9tNe4MxA1NN7WoeCc2RjGot3Bz1eHDx3Q==
 
 isobject@^2.0.0:
   version "2.1.0"
@@ -10068,6 +10570,11 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
+isobject@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
+  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
+
 isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -10121,6 +10628,11 @@ istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
   integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
+istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
+
 istanbul-lib-hook@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
@@ -10141,6 +10653,19 @@ istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
     istanbul-lib-coverage "^1.2.1"
     semver "^5.3.0"
 
+istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
+  dependencies:
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
+    semver "^6.0.0"
+
 istanbul-lib-report@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
@@ -10151,6 +10676,15 @@ istanbul-lib-report@^1.1.5:
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
+istanbul-lib-report@^2.0.4:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+  dependencies:
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    supports-color "^6.1.0"
+
 istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
@@ -10162,6 +10696,17 @@ istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
+istanbul-lib-source-maps@^3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    rimraf "^2.6.3"
+    source-map "^0.6.1"
+
 istanbul-reports@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
@@ -10169,6 +10714,13 @@ istanbul-reports@^1.5.1:
   dependencies:
     handlebars "^4.0.3"
 
+istanbul-reports@^2.1.1:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
+  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
+  dependencies:
+    handlebars "^4.1.2"
+
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -10194,6 +10746,15 @@ jest-changed-files@^23.4.2:
   dependencies:
     throat "^4.0.0"
 
+jest-changed-files@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz#7e7eb21cf687587a85e50f3d249d1327e15b157b"
+  integrity sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    execa "^1.0.0"
+    throat "^4.0.0"
+
 jest-cli@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
@@ -10236,6 +10797,25 @@ jest-cli@^23.6.0:
     which "^1.2.12"
     yargs "^11.0.0"
 
+jest-cli@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989"
+  integrity sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==
+  dependencies:
+    "@jest/core" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    import-local "^2.0.0"
+    is-ci "^2.0.0"
+    jest-config "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    prompts "^2.0.1"
+    realpath-native "^1.1.0"
+    yargs "^12.0.2"
+
 jest-config@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
@@ -10256,6 +10836,29 @@ jest-config@^23.6.0:
     micromatch "^2.3.11"
     pretty-format "^23.6.0"
 
+jest-config@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz#77db3d265a6f726294687cbbccc36f8a76ee0f4f"
+  integrity sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/test-sequencer" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    babel-jest "^24.8.0"
+    chalk "^2.0.1"
+    glob "^7.1.1"
+    jest-environment-jsdom "^24.8.0"
+    jest-environment-node "^24.8.0"
+    jest-get-type "^24.8.0"
+    jest-jasmine2 "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    micromatch "^3.1.10"
+    pretty-format "^24.8.0"
+    realpath-native "^1.1.0"
+
 jest-diff@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030"
@@ -10276,6 +10879,16 @@ jest-diff@^23.6.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.6.0"
 
+jest-diff@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172"
+  integrity sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==
+  dependencies:
+    chalk "^2.0.1"
+    diff-sequences "^24.3.0"
+    jest-get-type "^24.8.0"
+    pretty-format "^24.8.0"
+
 jest-docblock@23.2.0, jest-docblock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
@@ -10288,6 +10901,13 @@ jest-docblock@^21.0.0:
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
   integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
 
+jest-docblock@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd"
+  integrity sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==
+  dependencies:
+    detect-newline "^2.1.0"
+
 jest-dom@^1.0.0:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/jest-dom/-/jest-dom-1.12.1.tgz#4880c91e39e9c737188b5c952740df8912635248"
@@ -10308,6 +10928,17 @@ jest-each@^23.6.0:
     chalk "^2.0.1"
     pretty-format "^23.6.0"
 
+jest-each@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz#a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"
+  integrity sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    chalk "^2.0.1"
+    jest-get-type "^24.8.0"
+    jest-util "^24.8.0"
+    pretty-format "^24.8.0"
+
 jest-environment-jsdom@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
@@ -10317,6 +10948,18 @@ jest-environment-jsdom@^23.4.0:
     jest-util "^23.4.0"
     jsdom "^11.5.1"
 
+jest-environment-jsdom@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz#300f6949a146cabe1c9357ad9e9ecf9f43f38857"
+  integrity sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==
+  dependencies:
+    "@jest/environment" "^24.8.0"
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    jest-mock "^24.8.0"
+    jest-util "^24.8.0"
+    jsdom "^11.5.1"
+
 jest-environment-node@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
@@ -10325,10 +10968,21 @@ jest-environment-node@^23.4.0:
     jest-mock "^23.2.0"
     jest-util "^23.4.0"
 
-jest-expo@^31.0.0:
-  version "31.0.0"
-  resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-31.0.0.tgz#6f191eebb646b2654388f5166311385c118a7924"
-  integrity sha512-GWHGY4M53dZljIzEJdGCntZFvWvF7tf6zAhCURaNSLpZ0o7qtVKqjZrjXI8bp+58Hr3O9N9KhWJYKFVzmMLAFQ==
+jest-environment-node@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz#d3f726ba8bc53087a60e7a84ca08883a4c892231"
+  integrity sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==
+  dependencies:
+    "@jest/environment" "^24.8.0"
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    jest-mock "^24.8.0"
+    jest-util "^24.8.0"
+
+jest-expo@^32.0.0:
+  version "32.0.1"
+  resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-32.0.1.tgz#83bb16cba0d14d75bc635b8fb078bc33e82b99ad"
+  integrity sha512-FnqfaQ0LuzOgG3/qJh6G+pard5SnWnTfJ7Ad+NFl6CEyZhLp/sCu01fl+CGpal2LFSPODChheIaLYebgw69d+g==
   dependencies:
     "@babel/core" "^7.1.0"
     babel-core "^7.0.0-bridge.0"
@@ -10342,6 +10996,11 @@ jest-get-type@^22.1.0, jest-get-type@^22.4.3:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
   integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
+jest-get-type@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc"
+  integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==
+
 jest-haste-map@23.5.0:
   version "23.5.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.5.0.tgz#d4ca618188bd38caa6cb20349ce6610e194a8065"
@@ -10370,6 +11029,25 @@ jest-haste-map@^23.6.0:
     micromatch "^2.3.11"
     sane "^2.0.0"
 
+jest-haste-map@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800"
+  integrity sha512-ZBPRGHdPt1rHajWelXdqygIDpJx8u3xOoLyUBWRW28r3tagrgoepPrzAozW7kW9HrQfhvmiv1tncsxqHJO1onQ==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    anymatch "^2.0.0"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.15"
+    invariant "^2.2.4"
+    jest-serializer "^24.4.0"
+    jest-util "^24.8.0"
+    jest-worker "^24.6.0"
+    micromatch "^3.1.10"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
 jest-jasmine2@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
@@ -10388,6 +11066,28 @@ jest-jasmine2@^23.6.0:
     jest-util "^23.4.0"
     pretty-format "^23.6.0"
 
+jest-jasmine2@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898"
+  integrity sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==
+  dependencies:
+    "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.0.1"
+    co "^4.6.0"
+    expect "^24.8.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^24.8.0"
+    jest-matcher-utils "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-snapshot "^24.8.0"
+    jest-util "^24.8.0"
+    pretty-format "^24.8.0"
+    throat "^4.0.0"
+
 jest-leak-detector@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
@@ -10395,6 +11095,13 @@ jest-leak-detector@^23.6.0:
   dependencies:
     pretty-format "^23.6.0"
 
+jest-leak-detector@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz#c0086384e1f650c2d8348095df769f29b48e6980"
+  integrity sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==
+  dependencies:
+    pretty-format "^24.8.0"
+
 jest-matcher-utils@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
@@ -10413,6 +11120,16 @@ jest-matcher-utils@^23.6.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.6.0"
 
+jest-matcher-utils@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495"
+  integrity sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^24.8.0"
+    jest-get-type "^24.8.0"
+    pretty-format "^24.8.0"
+
 jest-message-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
@@ -10424,11 +11141,37 @@ jest-message-util@^23.4.0:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
+jest-message-util@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b"
+  integrity sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/stack-utils" "^1.0.1"
+    chalk "^2.0.1"
+    micromatch "^3.1.10"
+    slash "^2.0.0"
+    stack-utils "^1.0.1"
+
 jest-mock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
   integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
+jest-mock@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"
+  integrity sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==
+  dependencies:
+    "@jest/types" "^24.8.0"
+
+jest-pnp-resolver@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
+  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
+
 jest-react-native@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/jest-react-native/-/jest-react-native-18.0.0.tgz#77dd909f069324599f227c58c61c2e62168726ba"
@@ -10439,6 +11182,11 @@ jest-regex-util@^23.3.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
   integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
 
+jest-regex-util@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
+  integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
+
 jest-resolve-dependencies@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
@@ -10447,6 +11195,15 @@ jest-resolve-dependencies@^23.6.0:
     jest-regex-util "^23.3.0"
     jest-snapshot "^23.6.0"
 
+jest-resolve-dependencies@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0"
+  integrity sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-snapshot "^24.8.0"
+
 jest-resolve@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
@@ -10456,6 +11213,17 @@ jest-resolve@^23.6.0:
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
+jest-resolve@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f"
+  integrity sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    browser-resolve "^1.11.3"
+    chalk "^2.0.1"
+    jest-pnp-resolver "^1.2.1"
+    realpath-native "^1.1.0"
+
 jest-runner@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
@@ -10475,6 +11243,31 @@ jest-runner@^23.6.0:
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
+jest-runner@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz#4f9ae07b767db27b740d7deffad0cf67ccb4c5bb"
+  integrity sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.4.2"
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-config "^24.8.0"
+    jest-docblock "^24.3.0"
+    jest-haste-map "^24.8.0"
+    jest-jasmine2 "^24.8.0"
+    jest-leak-detector "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-resolve "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-util "^24.8.0"
+    jest-worker "^24.6.0"
+    source-map-support "^0.5.6"
+    throat "^4.0.0"
+
 jest-runtime@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
@@ -10502,11 +11295,45 @@ jest-runtime@^23.6.0:
     write-file-atomic "^2.1.0"
     yargs "^11.0.0"
 
+jest-runtime@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz#05f94d5b05c21f6dc54e427cd2e4980923350620"
+  integrity sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.8.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/yargs" "^12.0.2"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    jest-config "^24.8.0"
+    jest-haste-map "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-mock "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.8.0"
+    jest-snapshot "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    strip-bom "^3.0.0"
+    yargs "^12.0.2"
+
 jest-serializer@23.0.1, jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
   integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
 
+jest-serializer@^24.4.0:
+  version "24.4.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
+  integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
+
 jest-snapshot@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
@@ -10523,6 +11350,29 @@ jest-snapshot@^23.6.0:
     pretty-format "^23.6.0"
     semver "^5.5.0"
 
+jest-snapshot@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"
+  integrity sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==
+  dependencies:
+    "@babel/types" "^7.0.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.0.1"
+    expect "^24.8.0"
+    jest-diff "^24.8.0"
+    jest-matcher-utils "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-resolve "^24.8.0"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^24.8.0"
+    semver "^5.5.0"
+
+jest-transform-stub@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d"
+  integrity sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg==
+
 jest-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
@@ -10537,6 +11387,24 @@ jest-util@^23.4.0:
     slash "^1.0.0"
     source-map "^0.6.0"
 
+jest-util@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1"
+  integrity sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    callsites "^3.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.15"
+    is-ci "^2.0.0"
+    mkdirp "^0.5.1"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+
 jest-validate@^23.5.0, jest-validate@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
@@ -10547,6 +11415,18 @@ jest-validate@^23.5.0, jest-validate@^23.6.0:
     leven "^2.1.0"
     pretty-format "^23.6.0"
 
+jest-validate@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849"
+  integrity sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    camelcase "^5.0.0"
+    chalk "^2.0.1"
+    jest-get-type "^24.8.0"
+    leven "^2.1.0"
+    pretty-format "^24.8.0"
+
 jest-watcher@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
@@ -10556,6 +11436,19 @@ jest-watcher@^23.4.0:
     chalk "^2.0.1"
     string-length "^2.0.0"
 
+jest-watcher@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz#58d49915ceddd2de85e238f6213cef1c93715de4"
+  integrity sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==
+  dependencies:
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/yargs" "^12.0.9"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    jest-util "^24.8.0"
+    string-length "^2.0.0"
+
 jest-worker@23.2.0, jest-worker@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
@@ -10563,6 +11456,14 @@ jest-worker@23.2.0, jest-worker@^23.2.0:
   dependencies:
     merge-stream "^1.0.1"
 
+jest-worker@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
+  integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
+  dependencies:
+    merge-stream "^1.0.1"
+    supports-color "^6.1.0"
+
 jest@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
@@ -10571,6 +11472,14 @@ jest@^23.6.0:
     import-local "^1.0.0"
     jest-cli "^23.6.0"
 
+jest@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081"
+  integrity sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==
+  dependencies:
+    import-local "^2.0.0"
+    jest-cli "^24.8.0"
+
 joi@14.0.4:
   version "14.0.4"
   resolved "https://registry.yarnpkg.com/joi/-/joi-14.0.4.tgz#f066f79330f6bd6f3dda243be6d2c211f83a5f9b"
@@ -10624,10 +11533,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
-  version "3.12.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
-  integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
+js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -10734,9 +11643,9 @@ json2mq@^0.2.0:
     string-convert "^0.2.0"
 
 json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
 json5@2.x, json5@^2.1.0:
   version "2.1.0"
@@ -10758,9 +11667,9 @@ json5@^1.0.1:
     minimist "^1.2.0"
 
 jsonc-parser@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.3.tgz#6d4199ccab7f21ff5d2a4225050c54e981fb21a2"
-  integrity sha512-WJi9y9ABL01C8CxTKxRRQkkSpY/x2bo4Gy0WuiZGrInxQqgxQpvkBCLNcDYcHOSdhx4ODgbFcgAvfL49C+PHgQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.1.0.tgz#eb0d0c7a3c33048524ce3574c57c7278fb2f1bf3"
+  integrity sha512-n9GrT8rrr2fhvBbANa1g+xFmgGK5X91KFeDwlKQ3+SJfmH5+tKv/M/kahx/TXOMflfWHKGKqKyfHQaLKTNzJ6w==
 
 jsonfile@^2.1.0, jsonfile@^2.3.1:
   version "2.4.0"
@@ -10786,23 +11695,7 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonwebtoken@^8.1.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz#ebd0ca2a69797816e1c5af65b6c759787252947e"
-  integrity sha512-IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA==
-  dependencies:
-    jws "^3.2.1"
-    lodash.includes "^4.3.0"
-    lodash.isboolean "^3.0.3"
-    lodash.isinteger "^4.0.4"
-    lodash.isnumber "^3.0.3"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.once "^4.0.0"
-    ms "^2.1.1"
-    semver "^5.6.0"
-
-jsonwebtoken@^8.2.0:
+jsonwebtoken@^8.1.0, jsonwebtoken@^8.2.0:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
   integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
@@ -10828,22 +11721,13 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
-  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
+jsx-ast-utils@^2.0.1, jsx-ast-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz#0ee4e2c971fb9601c67b5641b71be80faecf0b36"
+  integrity sha512-yDGDG2DS4JcqhA6blsuYbtsT09xL8AoLuUR2Gb5exrw7UEM19sBcOTq+YBBhrNbl0PUC4R4LnFu+dHg2HKeVvA==
   dependencies:
     array-includes "^3.0.3"
 
-jwa@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.0.tgz#8f61dc799acf0309f2d4b22a91ce73d6d2bb206c"
-  integrity sha512-mt6IHaq0ZZWDBspg0Pheu3r9sVNMEZn+GJe1zcdYyhFcDSclp3J8xEdO4PjZolZ2i8xlaVU1LetHM0nJejYsEw==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
 jwa@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
@@ -10853,14 +11737,6 @@ jwa@^1.4.1:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
-jws@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.1.tgz#d79d4216a62c9afa0a3d5e8b5356d75abdeb2be5"
-  integrity sha512-bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g==
-  dependencies:
-    jwa "^1.2.0"
-    safe-buffer "^5.0.1"
-
 jws@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
@@ -10886,7 +11762,7 @@ keyv@3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-killable@^1.0.0:
+killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -10932,6 +11808,11 @@ kleur@^2.0.1:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
   integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
 
+kleur@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+
 knex@^0.14.2:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
@@ -11028,25 +11909,25 @@ lerna@^2.5.1:
     yargs "^8.0.2"
 
 lerna@^3.4.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.13.1.tgz#feaff562176f304bd82329ca29ce46ab6c033463"
-  integrity sha512-7kSz8LLozVsoUNTJzJzy+b8TnV9YdviR2Ee2PwGZSlVw3T1Rn7kOAPZjEi+3IWnOPC96zMPHVmjCmzQ4uubalw==
-  dependencies:
-    "@lerna/add" "3.13.1"
-    "@lerna/bootstrap" "3.13.1"
-    "@lerna/changed" "3.13.1"
-    "@lerna/clean" "3.13.1"
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.14.1.tgz#6bce5d2d4958e853f51387f8f41a8f2d9aa4a8ea"
+  integrity sha512-lQxmGeEECjOMI3pRh2+I6jazoEWhEfvZNIs7XaX71op33AVwyjlY/nQ1GJGrPhxYBuQnlPgH0vH/nC/lcLaVkw==
+  dependencies:
+    "@lerna/add" "3.14.0"
+    "@lerna/bootstrap" "3.14.0"
+    "@lerna/changed" "3.14.1"
+    "@lerna/clean" "3.14.0"
     "@lerna/cli" "3.13.0"
-    "@lerna/create" "3.13.1"
-    "@lerna/diff" "3.13.1"
-    "@lerna/exec" "3.13.1"
-    "@lerna/import" "3.13.1"
-    "@lerna/init" "3.13.1"
-    "@lerna/link" "3.13.1"
-    "@lerna/list" "3.13.1"
-    "@lerna/publish" "3.13.1"
-    "@lerna/run" "3.13.1"
-    "@lerna/version" "3.13.1"
+    "@lerna/create" "3.14.0"
+    "@lerna/diff" "3.14.0"
+    "@lerna/exec" "3.14.0"
+    "@lerna/import" "3.14.0"
+    "@lerna/init" "3.14.0"
+    "@lerna/link" "3.14.0"
+    "@lerna/list" "3.14.0"
+    "@lerna/publish" "3.14.1"
+    "@lerna/run" "3.14.0"
+    "@lerna/version" "3.14.1"
     import-local "^1.0.0"
     npmlog "^4.1.2"
 
@@ -11250,7 +12131,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -11336,7 +12217,7 @@ lodash.assign@^3.0.0:
     lodash._createassigner "^3.0.0"
     lodash.keys "^3.0.0"
 
-lodash.assign@^4.0.1, lodash.assign@^4.2.0:
+lodash.assign@^4.0.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
@@ -11346,7 +12227,7 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -11429,6 +12310,11 @@ lodash.isinteger@^4.0.4:
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
   integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
 
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
+
 lodash.isnumber@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
@@ -11478,11 +12364,6 @@ lodash.merge@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
   integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
 
-lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
-
 lodash.omit@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
@@ -11593,7 +12474,7 @@ lodash@3.10.1, lodash@^3.10.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@4.17.11, lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.1, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10:
+lodash@4.17.11, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.1, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -11622,18 +12503,17 @@ log-update@2.3.x, log-update@^2.3.0:
     wrap-ansi "^3.0.1"
 
 logfmt@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/logfmt/-/logfmt-1.2.1.tgz#0e99838eb3a87fb6272d6d2b4fc327b95a29abee"
-  integrity sha512-QlZuQi8AlGbrXfW7LrxH/lhyFjI6Xr2DNSrIzhtIJAicAgl21P2gHpqABR3Sh0Kd4dvwTAej6jDVdh0o/HwfcA==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/logfmt/-/logfmt-1.3.2.tgz#be34020b7390b8201212a12f533e3cb4c92d70c2"
+  integrity sha512-U0lelcaGWEfEITZQXs8y5HrJp2xa0BJ+KDfkkLJRmuKbQIEVGNv145FbaNekY4ZYHJSBBx8NLJitaPtRqLEkxQ==
   dependencies:
-    lodash "4.x"
     split "0.2.x"
     through "2.3.x"
 
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+loglevel@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372"
+  integrity sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==
 
 long@^4.0.0:
   version "4.0.0"
@@ -11648,9 +12528,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3
     js-tokens "^3.0.0 || ^4.0.0"
 
 lottie-ios@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-2.5.0.tgz#55c808e785d4a6933b0c10b395530b17098b05de"
-  integrity sha1-VcgI54XUppM7DBCzlVMLFwmLBd4=
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-2.5.3.tgz#bff86b6662f9259439535d1548894c274c9e476f"
+  integrity sha512-oBtLkPJ4JkaUqUTOsmFPbSK2/fW6iBezcH5UKBgODaGMpZXCjogArXcvmG7KRNEnPiYMhgqSCKd8tDyDrwQp7Q==
 
 lottie-react-native@2.5.0:
   version "2.5.0"
@@ -11705,10 +12585,10 @@ macos-release@^1.0.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
   integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==
 
-macos-release@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
-  integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
 make-dir@^1.0.0:
   version "1.3.0"
@@ -11717,7 +12597,7 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
-make-dir@^2.0.0:
+make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -11850,9 +12730,9 @@ mem@^1.1.0:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.2.0.tgz#5ee057680ed9cb8dad8a78d820f9a8897a102025"
-  integrity sha512-5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
     mimic-fn "^2.0.0"
@@ -12211,10 +13091,10 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.38.0 < 2", mime-db@~1.38.0:
-  version "1.38.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
-  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
+mime-db@1.40.0, "mime-db@>= 1.40.0 < 2":
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
 mime-db@~1.23.0:
   version "1.23.0"
@@ -12233,27 +13113,27 @@ mime-types@2.1.11:
   dependencies:
     mime-db "~1.23.0"
 
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.22"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
-  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
   dependencies:
-    mime-db "~1.38.0"
+    mime-db "1.40.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.3.4, mime@^1.4.1:
+mime@1.6.0, mime@^1.3.4, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.0.3, mime@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+mime@^2.0.3, mime@^2.4.2:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
+  integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -12261,9 +13141,9 @@ mimic-fn@^1.0.0:
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-fn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.0.0.tgz#0913ff0b121db44ef5848242c38bbb35d44cabde"
-  integrity sha512-jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 mimic-response@^1.0.0:
   version "1.0.1"
@@ -12348,7 +13228,7 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
+minipass@^2.2.1, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -12356,7 +13236,7 @@ minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.1:
+minizlib@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
   integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
@@ -12441,9 +13321,9 @@ mocha@^5.1.1:
     supports-color "5.4.0"
 
 mochapack@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mochapack/-/mochapack-1.1.0.tgz#0fe24228b4b92a987ece2258e96188f59f248435"
-  integrity sha512-IFNA4LasRYWu2pNRjDRpoU8I/aLLgdVfkqlWz+x+tMLBrQO3HC18b+gjevIKeIfjVJ3msNJSSa4elOLNVd9HPw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/mochapack/-/mochapack-1.1.1.tgz#98d7f4bd4b7f32dfd4e3aed68d562f4c97fe38b1"
+  integrity sha512-t8WchR4+38f0BO7+nBcUexqe1NNhzr8vsylOp5wF/J1EWP47T76KRVnZIrHHjxXdnp5JJHZtUD8C0pkJG2iv0g==
   dependencies:
     babel-runtime "^6.18.0"
     chalk "^2.3.0"
@@ -12469,9 +13349,9 @@ modify-values@^1.0.0:
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 moment-timezone@^0.5.23:
-  version "0.5.23"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463"
-  integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==
+  version "0.5.25"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.25.tgz#a11bfa2f74e088327f2cd4c08b3e7bdf55957810"
+  integrity sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw==
   dependencies:
     moment ">= 2.9.0"
 
@@ -12508,11 +13388,16 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 multi-progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/multi-progress/-/multi-progress-2.0.0.tgz#29ccb42cf24874b1c6384f03127ce5dff7b22f2c"
@@ -12602,20 +13487,15 @@ named-placeholders@^1.1.2:
   dependencies:
     lru-cache "^4.1.3"
 
-nan@^2.10.0, nan@^2.9.2:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.1.tgz#a15bee3790bde247e8f38f1d446edcdaeb05f2dd"
-  integrity sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==
-
-nan@~2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
+nan@^2.12.1, nan@^2.13.2:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
 nanoid@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.1.tgz#deb55cac196e3f138071911dabbc3726eb048864"
-  integrity sha512-k1u2uemjIGsn25zmujKnotgniC/gxQ9sdegdezeDiKdkDW56THUMqlz3urndKCXJxA6yPzSZbXx/QCMe/pxqsA==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.3.tgz#dde999e173bc9d7bd2ee2746b89909ade98e075e"
+  integrity sha512-NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -12676,23 +13556,23 @@ ncp@^2.0.0, ncp@~2.0.0:
   integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
 
 needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
   dependencies:
-    debug "^2.1.2"
+    debug "^3.2.6"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
-  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
 next-tick@^1.0.0:
   version "1.0.0"
@@ -12744,9 +13624,9 @@ node-fetch@^1.0.1:
     is-stream "^1.0.1"
 
 node-fetch@^2.0.0, node-fetch@^2.2.0, node-fetch@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
-  integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
 node-forge@0.7.5:
   version "0.7.5"
@@ -12776,6 +13656,23 @@ node-gyp@^3.8.0:
     tar "^2.0.0"
     which "1"
 
+node-gyp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz#972654af4e5dd0cd2a19081b4b46fe0442ba6f45"
+  integrity sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==
+  dependencies:
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^4.4.8"
+    which "1"
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -12858,24 +13755,33 @@ node-pre-gyp@^0.11.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.11.tgz#9a0841a4b0d92b7d5141ed179e764f42ad22724a"
-  integrity sha512-8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ==
+node-pre-gyp@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
   dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
     semver "^5.3.0"
+    tar "^4"
 
-node-releases@^1.1.8:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.10.tgz#5dbeb6bc7f4e9c85b899e2e7adcc0635c9b2adf7"
-  integrity sha512-KbUPCpfoBvb3oBkej9+nrU0/7xPlVhmhhUJ1PZqwIP5/1dJkRWKWD3OONjo6M2J7tSCBtDCumLwwqeI+DWWaLQ==
+node-releases@^1.1.21:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
+  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
   dependencies:
     semver "^5.3.0"
 
 node-sass@^4.7.2:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
-  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
+  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -12884,12 +13790,10 @@ node-sass@^4.7.2:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
+    lodash "^4.17.11"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.10.0"
+    nan "^2.13.2"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
     request "^2.88.0"
@@ -12978,14 +13882,14 @@ npm-bundled@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
   integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
 
-npm-lifecycle@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
-  integrity sha512-QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g==
+npm-lifecycle@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.1.tgz#0027c09646f0fd346c5c93377bdaba59c6748fdf"
+  integrity sha512-+Vg6I60Z75V/09pdcH5iUo/99Q/vop35PaI99elvxk56azSVVsdsSsS/sXqKDNwbRRNN1qSxkcO45ZOu0yOWew==
   dependencies:
     byline "^5.0.0"
-    graceful-fs "^4.1.11"
-    node-gyp "^3.8.0"
+    graceful-fs "^4.1.15"
+    node-gyp "^4.0.0"
     resolve-from "^4.0.0"
     slide "^1.1.6"
     uid-number "0.0.6"
@@ -13096,9 +14000,9 @@ number-is-nan@^1.0.0:
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.1.tgz#08d6d75e69fd791bdea31507ffafe8c843b67e9c"
-  integrity sha512-T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
+  integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -13125,9 +14029,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-keys@^1.0.12:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-path@^0.9.2:
   version "0.9.2"
@@ -13203,9 +14107,9 @@ octokit-pagination-methods@^1.1.0:
   integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
 
 omit.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.0.tgz#e013cb86a7517b9cf6f7cfb0ddb4297256a99288"
-  integrity sha512-O1rwbvEfAdhtonTv+v6IQeMOKTi/wlHcXpI3hehyPDlujkjSBQC6Vtzg0mdy+v2KVDmuPf7hAbHlTBM6q1bUHQ==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.2.tgz#91a14f0eba84066dfa015bf30e474c47f30bc858"
+  integrity sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==
   dependencies:
     babel-runtime "^6.23.0"
 
@@ -13280,10 +14184,10 @@ opn@^3.0.2:
   dependencies:
     object-assign "^4.0.1"
 
-opn@^5.1.0, opn@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
+opn@^5.3.0, opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -13373,11 +14277,11 @@ os-name@^2.0.1:
     win-release "^1.0.0"
 
 os-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9"
-  integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
   dependencies:
-    macos-release "^2.0.0"
+    macos-release "^2.2.0"
     windows-release "^3.1.0"
 
 os-shim@^0.1.2:
@@ -13417,6 +14321,13 @@ p-defer@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
+p-each-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -13428,9 +14339,9 @@ p-is-promise@^1.1.0:
   integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
 p-is-promise@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^1.1.0:
   version "1.3.0"
@@ -13473,15 +14384,22 @@ p-map@^1.1.1, p-map@^1.2.0:
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
-  integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-pipe@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
   integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
 
+p-queue@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346"
+  integrity sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==
+  dependencies:
+    eventemitter3 "^3.1.0"
+
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
@@ -13500,9 +14418,9 @@ p-try@^1.0.0:
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 p-waterfall@^1.0.0:
   version "1.0.0"
@@ -13707,10 +14625,10 @@ parse5@4.0.0, parse5@^4.0.0:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
   integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -13786,10 +14704,11 @@ passport-oauth1@1.x.x:
     utils-merge "1.x.x"
 
 passport-oauth2@1.x.x:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.4.0.tgz#f62f81583cbe12609be7ce6f160b9395a27b86ad"
-  integrity sha1-9i+BWDy+EmCb585vFguTlaJ7hq0=
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.5.0.tgz#64babbb54ac46a4dcab35e7f266ed5294e3c4108"
+  integrity sha512-kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ==
   dependencies:
+    base64url "3.x.x"
     oauth "0.9.x"
     passport-strategy "1.x.x"
     uid2 "0.0.x"
@@ -13835,7 +14754,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -13949,20 +14868,20 @@ pg-pool@^2.0.4:
   integrity sha512-hod2zYQxM8Gt482q+qONGTYcg/qVcV32VHVPtktbBJs0us3Dj7xibISw0BAAXVMCzt8A/jhfJvpZaxUlqtqs0g==
 
 pg-types@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.0.0.tgz#038ddc302a0340efcdb46d0581cc7caa2303cbba"
-  integrity sha512-THUD7gQll5tys+5eQ8Rvs7DjHiIC3bLqixk3gMN9Hu8UrCBAOjf35FoI39rTGGc3lM2HU/R+Knpxvd11mCwOMA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.0.1.tgz#b8585a37f2a9c7b386747e44574799549e5f4933"
+  integrity sha512-b7y6QM1VF5nOeX9ukMQ0h8a9z89mojrBHXfJeSug4mhL0YpxNBm83ot2TROyoAmX/ZOX3UbwVO4EbH7i1ZZNiw==
   dependencies:
     pg-int8 "1.0.1"
     postgres-array "~2.0.0"
     postgres-bytea "~1.0.0"
-    postgres-date "~1.0.0"
+    postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
 pg@^7.4.0:
-  version "7.8.2"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-7.8.2.tgz#d53ffcbbaa789e15e80ffec570603294d90116e8"
-  integrity sha512-5U4fjV43DnQxelkhyPdU3YfUbYVa21bNmreXRCM/gFFw09YxWaitWWITm/u0twUNF5EYOSDhkgyEAocgtpP9JQ==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-7.11.0.tgz#a8b9ae9cf19199b7952b72957573d0a9c5e67c0c"
+  integrity sha512-YO4V7vCmEMGoF390LJaFaohWNKaA2ayoQOEZmiHVcAUF+YsRThpf/TaKCgSvsSE7cDm37Q/Cy3Gz41xiX/XjTw==
   dependencies:
     buffer-writer "2.0.0"
     packet-reader "1.0.0"
@@ -14006,7 +14925,7 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.0:
+pirates@^4.0.0, pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
@@ -14095,11 +15014,11 @@ pn@^1.1.0:
   integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
 popper.js@^1.12.9:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
-  integrity sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
+  integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
 
-portfinder@^1.0.9:
+portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -14176,10 +15095,10 @@ postcss@^6.0.1, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.14:
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
-  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
+postcss@^7.0.0, postcss@^7.0.16:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -14195,10 +15114,10 @@ postgres-bytea@~1.0.0:
   resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
   integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
 
-postgres-date@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8"
-  integrity sha1-4tiXAu/bJY/52c7g/pG9BpdSV6g=
+postgres-date@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728"
+  integrity sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA==
 
 postgres-interval@^1.1.0:
   version "1.2.0"
@@ -14239,10 +15158,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.14.3, prettier@^1.9.2:
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+prettier@^1.9.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.0.tgz#d1701ca9b2941864b52f3262b35946d2c9cd88f0"
+  integrity sha512-YsdAD29M0+WY2xXZk3i0PA16olY9qZss+AuODxglXcJ+2ZBwFv+6k5tE8GS8/HKAthaajlS/WqhdgcjumOrPlg==
 
 pretty-error@^2.0.2:
   version "2.1.1"
@@ -14268,12 +15187,12 @@ pretty-format@^23.0.1, pretty-format@^23.6.0:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-pretty-format@^24.0.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.5.0.tgz#cc69a0281a62cd7242633fc135d6930cd889822d"
-  integrity sha512-/3RuSghukCf8Riu5Ncve0iI+BzVkbRU5EeUoArKARZobREycuH5O4waxvaNIloEXdb0qwgmEAed5vTpX1HNROQ==
+pretty-format@^24.7.0, pretty-format@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
+  integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.8.0"
     ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
@@ -14368,6 +15287,14 @@ prompts@^0.1.9:
     kleur "^2.0.1"
     sisteransi "^0.1.1"
 
+prompts@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz#bf90bc71f6065d255ea2bdc0fe6520485c1b45db"
+  integrity sha512-+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg==
+  dependencies:
+    kleur "^3.0.2"
+    sisteransi "^1.0.0"
+
 promzard@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
@@ -14384,7 +15311,7 @@ prop-types@15.6.1:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-prop-types@15.x, prop-types@^15, prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
+prop-types@15.x, prop-types@^15, prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -14410,13 +15337,13 @@ protoduck@^5.0.1:
   dependencies:
     genfun "^5.0.0"
 
-proxy-addr@~2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
+proxy-addr@~2.0.4, proxy-addr@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
+    ipaddr.js "1.9.0"
 
 prr@~1.0.1:
   version "1.0.1"
@@ -14429,9 +15356,9 @@ pseudomap@^1.0.2:
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24, psl@^1.1.28:
-  version "1.1.31"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
-  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
+  version "1.1.32"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
+  integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -14505,10 +15432,10 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.5.0, qs@^6.5.1:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
-  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
+qs@6.7.0, qs@^6.5.0, qs@^6.5.1:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 query-string@^5.0.1:
   version "5.1.1"
@@ -14519,12 +15446,13 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^6.2.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.4.0.tgz#1566c0cec3a2da2d82c222ed3f9e2a921dba5e6a"
-  integrity sha512-Werid2I41/tJTqOGPJ3cC3vwrIh/8ZupBQbp7BSsqXzr+pTin3aMJ/EZb8UEuk7ZO3VqQFvq2qck/ihc6wqIdw==
+query-string@^6.4.2:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.6.0.tgz#a6b7dfd57ad67e346b143d033df2b1e4cfb6b53a"
+  integrity sha512-Xhvaa80rZzfvI7gYXF6ism5otKTyea90XROstBTBKiWE/tDfnIDbQwkGLguJaQBNweVCW4T9DoTe5eyox0CbZQ==
   dependencies:
     decode-uri-component "^0.2.0"
+    split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
 querystring-es3@^0.2.0:
@@ -14537,10 +15465,10 @@ querystring@0.2.0, querystring@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
+querystringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quick-lru@^1.0.0:
   version "1.1.0"
@@ -14588,15 +15516,15 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.0.3, range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
+range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
 raven-js@^3.17.0:
-  version "3.27.0"
-  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.0.tgz#9f47c03e17933ce756e189f3669d49c441c1ba6e"
-  integrity sha512-vChdOL+yzecfnGA+B5EhEZkJ3kY3KlMzxEhShKh6Vdtooyl0yZfYNFQfYzgMf2v4pyQa+OTZ5esTxxgOOZDHqw==
+  version "3.27.2"
+  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775"
+  integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ==
 
 raven@^2.1.1:
   version "2.6.4"
@@ -14619,6 +15547,16 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-loader@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
@@ -14634,10 +15572,10 @@ rc-align@^2.4.0, rc-align@^2.4.1:
     prop-types "^15.5.8"
     rc-util "^4.0.4"
 
-rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.5.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.6.0.tgz#ca8440d042781af7a1329d84f97ea94794c5ec15"
-  integrity sha512-JXDycchgbOI+7T/VKmFWnAIn042LLScK1fNkmNunb0jz5q5aPGCAybx2bTo7X5t31Jkj9OsxKNb/vZPDPWufCg==
+rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.5.4, rc-animate@^2.6.0, rc-animate@^2.8.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.8.3.tgz#80d45402f35d3617276fc14810fb8a635fe90dc0"
+  integrity sha512-VPSHJF/PW9zrPVCdQ94/YOI2lFfJVlaiAeQveJN2nlPVMivgvXkuFJyfe42GbZqm+qlnRjH9B4WbY9rCZz9miw==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.6"
@@ -14646,7 +15584,7 @@ rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.5.4:
     raf "^3.4.0"
     react-lifecycles-compat "^3.0.4"
 
-rc-animate@^3.0.0-rc.1, rc-animate@^3.0.0-rc.4, rc-animate@^3.0.0-rc.5:
+rc-animate@^3.0.0-rc.1:
   version "3.0.0-rc.6"
   resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.0.0-rc.6.tgz#04288eefa118e0cae214536c8a903ffaac1bc3fb"
   integrity sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==
@@ -14660,10 +15598,10 @@ rc-animate@^3.0.0-rc.1, rc-animate@^3.0.0-rc.4, rc-animate@^3.0.0-rc.5:
     rc-util "^4.5.0"
     react-lifecycles-compat "^3.0.4"
 
-rc-calendar@~9.10.3:
-  version "9.10.10"
-  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.10.10.tgz#82ba059e98cdd1957e1740ec3eaac407a60e108f"
-  integrity sha512-WFnxpXGzIt2cPCJjFmrju/w2jZHAO9jW3JSDZovaJuBtVciu1p8brL6PSjWCo4flD3jVurL9LO8tJwgajELj2w==
+rc-calendar@~9.14.0:
+  version "9.14.5"
+  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.14.5.tgz#77c9d6bfec827d2e325adc770f1cef2fa2e4fc0e"
+  integrity sha512-UCo2O7e3hfOJrV0pkBzpw5vedwyn08YTWvErMTvYbz3nE7rLehXH6i2ABUe1fMCIXoH+YDhQ085SRJgKyA3mZA==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -14674,9 +15612,9 @@ rc-calendar@~9.10.3:
     react-lifecycles-compat "^3.0.4"
 
 rc-cascader@~0.17.0:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.17.1.tgz#914481c3370b5fd8f82e4f9df9b6596dfeda14d5"
-  integrity sha512-JED1iOLpj1+uob+0Asd4zwhhMRp3gLs2iYOY2/0OsdEsPc8Qj6TUwj8+isVtqyXiwGWG3vo8XgO6KCM/i7ZFqQ==
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.17.4.tgz#bb38ba3ed0990bfaa5ee547467d85ecc0d152f96"
+  integrity sha512-CeFQJIMzY7x++uPqlx4Xl/cH8iTs8nRoW522+DLb21kdL5kWqKlK+3iHXExoxcAymjwo5ScIiXi+NY4m8Pgq9w==
   dependencies:
     array-tree-filter "^2.1.0"
     prop-types "^15.5.8"
@@ -14687,19 +15625,19 @@ rc-cascader@~0.17.0:
     warning "^4.0.1"
 
 rc-checkbox@~2.1.5:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.6.tgz#5dc00653e5277018c431fec55e38b91c1f976e90"
-  integrity sha512-+VxQbt2Cwe1PxCvwosrAYXT6EQeGwrbLJB2K+IPGCSRPCKnk9zcub/0eW8A4kxjyyfh60PkwsAUZ7qmB31OmRA==
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.7.tgz#ae6785525cf35fa4c62d706c4a1ff7b2b1fcb821"
+  integrity sha512-8L+0XuucUOMUM6F/7qH+hnQpEHPZfW1Um02lUHEVdpZNor5mC0Fj4x8GvTtwcM1pAl5tD3I6lHYD8cE1W8RZJw==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
     prop-types "15.x"
-    rc-util "^4.0.4"
+    react-lifecycles-compat "^3.0.4"
 
 rc-collapse@~1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.11.1.tgz#4aa0977adbf5229d7db58205646b13905add72ad"
-  integrity sha512-9HA8f7aWE0yabnzfE2v/7IyMb6dTmj052A9cyEMB0aT1sdLESpetMAzT3FkLcPT5fl7YNRkyVZ3zwkC5qMmzmA==
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.11.3.tgz#6f0c5ef65e66930c11fe9e7d2483a8a4c362f2d3"
+  integrity sha512-yECQX2iDPWnKcVi3Wz5bomZuJ2u+wv+kGxuKo2GIRz7Brh9jkGQz5ElghCV1jqDGnzy8GIRxxHHSwlSgdxdUog==
   dependencies:
     classnames "2.x"
     css-animation "1.x"
@@ -14708,19 +15646,19 @@ rc-collapse@~1.11.1:
     react-is "^16.7.0"
     shallowequal "^1.1.0"
 
-rc-dialog@~7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.3.0.tgz#d5b8c4bb4f4b2ac38bb5a839ab9e255b8a88b1ac"
-  integrity sha512-YLQHqZuU0cO02LUwhCsCCtvSw24SKLrT4DkNHCNGGcH9YpZP/IOFaH4zVUmXGEQiwyt0D1f3volHthMCKzLzMg==
+rc-dialog@~7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.4.0.tgz#640551235b1f886c7f9a01ce75f87102a70ae1d4"
+  integrity sha512-X2JdDjphlOHPkqXUmmTAhYvcDAgGeM/VFjF5r/AMqjDYIL2xZkvrrOOq7KNxddRAJ0r1V4Ib/MTgCfhhti/aew==
   dependencies:
     babel-runtime "6.x"
     rc-animate "2.x"
     rc-util "^4.4.0"
 
-rc-drawer@~1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-1.7.7.tgz#b014d1de52457c85c4f3e1f0d647a54031dd260c"
-  integrity sha512-7dESNkClYdWGSdBdwcfeOz6DUCqzrW44QT013fsTBJIiWNLSLgDV5KoHKXG8VTJWU4mBn7M5Lqgyr94CRZcxGA==
+rc-drawer@~1.9.3:
+  version "1.9.8"
+  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-1.9.8.tgz#241dae399d6fc3d8ea117e768b27088d97cb5946"
+  integrity sha512-LUOsMdax6yFhCbHpzpPBpf4GlQaLQ1OoBrpyImREghynfVoCs8WT6WUfE3FWWG1PM0Fs8f+yY4uiR7rMFQxl5A==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -14739,9 +15677,9 @@ rc-dropdown@~2.4.1:
     react-lifecycles-compat "^3.0.2"
 
 rc-editor-core@~0.8.3:
-  version "0.8.9"
-  resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.8.9.tgz#f611952c8eed965e3e348d84ae7be885daeb221c"
-  integrity sha512-fGTkTm96Kil/i9n5a3JwAzJcl2TkfjO1r1WBWf6NIOxXiJXpC3Lajkf3j6E5K7iz5AW0QRaSGnNQFBrwvXKKWA==
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.8.10.tgz#6f215bc5df9c33ffa9f6c5b30ca73a7dabe8ab7c"
+  integrity sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw==
   dependencies:
     babel-runtime "^6.26.0"
     classnames "^2.2.5"
@@ -14752,23 +15690,23 @@ rc-editor-core@~0.8.3:
     setimmediate "^1.0.5"
 
 rc-editor-mention@^1.1.7:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-1.1.12.tgz#896bcb172112f18812e96fdd33ba603c0fc7306a"
-  integrity sha512-cPm2rQ7P+hXaKMsO0ajVv08QlTDcSPVtw8/lVr9D+QzQKRPChCqLw9rVGOa4YGYTeS3gVe8lBfLr8a9JKFk3gA==
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz#9f1cab1065f86b01523840321790c2ab12ac5e8b"
+  integrity sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.5"
     dom-scroll-into-view "^1.2.0"
     draft-js "~0.10.0"
-    immutable "^3.7.4"
+    immutable "~3.7.4"
     prop-types "^15.5.8"
     rc-animate "^2.3.0"
     rc-editor-core "~0.8.3"
 
 rc-form@^2.4.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.4.3.tgz#742ed935ed029c6cd9a98ee6837cb37ab3b51e5d"
-  integrity sha512-59KeQat5TU4YzpfXYpFlyQ1/5uFXm0SV7VokRr+i8bPMhimpKpZl5gt0J7dNiKLTsGnkCqBLSL88d9ufPJ+EQQ==
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.4.5.tgz#9aa8c844b6fea1da5a03ed5e4f8475bfd0fd6ab7"
+  integrity sha512-qyltQUDSJDFmK2vavNn5GdbA4+P9Xd10kRzOKGZpl4NNAKirKZ4F6MAuY3n5U/k74LIZ3kme1+SEkxNaHuYyTA==
   dependencies:
     async-validator "~1.8.5"
     babel-runtime "6.x"
@@ -14795,21 +15733,33 @@ rc-hammerjs@~0.6.0:
     prop-types "^15.5.9"
 
 rc-input-number@~4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.4.0.tgz#0ddaaab925a7b0d6c6dbc9eb157ca23e9529b8c7"
-  integrity sha512-AsXLVaQZ7rCU71B8zzP3nviL8/CkFGDcp5kIlpMzBdGIHoLyRnXcxei3itH9PfFSgMBixEnb5hFVoTikFbNWSQ==
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.4.5.tgz#81473d2885a6b312e486c4f2ba3f441c1ab88520"
+  integrity sha512-Dt20e8Ylc/N/6oXiPUlwDVdx3fz7W5umUOa4z5pBuWFG7NPlBVXRWkq7+nbnTyaK24UxN67PVpmD3+Omo+QRZQ==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.0"
-    is-negative-zero "^2.0.0"
     prop-types "^15.5.7"
     rc-util "^4.5.1"
     rmc-feedback "^2.0.0"
 
-rc-menu@^7.3.0, rc-menu@~7.4.12:
-  version "7.4.21"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.21.tgz#8a728afd8db81312c913511b6502d9de596d72fd"
-  integrity sha512-TfcwybKLuw2WhEkplYH7iFMGlDbH6KhPcd+gv5J2oLQcgiGeUECzyOWSVaFRRlkpB7g2eNzXbha/AXN/Xyzvnw==
+rc-mentions@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-0.3.1.tgz#7c54f8fbd2e203c56ff4e0a0191ce4a2c9a88c86"
+  integrity sha512-fa5dN3IMTahJfAga1nmma9OymK/ZBV/MZfV11h4kjDmCAVETv5EbAlV0mn6Y+JajvXS6n/XFoPUSF+nwK/AeWw==
+  dependencies:
+    "@ant-design/create-react-context" "^0.2.4"
+    babel-runtime "^6.23.0"
+    classnames "^2.2.6"
+    rc-menu "^7.4.22"
+    rc-trigger "^2.6.2"
+    rc-util "^4.6.0"
+    react-lifecycles-compat "^3.0.4"
+
+rc-menu@^7.3.0, rc-menu@^7.4.22, rc-menu@~7.4.12:
+  version "7.4.23"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.23.tgz#e07d497864274076299d7d8a84d14fc86b6bd30d"
+  integrity sha512-d0pUMN0Zr3GCFxNpas8p7AUTeX8viItUOQXku4AsyX82ZzUz79HgGul2Nk17BIFTtLzqdB7/NT6WVb5PAOOILw==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -14834,12 +15784,13 @@ rc-notification@~3.3.0:
     rc-animate "2.x"
     rc-util "^4.0.4"
 
-rc-pagination@~1.17.7:
-  version "1.17.8"
-  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.17.8.tgz#65583bebe13fffe4de7f418e1a6c86374ceabceb"
-  integrity sha512-duEV+K/b/nZNGr943+TMCEcY4xWkjAkpKW0Vr7fSR8wQk0DY7aTJC+k+vjl4X2EzEmPXqy85hibzpsO9vydKAw==
+rc-pagination@~1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.20.1.tgz#d53a0564282a79129588fbd2b74885d7d315f0bb"
+  integrity sha512-EC2sxfKo1+R34fDN8EQgFiJn0Z6SKef4O0FizoqV3IomPczSikoarxL1RrHzqeGNsfg7JbUYaux5fQdmUAlPnA==
   dependencies:
     babel-runtime "6.x"
+    classnames "^2.2.6"
     prop-types "^15.5.7"
     react-lifecycles-compat "^3.0.4"
 
@@ -14861,10 +15812,10 @@ rc-rate@~2.5.0:
     rc-util "^4.3.0"
     react-lifecycles-compat "^3.0.4"
 
-rc-select@~9.0.0:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-9.0.2.tgz#ce0d297db5f8a5c7e8bbc3fc24d9ed5ba648012c"
-  integrity sha512-lwFz/aINmbznQmKvq/jFipc922h+RhA+iKCicxAglTqC4qmXg2REKWzviT5Tk0kqVe4mHcfNX8PyvMEHSmkaLA==
+rc-select@~9.1.0:
+  version "9.1.4"
+  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-9.1.4.tgz#de6dc0eb5a3d9573fbd9084930e44f09703dbe69"
+  integrity sha512-vW6Zsm9MrzxKI4/GRGTJESONn5TqCE7sXEv3uAz1KFby/eImUo5/ngLUn7V8ey8rs4P72UyMvhUfnNzbrcrvOw==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
@@ -14880,9 +15831,9 @@ rc-select@~9.0.0:
     warning "^4.0.2"
 
 rc-slider@~8.6.5:
-  version "8.6.7"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.7.tgz#fa0cbbd0251394c7cda8dd1b62d10bb7e9b1b840"
-  integrity sha512-QIFWMnK1VLc4TtJSZJgjhI6UOhN8eg53EM2La+eRa8rSPZwJT3rIWfZnTZs7OV7zXG/AiLWN4G+oGxuMcEFpsg==
+  version "8.6.12"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.12.tgz#40bb0a6e35f13183f08a3e6aa9a2adbd8dabd39d"
+  integrity sha512-mfYRg7H/smb2MlbqAB+/a34e8PeVqAr7t7hrfSS5+0njuDin4qCwoUHkX1jygGeEwtMAdGJ3buE0wRW988R7Xw==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -14892,10 +15843,10 @@ rc-slider@~8.6.5:
     shallowequal "^1.0.1"
     warning "^4.0.3"
 
-rc-steps@~3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.3.1.tgz#4877e2897331e3bfdb6b789e88aea78f4f15f732"
-  integrity sha512-LGzmPYS9ETePo+6YbHlFukCdcKppeBZXO49ZxewaC7Cba00q0zrMXlexquZ4fm+9iz0IkpzwgmenvjsVWCmGOw==
+rc-steps@~3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.4.1.tgz#7f7d127dd60f9fa92ece27c06035c9319c5cab8e"
+  integrity sha512-zdeOFmFqiXlXCQyHet1qrDDbGKZ7OQTrlzn8DP5N6M/WqN7HaYoUDy1fZ+NY2htL5WzzVFQpDRKzjiOiHaSqgw==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.3"
@@ -14921,10 +15872,10 @@ rc-switch@~1.9.0:
     prop-types "^15.5.6"
     react-lifecycles-compat "^3.0.4"
 
-rc-table@~6.4.0:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.4.3.tgz#c84bdf3f45c123f40790e93a2a241b62f6b1e59f"
-  integrity sha512-4/f7mS87EtNxM2vhIaA7I1J8hPZ5OiOQwmjac7RJTmGOFVA8PJDGwEipeyU/eC9RM7f3v4Lc+a05KCfIbRU4tg==
+rc-table@~6.5.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.5.1.tgz#b05ef79127e24b353083f8399dedaa9cbfbd16a2"
+  integrity sha512-Tu6+UQmKV5ZKMs3TB52OUb9oF9epyk/wlSQxGa7eP6fBQfKcjNVEfzVEjayh203IWI39xjHw0cgeMuvTnnRHaQ==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -14938,9 +15889,9 @@ rc-table@~6.4.0:
     warning "^3.0.0"
 
 rc-tabs@~9.6.0:
-  version "9.6.2"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.6.2.tgz#a33652e252ff335874ad3d0c81cb598cbae5f881"
-  integrity sha512-yYyL/94ZW+C2RxIaY85fiNQi7NJ+y2aDpy4A/yr7IWOdgKspgF0G8JPDFf9SS2vlEdeZFL+y+kDFRjxkZuP6UA==
+  version "9.6.4"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.6.4.tgz#8910f79f0dbfbcb794a3ff879642311fc7c3eff0"
+  integrity sha512-l4PoDSShNJ6pWGuR1UcUgvee48b3Qu1jgMEaD1hH3Rc+mqysoO7hA9AQ1YywkIy34afGTTejAWDSIFZ0lmg08g==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -14950,16 +15901,18 @@ rc-tabs@~9.6.0:
     raf "^3.4.1"
     rc-hammerjs "~0.6.0"
     rc-util "^4.0.4"
+    resize-observer-polyfill "^1.5.1"
     warning "^3.0.0"
 
 rc-time-picker@~3.6.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.6.2.tgz#fd7133390353c6cd29ec09aa6c9711ab59228f1c"
-  integrity sha512-SyGEVXO0ImeG2mz+7fkVmDoVM0+OrX6uYGpKYijNr/lAah7c5p310ZR6fVrblXOl4TpqVnfWR67RMJ3twAyM7w==
+  version "3.6.6"
+  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.6.6.tgz#343390ad1a3a06b49848c266d8311b3c572ca0d1"
+  integrity sha512-NVeJuxWjg9eJ0+jcCCT2dxVY2OBYxOrjsgu8ly0lk9IUJ8lwjS6JU+OibHRPJPew3Smfz88dz7GQRdBE7BcnRA==
   dependencies:
     classnames "2.x"
     moment "2.x"
     prop-types "^15.5.8"
+    raf "^3.4.1"
     rc-trigger "^2.2.0"
 
 rc-tooltip@^3.7.0, rc-tooltip@~3.7.3:
@@ -14971,48 +15924,48 @@ rc-tooltip@^3.7.0, rc-tooltip@~3.7.3:
     prop-types "^15.5.8"
     rc-trigger "^2.2.2"
 
-rc-tree-select@~2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-2.6.1.tgz#07c03ffa36d9dad3a515514eba37869b411c067a"
-  integrity sha512-ZNGZMKIIwikgqvpbC8YJlv33OeGWlHiVbr42IXYTmVORoO3QpJuZPW95sF/Yhpjk86DgjuuM3HreoLPAOZCVQQ==
+rc-tree-select@~2.9.1:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-2.9.1.tgz#d076b8ce5bf432df3fdd8a6a01cdd9c93c8e7399"
+  integrity sha512-AfJQC1ZzaeH+Onmx84TtVLUL2guBZe7exA8XSfj1RRB1doDbYGTtybzpP3CEw/tuSftSRnz+iPt+iaxRTrgXRw==
   dependencies:
     classnames "^2.2.1"
     dom-scroll-into-view "^1.2.1"
     prop-types "^15.5.8"
     raf "^3.4.0"
-    rc-animate "^3.0.0-rc.4"
-    rc-tree "~1.15.0"
+    rc-animate "^2.8.2"
+    rc-tree "~2.0.0"
     rc-trigger "^3.0.0-rc.2"
     rc-util "^4.5.0"
     react-lifecycles-compat "^3.0.4"
     shallowequal "^1.0.2"
     warning "^4.0.1"
 
-rc-tree@~1.14.6:
-  version "1.14.10"
-  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.14.10.tgz#4e0dc70c43da03650b5b776bda1b480a5bea85ee"
-  integrity sha512-iOn7+SpWzM4OQoF/7wJeFiuRpBGJ3ndTe6YVGnfIhsWqDd7S6a7z0anDQcBpPsW/PvisjNDXr4zKchZvx+0iCA==
+rc-tree@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-2.0.0.tgz#68fc4c9ab696943b279a143619e2ecf05918fb53"
+  integrity sha512-DAT/jsbnFbHqG9Df9OaVG93CAVtTsJVnJiwKX+wqsG8TChpty3s6QX3zJZ+gBgjkq4ikLbu1kuFJtX63EKhSAA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
     prop-types "^15.5.8"
-    rc-animate "^3.0.0-rc.5"
+    rc-animate "^2.6.0"
     rc-util "^4.5.1"
     react-lifecycles-compat "^3.0.4"
     warning "^3.0.0"
 
-rc-tree@~1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.15.2.tgz#a0d6f20fa2bdbe51d829d5ceea74a407b04bfea9"
-  integrity sha512-VPXLA/GdV6U9N8evpl4rmjRsBkw5BoweqWjcVBVwYGzBtonNIFpdc+bnb7TDmd6S3mKOM7mXPbiSr2GKYdj4hA==
+rc-tree@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-2.1.0.tgz#ea43c246cf9038fa16be5d08a08c73a38aa6aa61"
+  integrity sha512-DyHG/W9rW8cYfBrqVrZUep5yt30scyBuYvFnGrU32bh1DUj8GKqOcdoRBaIiOBYurmIiJ02rq6BeBbvVtVp0mw==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
     prop-types "^15.5.8"
-    rc-animate "^3.0.0-rc.5"
+    rc-animate "^2.6.0"
     rc-util "^4.5.1"
     react-lifecycles-compat "^3.0.4"
-    warning "^3.0.0"
+    warning "^4.0.3"
 
 rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0, rc-trigger@^2.5.1, rc-trigger@^2.5.4, rc-trigger@^2.6.2:
   version "2.6.2"
@@ -15040,16 +15993,16 @@ rc-trigger@^3.0.0-rc.2:
     rc-util "^4.4.0"
 
 rc-upload@~2.6.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.6.3.tgz#99f0f4b948e82c71280a507399ee4bf2fc16b440"
-  integrity sha512-wM57UH/EEqW2/EcWz5nwnU07d4LHDHjBgxRin2Q56TW9JcFVnaQVq/JHycVFumsgSFV5CZfNW8PBROsKT9VFMw==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.6.7.tgz#835d8dceae2c7bdfb7c81211d6ddf02348097146"
+  integrity sha512-i6roYvM31ue50r0w/MbxOdbbkZHqpJLT29JyjQC2W5i/7w0/lZJkWEmj/DG5WRRJCnVfIiKmXp2437oXnUFNuw==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
     prop-types "^15.5.7"
     warning "4.x"
 
-rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1:
+rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1, rc-util@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.6.0.tgz#ba33721783192ec4f3afb259e182b04e55deb7f6"
   integrity sha512-rbgrzm1/i8mgfwOI4t1CwWK7wGe+OwX+dNa7PVMgxZYPBADGh86eD4OcJO1UKGeajIMDUUKMluaZxvgraQIOmw==
@@ -15078,16 +16031,16 @@ react-addons-test-utils@^16.0.0-alpha.3:
     object-assign "^4.1.0"
 
 react-art@^16.8.0:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react-art/-/react-art-16.8.4.tgz#9c9afa3d8a78ded11c3328f262ba3495d9efa77e"
-  integrity sha512-f8dH7bWrWE9oFXjjvFf4NnhXSJAjPlGxtKsQyzJEHyDGX8iir1zwtuPamPByybezkGw2pxaSukCu+5ShJH8I6g==
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-art/-/react-art-16.8.6.tgz#66707f8bb20a27147bce47402e38eefc9fd863fd"
+  integrity sha512-viR81SLSrUNF8YCLCdhLKKP3hLMxpyJPzozl0Zq6F3ALKGcynBd92MZHVl1oLkMBvCyS4Qf8s5pandJg34YHxA==
   dependencies:
     art "^0.10.1"
     create-react-class "^15.6.2"
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.4"
+    scheduler "^0.13.6"
 
 react-clone-referenced-element@^1.0.1:
   version "1.1.0"
@@ -15130,14 +16083,14 @@ react-devtools-core@3.3.4:
     ws "^3.3.1"
 
 react-dom@^16.8.0:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48"
-  integrity sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
+  integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.4"
+    scheduler "^0.13.6"
 
 react-dropzone@^4.2.3:
   version "4.3.0"
@@ -15147,7 +16100,7 @@ react-dropzone@^4.2.3:
     attr-accept "^1.1.3"
     prop-types "^15.5.7"
 
-react-fast-compare@^2.0.1:
+react-fast-compare@^2.0.1, react-fast-compare@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
@@ -15158,19 +16111,19 @@ react-ga@^2.3.5:
   integrity sha512-UmATFaZpEQDO96KFjB5FRLcT6hFcwaxOmAJZnjrSiFN/msTqylq9G+z5Z8TYzN/dbamDTiWf92m6MnXXJkAivQ==
 
 react-helmet@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.0.tgz#a81811df21313a6d55c5f058c4aeba5d6f3d97a7"
-  integrity sha1-qBgR3yExOm1VxfBYxK66XW89l6c=
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.1.tgz#16a7192fdd09951f8e0fe22ffccbf9bb3e591ffa"
+  integrity sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==
   dependencies:
-    deep-equal "^1.0.1"
     object-assign "^4.1.1"
     prop-types "^15.5.4"
+    react-fast-compare "^2.0.2"
     react-side-effect "^1.1.0"
 
 react-hot-loader@^4.1.2, react-hot-loader@^4.3.6:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.8.0.tgz#0b7c7dd9407415e23eb8246fdd28b0b839f54cb6"
-  integrity sha512-HY9F0vITYSVmXhAR6tPkMk240nxmoH8+0rca9iO2B82KVguiCiBJkieS0Wb4CeSIzLWecYx3iOcq8dcbnp0bxA==
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.9.0.tgz#498e5f76aae28bfd420efdabddf5af156745b4dd"
+  integrity sha512-1N6MWV9++qYWrrs41MRhxATwyx743tr8RpeyL1VOZ54zsU8fOx4slYreHZ8v2BDGVfy+dJ0myJZrJA9/26RlCA==
   dependencies:
     fast-levenshtein "^2.0.6"
     global "^4.3.0"
@@ -15191,15 +16144,10 @@ react-i18next@^7.6.0:
     html-parse-stringify2 "2.0.1"
     prop-types "^15.6.0"
 
-react-is@^16.3.1, react-is@^16.5.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
-  integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
-
-react-is@^16.6.3:
-  version "16.8.5"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.5.tgz#c54ac229dd66b5afe0de5acbe47647c3da692ff8"
-  integrity sha512-sudt2uq5P/2TznPV4Wtdi+Lnq3yaYW8LfvPKLM9BKD8jJNBkxMVyB0C9/GmVhLw7Jbdmndk/73n7XQGeN9A3QQ==
+react-is@^16.3.1, react-is@^16.5.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
 react-lazy-load@^3.0.13:
   version "3.0.13"
@@ -15217,9 +16165,9 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, react-lifecycles
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
 react-native-animatable@^1.2.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.1.tgz#f004a7e9de6838d0fbf210d642593cff7affd9ef"
-  integrity sha512-NoE6OAgCrhggWBRV6rBJup5vLAGoTjx168Tku1RZmjUGIdYRAyGesP/MoqvxiNJjhTAgwYx2LT63VTT1xO8g4Q==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.2.tgz#4783ee1a73dc98815aef234ce6b819f80bfe7d80"
+  integrity sha512-rmah3KQ63ft8DxkzFUwJSuZeq+oSYwldoGF4DTOR5WM2WR5wiWLgBAtrAHlI3Di3by323uOR21s+MlqPcHz2Kw==
   dependencies:
     prop-types "^15.5.10"
 
@@ -15229,9 +16177,11 @@ react-native-branch@2.2.5:
   integrity sha1-QHTdY7SXPmOX2c5Q6XtXx3pRjp0=
 
 react-native-camera-roll-picker@^1.2.1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/react-native-camera-roll-picker/-/react-native-camera-roll-picker-1.2.3.tgz#b117fd3a2b9012dcccee1261a9bc427226b8d6d2"
-  integrity sha1-sRf9OiuQEtzM7hJhqbxCcia41tI=
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/react-native-camera-roll-picker/-/react-native-camera-roll-picker-1.3.0.tgz#7d28465da32f66155da7e8ae2ce79b0debeb6743"
+  integrity sha512-D9rG0jjyhcfB5GKvC9dU3wjlRf+1Dj4H/B9sZmBU1CppDBofHjNCTtVQsLQMhXAG6XbHZqHUqqJik0RKCuPZEQ==
+  dependencies:
+    prop-types "^15.6.0"
 
 react-native-collapsible@^0.9.0:
   version "0.9.0"
@@ -15296,9 +16246,9 @@ react-native-elements@^0.19.1:
     prop-types "^15.5.8"
 
 react-native-flip-card@^3.4.1:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/react-native-flip-card/-/react-native-flip-card-3.5.3.tgz#92157d9bf40103d04294c5fc754ce88c2bb94202"
-  integrity sha512-GyLIoit1n1hjFKdayP5vvay6mYS3UOYC6j8bqidTFJJeAxeVSNAVhW+uqlSNOX6bAVhRgXrbSSwa9ZNmZVS79g==
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/react-native-flip-card/-/react-native-flip-card-3.5.5.tgz#14f13d5178660e5365e7be4ed8dbb6ff289dd1e8"
+  integrity sha512-7PCMfsQ/7K8oN0NVusYNgK4sanY7KLimnPVj5TadkQaSm0zEi7/Jy/rHfnNQQibNBImov6zzQkmcP8ch6RN5Yw==
   dependencies:
     prop-types "^15.5.10"
 
@@ -15338,9 +16288,9 @@ react-native-invertible-scroll-view@^1.1.0:
     react-native-scrollable-mixin "^1.0.1"
 
 react-native-iphone-x-helper@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796"
-  integrity sha512-xIeTo4s77wwKgBZLVRIZC9tM9/PkXS46Ul76NXmvmixEb3ZwqGdQesR3zRiLMOoIdfOURB6N9bba9po7+x9Bag==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz#645e2ffbbb49e80844bb4cbbe34a126fda1e6772"
+  integrity sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ==
 
 react-native-keyboard-aware-scroll-view@0.8.0:
   version "0.8.0"
@@ -15362,7 +16312,7 @@ react-native-lightbox@^0.7.0:
   dependencies:
     prop-types "^15.5.10"
 
-react-native-maps@expo/react-native-maps#v0.22.1-exp.0:
+"react-native-maps@github:expo/react-native-maps#v0.22.1-exp.0":
   version "0.22.1"
   resolved "https://codeload.github.com/expo/react-native-maps/tar.gz/e6f98ff7272e5d0a7fe974a41f28593af2d77bb2"
 
@@ -15403,10 +16353,10 @@ react-native-reanimated@1.0.0-alpha.11:
   resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.0.0-alpha.11.tgz#b78c839bae878d149561b56a3c750414957ea86d"
   integrity sha512-lDakjY8CXmZiSN71hyc276b3d7M9mKV9ZyYw4W/rTnnJbgBFaqdIxSHq4S4LxSbVqpAoQMfUJqPTE0BKbAz7Aw==
 
-react-native-safe-area-view@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.13.1.tgz#834bbb6d22f76a7ff07de56725ee5667ba1386b0"
-  integrity sha512-d/pu2866jApSwLtK/xWAvMXZkNTIQcFrjjbcTATBrmIfFNnu8TNFUcMRFpfJ+eOn5nmx7uGmDvs9B53Ft7JGpQ==
+react-native-safe-area-view@^0.14.1:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.5.tgz#eeded66bbeb0807f0a7f5f449e7fb2871f7ecf76"
+  integrity sha512-1NxWK1G0gzwCOuyNV/zf4n18s6FWsiqgwkzU3P9C0Iu8AErjhstK1jUqpRwzLH8+/7hGLsrQedmn+ZbQTOrJPg==
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
@@ -15452,17 +16402,10 @@ react-native-swipeout@^2.2.2:
     prop-types "^15.5.10"
     react-tween-state "^0.1.5"
 
-react-native-tab-view@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.3.2.tgz#c4e43a538dcacce151938745cea09176beeccbc3"
-  integrity sha512-2U+HxDQdjzExoC6gZ+wUhC8v8JjntppsFVU4v4pRvC/1dkN7DJv1k8UEy9+p7ucEaNrcAzu/j5N09Jf4qG36vw==
-  dependencies:
-    prop-types "^15.6.1"
-
-react-native-tab-view@^1.2.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.3.4.tgz#63fc3eb09652651d0ea0e016cff0f3a5e535f4de"
-  integrity sha512-iufNROTPr4+Z/IKijlp5faEANiDBWxhpgx9NSCg3esZ+HN5+UtFwB0xkn4XpNRqCvbzeBkgKMRJL3V6kr5NhWg==
+react-native-tab-view@^1.2.0, react-native-tab-view@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.4.1.tgz#f113cd87485808f0c991abec937f70fa380478b9"
+  integrity sha512-Bke8KkDcDhvB/z0AS7MnQKMD2p6Kwfc1rSKlMOvg9CC5CnClQ2QEnhPSbwegKDYhUkBI92iH/BYy7hNSm5kbUQ==
   dependencies:
     prop-types "^15.6.1"
 
@@ -15545,38 +16488,38 @@ react-native-view-shot@2.5.0:
     xmldoc "^0.4.0"
     yargs "^9.0.0"
 
-react-navigation-drawer@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.3.0.tgz#0bb8022003b36e919e3ae55394a81384f36a14f0"
-  integrity sha512-IDOaMseBeH1PutxRXkqDZTboZ/1mXVd4991JetsE5VmYvedmeh6z1AtBaCJu2rwRdV4U9K2I0xMyjwI0Nijqjg==
+react-navigation-drawer@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.2.1.tgz#7bd5efeee7d2f611d3ebb0933e0c8e8eb7cafe52"
+  integrity sha512-T2kaBjY2c4/3I6noWFnaf/c18ntNH5DsST38i+pdc2NPxn5Yi5lkK+ZZTeKuHSFD4a7G0jWY9OGf1iRkHWLMAQ==
   dependencies:
     react-native-tab-view "^1.2.0"
 
-react-navigation-stack@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.1.1.tgz#f9d70db678b50ba581c6aeea1171ad6b1a212693"
-  integrity sha512-x7dpMHIlwMNHNUa91lUXtHoslbD+LcXT9EPagxQJH7JHVECxyo4iDLE1w9yABiJXuVDdNvBeVHYwLk3sjafbTA==
+react-navigation-stack@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.4.0.tgz#69cdb029ea4ee5877d7e933b3117dc90bc841eb2"
+  integrity sha512-zEe9wCA0Ot8agarYb//0nSWYW1GM+1R0tY/nydUV0EizeJ27At0EklYVWvYEuYU6C48va6cu8OPL7QD/CcJACw==
 
-react-navigation-tabs@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.0.2.tgz#cc6c61db0c61054388ef6f726a8ffc183d6095b5"
-  integrity sha512-ffWPVdo+L0GLbQlLAzH7ITYqh9V9NdqT/juj8QtESH5/2yUqfvqTxQoSowvFIrtiIHHFH6tLoQy1sZZciTxmeg==
+react-navigation-tabs@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.1.4.tgz#00a312250df3c519c60b7815a523ace5ee11163a"
+  integrity sha512-py2hLCRxPwXOzmY1W9XcY1rWXxdK6RGW/aXh56G9gIf8cpHNDhy/bJV4e46/JrVcse3ybFaN0liT09/DM/NdwQ==
   dependencies:
     hoist-non-react-statics "^2.5.0"
     prop-types "^15.6.1"
     react-lifecycles-compat "^3.0.4"
-    react-native-tab-view "^1.0.0"
+    react-native-tab-view "^1.4.1"
 
 react-navigation@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.5.1.tgz#73e6f71f89d428e3567fbc5241e935bfaff6b62a"
-  integrity sha512-uyKCvk8BaNhpVfjclIbr+lnAbHCPhpvo/RlgigvCJwAtzWZXTgX73PfDxX5n2wCGzhKayzN+MByByXobwTL06g==
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.11.0.tgz#2c82217c452d07d8b9b0929bc7e77e2bcfaf9388"
+  integrity sha512-wlPcDtNiIdPeYxNQ/MN4arY5Xe9EphD2QVpRuvvuPWW+BamF3AJaIy060r3Yz59DODAoWllscabat/yqnih8Tg==
   dependencies:
-    "@react-navigation/core" "3.2.0"
-    "@react-navigation/native" "~3.3.0"
-    react-navigation-drawer "1.3.0"
-    react-navigation-stack "1.1.1"
-    react-navigation-tabs "1.0.2"
+    "@react-navigation/core" "~3.4.1"
+    "@react-navigation/native" "~3.5.0"
+    react-navigation-drawer "~1.2.1"
+    react-navigation-stack "~1.4.0"
+    react-navigation-tabs "~1.1.4"
 
 react-popper@^0.8.3:
   version "0.8.3"
@@ -15659,16 +16602,15 @@ react-side-effect@^1.1.0:
     exenv "^1.2.1"
     shallowequal "^1.0.1"
 
-react-slick@~0.23.2:
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.23.2.tgz#8d8bdbc77a6678e8ad36f50c32578c7c0f1c54f6"
-  integrity sha512-fM6DXX7+22eOcYE9cgaXUfioZL/Zw6fwS6aPMDBt0kLHl4H4fFNEbp4JsJQdEWMLUNFtUytNcvd9KRml22Tp5w==
+react-slick@~0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.24.0.tgz#1a4e078a82de4e9458255d9ce26aa6f3b17b168b"
+  integrity sha512-Pvo0B74ohumQdYOf0qP+pdQpj9iUbAav7+2qiF3uTc5XeQp/Y/cnIeDBM2tB3txthfSe05jKIqLMJTS6qVvt5g==
   dependencies:
     classnames "^2.2.5"
     enquire.js "^2.1.6"
     json2mq "^0.2.0"
     lodash.debounce "^4.0.8"
-    prettier "^1.14.3"
     resize-observer-polyfill "^1.5.0"
 
 react-test-renderer@16.5.0:
@@ -15682,14 +16624,14 @@ react-test-renderer@16.5.0:
     schedule "^0.3.0"
 
 react-test-renderer@^16.5.0, react-test-renderer@^16.8.1:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.4.tgz#abee4c2c3bf967a8892a7b37f77370c5570d5329"
-  integrity sha512-jQ9Tf/ilIGSr55Cz23AZ/7H3ABEdo9oy2zF9nDHZyhLHDSLKuoILxw2ifpBfuuwQvj4LCoqdru9iZf7gwFH28A==
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
+  integrity sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    react-is "^16.8.4"
-    scheduler "^0.13.4"
+    react-is "^16.8.6"
+    scheduler "^0.13.6"
 
 react-testing-library@^3.0.2:
   version "3.1.7"
@@ -15713,11 +16655,11 @@ react-transform-hmr@^1.0.4:
     react-proxy "^1.1.7"
 
 react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.6.1.tgz#abf4a95e2f13fb9ba83a970a896fedbc5c4856a2"
-  integrity sha512-9DHwCy0aOYEe35frlEN68N9ut/THDQBLnVoQuKTvzF4/s3tk7lqkefCqxK2Nv96fOh6JXk6tQtliygk6tl3bQA==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
+  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
   dependencies:
-    dom-helpers "^3.3.1"
+    dom-helpers "^3.4.0"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
@@ -15741,14 +16683,14 @@ react@16.5.0:
     schedule "^0.3.0"
 
 react@^16.0.0, react@^16.8.0:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768"
-  integrity sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
+  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.4"
+    scheduler "^0.13.6"
 
 reactstrap@^5.0.0-beta:
   version "5.0.0"
@@ -15779,9 +16721,9 @@ read-cmd-shim@^1.0.1:
     graceful-fs "^4.1.2"
 
 read-last-lines@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/read-last-lines/-/read-last-lines-1.7.0.tgz#20ef2f97637b96596d54cc2a97380e11567e158e"
-  integrity sha512-hm2Wd9F9SrfgWrjb4qlfdsg9R4inL+hqH4xC/4BnBBUc9cC3n9HZhWg6RBBirzCkNQt/VtHDbRQbs/lkN1KWiQ==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/read-last-lines/-/read-last-lines-1.7.1.tgz#7a3b2ccd96c67e2d03e1903cc65edd9d08ff6502"
+  integrity sha512-X98EcfP8dUNBg52Mhwdu/WTNI9TaGHnBeximG9Wp/bV6PmILeS9gQ0FHkrqcPIvbbZb/2jjWCzvA2r1HScnEqA==
   dependencies:
     mz "^2.7.0"
 
@@ -15832,6 +16774,14 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
+read-pkg-up@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -15888,10 +16838,10 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
-  integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
+  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -15916,7 +16866,7 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-realpath-native@^1.0.0:
+realpath-native@^1.0.0, realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
   integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
@@ -15977,9 +16927,9 @@ redux@^3.6.0:
     symbol-observable "^1.0.3"
 
 regenerate-unicode-properties@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"
-  integrity sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
+  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
   dependencies:
     regenerate "^1.4.0"
 
@@ -15998,15 +16948,15 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
-regenerator-transform@^0.13.4:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
-  integrity sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==
+regenerator-transform@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
+  integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
   dependencies:
     private "^0.1.6"
 
@@ -16030,10 +16980,10 @@ regex-parser@^2.2.9:
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz#9e66a8f73d89a107616e63b39d4deddfee912b37"
   integrity sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==
 
-regexp-tree@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.5.tgz#7cd71fca17198d04b4176efd79713f2998009397"
-  integrity sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ==
+regexp-tree@^0.1.6:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.10.tgz#d837816a039c7af8a8d64d7a7c3cf6a1d93450bc"
+  integrity sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==
 
 regexpp@^1.0.1:
   version "1.1.0"
@@ -16049,7 +16999,7 @@ regexpu-core@^1.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.1.3, regexpu-core@^4.2.0:
+regexpu-core@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
   integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
@@ -16062,9 +17012,9 @@ regexpu-core@^4.1.3, regexpu-core@^4.2.0:
     unicode-match-property-value-ecmascript "^1.1.0"
 
 registry-auth-token@^3.0.1, registry-auth-token@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -16205,6 +17155,11 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -16228,7 +17183,7 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
-resize-observer-polyfill@^1.5.0:
+resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
@@ -16293,10 +17248,10 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+resolve@1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
   dependencies:
     path-parse "^1.0.6"
 
@@ -16346,7 +17301,7 @@ rework@^1.0.1:
     convert-source-map "^0.3.3"
     css "^2.0.0"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -16383,14 +17338,14 @@ rmc-cascader@~5.0.0:
     rmc-picker "~5.0.0"
 
 rmc-date-picker@^6.0.8:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/rmc-date-picker/-/rmc-date-picker-6.0.8.tgz#9aab87b3aa8dc9c5a57349d8f0b05de4e8f4808a"
-  integrity sha512-Llohv+eNzv4pdo0WsOUNIYKOTjVeA3bZzY8J/YUE3bDxIXJEawcjxuB/QDLH2ewveL/cv/EpkYwt+r544CyL9g==
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/rmc-date-picker/-/rmc-date-picker-6.0.9.tgz#7b59538a048002e33f215da9bef2e5e4eda53476"
+  integrity sha512-3XRfkTwBeDjJzQuAHq8VOKBaj8qZaqzbudg1KkvggVEdF67HAzIMEzjXrOH1MR2MmSJ7Z3NxTKJXY8P8WddYSg==
   dependencies:
     babel-runtime "6.x"
     rmc-picker "~5.0.0"
 
-rmc-dialog@^1.0.1:
+rmc-dialog@^1.0.1, rmc-dialog@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/rmc-dialog/-/rmc-dialog-1.1.1.tgz#1d7fbc6b2cad5b0b53fbab71fe29636d76f78217"
   integrity sha512-28aJqtPTX6v13Z/aU1WBy1AFIXkE74PxZXde7JvtEIy9hQDTjH8fqOi822BpzAbXCyNE7jF9iFomy3H2ClsDJA==
@@ -16416,13 +17371,13 @@ rmc-input-number@^1.0.0:
     rmc-feedback "^2.0.0"
 
 rmc-picker@~5.0.0:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/rmc-picker/-/rmc-picker-5.0.5.tgz#2a33244ced1f4e6b10611ff6e0384a5dbbfc566e"
-  integrity sha512-Gycgsf3S6/sluI71WPUx167jdUHYe8kJ5seYxQN1m8z/g401V7bwr/G66d9Az7T44jlxywcQ3w3leuo1E+54Kw==
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/rmc-picker/-/rmc-picker-5.0.9.tgz#749e847f802261c944996b79717ab017d7a8aede"
+  integrity sha512-loulflyMa6SCReU/LcbWxNvy46gpoW5DEZW78GqkPuAEjwQVQjKtpvq/VzBND8Yt0SBetWUTAZ3AOKTVH3qxcQ==
   dependencies:
     babel-runtime "6.x"
-    classnames "^2.2.0"
-    rmc-dialog "^1.0.1"
+    classnames "^2.2.6"
+    rmc-dialog "^1.1.1"
     rmc-feedback "^2.0.0"
 
 rmc-tabs@~1.2.0:
@@ -16448,6 +17403,11 @@ rsvp@^3.3.3:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
   integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
 rtl-detect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.0.2.tgz#8eca316f5c6563d54df4e406171dd7819adda67f"
@@ -16497,9 +17457,9 @@ rxjs@^5.4.2, rxjs@^5.5.2:
     symbol-observable "1.0.1"
 
 rxjs@^6.3.3, rxjs@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
   dependencies:
     tslib "^1.9.0"
 
@@ -16546,6 +17506,21 @@ sane@^2.0.0:
   optionalDependencies:
     fsevents "^1.2.3"
 
+sane@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -16590,10 +17565,10 @@ schedule@^0.3.0:
   dependencies:
     object-assign "^4.1.1"
 
-scheduler@^0.13.4:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298"
-  integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==
+scheduler@^0.13.6:
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -16628,7 +17603,7 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.9.1:
+selfsigned@^1.10.4:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -16641,15 +17616,20 @@ semver-compare@^1.0.0:
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
 "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
 semver@4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
   integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
 
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -16674,6 +17654,25 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
 seq-queue@^0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
@@ -16684,12 +17683,12 @@ serialize-error@^2.1.0:
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
   integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=
 
-serialize-javascript@^1.4.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
-  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
+serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
+  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
 
-serve-index@^1.7.2:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -16702,7 +17701,7 @@ serve-index@^1.7.2:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.2, serve-static@^1.13.1:
+serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
@@ -16712,6 +17711,16 @@ serve-static@1.13.2, serve-static@^1.13.1:
     parseurl "~1.3.2"
     send "0.16.2"
 
+serve-static@1.14.1, serve-static@^1.13.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
 session-file-store@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/session-file-store/-/session-file-store-1.2.0.tgz#35a994a7fb0cbf7f784067bf9059939c520b7c44"
@@ -16758,6 +17767,11 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -16875,6 +17889,11 @@ sisteransi@^0.1.1:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
   integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
 
+sisteransi@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
+  integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ==
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -17016,9 +18035,9 @@ source-map-support@^0.4.1, source-map-support@^0.4.15, source-map-support@^0.4.2
     source-map "^0.5.6"
 
 source-map-support@^0.5.0, source-map-support@^0.5.11, source-map-support@^0.5.6, source-map-support@^0.5.9, source-map-support@~0.5.10:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -17099,9 +18118,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
-  integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -17126,6 +18145,11 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+split-on-first@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
+  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -17160,11 +18184,11 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sqlite3@^4.0.0:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.6.tgz#e587b583b5acc6cb38d4437dedb2572359c080ad"
-  integrity sha512-EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.8.tgz#81ee60d54befaa52f5421fe6337050bd43d4bb95"
+  integrity sha512-kgwHu4j10KhpCHtx//dejd/tVQot7jc3sw+Sn0vMuKOw0X00Ckyg9VceKgzPyGmmz+zEoYue9tOLriWTvYy0ww==
   dependencies:
-    nan "~2.10.0"
+    nan "^2.12.1"
     node-pre-gyp "^0.11.0"
     request "^2.87.0"
 
@@ -17218,9 +18242,11 @@ stackframe@^1.0.4:
   integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
 
 stacktrace-parser@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e"
-  integrity sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4=
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.6.tgz#c17d466d15ba51bee2f753d064f17327a886ff37"
+  integrity sha512-wXhu0Z8YgCGigUtHQq+J7pjXCppk3Um5DwH4qskOKHMlJmKwuuUSm+wDAgU7t4sbVjvuDTNGwOfFKgjMEqSflA==
+  dependencies:
+    type-fest "^0.3.0"
 
 staged-git-files@1.1.1:
   version "1.1.1"
@@ -17235,16 +18261,11 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
-
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
@@ -17388,10 +18409,10 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.1.0.tgz#55aaa54e33b4c0649a7338a43437b1887d153ec4"
-  integrity sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==
+strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
     ansi-regex "^4.1.0"
 
@@ -17604,36 +18625,36 @@ tapable@^0.1.8:
   integrity sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
   dependencies:
     block-stream "*"
-    fstream "^1.0.2"
+    fstream "^1.0.12"
     inherits "2"
 
 tar@^4, tar@^4.0.2, tar@^4.4.6, tar@^4.4.8:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
+  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
+    minipass "^2.3.5"
+    minizlib "^1.2.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
-    yallist "^3.0.2"
+    yallist "^3.0.3"
 
 tarn@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.4.tgz#aeeb85964b1afa0bbf381359c1167df237c27b6a"
-  integrity sha512-j4samMCQCP5+6Il9/cxCqBd3x4vvlLeVdoyGex0KixPKl4F8LpNbDSC6NDhjianZgUngElRr9UI1ryZqJDhwGg==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.5.tgz#7be88622e951738b9fa3fb77477309242cdddc2d"
+  integrity sha512-PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g==
 
 temp-dir@^1.0.0:
   version "1.0.0"
@@ -17669,23 +18690,25 @@ tempfile@^1.1.1:
     uuid "^2.0.1"
 
 terser-webpack-plugin@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
-  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
+  integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
   dependencies:
-    cacache "^11.0.2"
+    cacache "^11.3.2"
     find-cache-dir "^2.0.0"
+    is-wsl "^1.1.0"
+    loader-utils "^1.2.3"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
+    serialize-javascript "^1.7.0"
     source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
+    terser "^4.0.0"
+    webpack-sources "^1.3.0"
+    worker-farm "^1.7.0"
 
-terser@^3.16.1:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
-  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+terser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
+  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
   dependencies:
     commander "^2.19.0"
     source-map "~0.6.1"
@@ -17702,11 +18725,26 @@ test-exclude@^4.2.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
+test-exclude@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
+  dependencies:
+    glob "^7.1.3"
+    minimatch "^3.0.4"
+    read-pkg-up "^4.0.0"
+    require-main-filename "^2.0.0"
+
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
+text-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6"
+  integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==
+
 text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -17748,6 +18786,13 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through@2, through@2.3.x, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -17782,12 +18827,17 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-invariant@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.4.tgz#346b5415fd93cb696b0c4e8a96697ff590f92463"
+  integrity sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g==
+
 tiny-queue@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046"
   integrity sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY=
 
-tiny-warning@^1.0.2:
+tiny-warning@^1.0.0, tiny-warning@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28"
   integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==
@@ -17856,11 +18906,16 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toggle-selection@^1.0.3:
+toggle-selection@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 topo@2.x.x:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
@@ -17935,10 +18990,10 @@ trim-right@^1.0.1:
   dependencies:
     glob "^7.1.2"
 
-ts-invariant@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz#3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f"
-  integrity sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==
+ts-invariant@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
+  integrity sha512-PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q==
   dependencies:
     tslib "^1.9.3"
 
@@ -17957,6 +19012,21 @@ ts-jest@^23.10.4:
     semver "^5.5"
     yargs-parser "10.x"
 
+ts-jest@^24.0.2:
+  version "24.0.2"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
+  integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
+  dependencies:
+    bs-logger "0.x"
+    buffer-from "1.x"
+    fast-json-stable-stringify "2.x"
+    json5 "2.x"
+    make-error "1.x"
+    mkdirp "0.x"
+    resolve "1.x"
+    semver "^5.5"
+    yargs-parser "10.x"
+
 ts-loader@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.5.0.tgz#a1ce70b2dc799941fb2197605f0d67874097859b"
@@ -17988,17 +19058,17 @@ tslint-plugin-prettier@^2.0.0:
     tslib "^1.7.1"
 
 tslint@^5.11.0:
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e"
-  integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.17.0.tgz#f9f0ce2011d8e90debaa6e9b4975f24cd16852b8"
+  integrity sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==
   dependencies:
-    babel-code-frame "^6.22.0"
+    "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
     chalk "^2.3.0"
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.1"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
@@ -18047,13 +19117,18 @@ type-detect@^4.0.0, type-detect@^4.0.5:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-is@~1.6.16:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
+type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.18"
+    mime-types "~2.1.24"
 
 typedarray@^0.0.6:
   version "0.0.6"
@@ -18061,9 +19136,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.2.4:
-  version "3.3.3333"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
-  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
+  integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==
 
 ua-parser-js@^0.7.18, ua-parser-js@^0.7.19:
   version "0.7.19"
@@ -18078,12 +19153,20 @@ uglify-es@^3.1.9, uglify-es@^3.3.4:
     commander "~2.13.0"
     source-map "~0.6.1"
 
-uglify-js@3.4.x, uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
+  dependencies:
+    commander "~2.19.0"
+    source-map "~0.6.1"
+
+uglify-js@^3.1.4:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.0"
     source-map "~0.6.1"
 
 uglifyjs-webpack-plugin@^1.2.7, uglifyjs-webpack-plugin@^1.3.0:
@@ -18209,10 +19292,10 @@ universal-cookie@^2.2.0:
     cookie "^0.3.1"
     object-assign "^4.1.0"
 
-universal-user-agent@^2.0.0, universal-user-agent@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.3.tgz#9f6f09f9cc33de867bb720d84c08069b14937c6c"
-  integrity sha512-eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g==
+universal-user-agent@^2.0.0, universal-user-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.1.0.tgz#5abfbcc036a1ba490cb941f8fd68c46d3669e8e4"
+  integrity sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q==
   dependencies:
     os-name "^3.0.0"
 
@@ -18244,7 +19327,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.1.0:
+upath@^1.1.0, upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -18300,11 +19383,11 @@ url-parse-lax@^3.0.0:
     prepend-http "^2.0.0"
 
 url-parse@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
   dependencies:
-    querystringify "^2.0.0"
+    querystringify "^2.1.1"
     requires-port "^1.0.0"
 
 url-template@^2.0.8:
@@ -18398,9 +19481,9 @@ uuid@^2.0.1:
   integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
 
 v8flags@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.2.tgz#fc5cd0c227428181e6c29b2992e4f8f1da5e0c9f"
-  integrity sha512-MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
+  integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==
   dependencies:
     homedir-polyfill "^1.0.1"
 
@@ -18471,14 +19554,14 @@ vscode-languageserver-types@^3.13.0:
   integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
 
 vscode-nls@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
-  integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
+  integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
 
 vscode-uri@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
-  integrity sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
+  integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
@@ -18497,10 +19580,10 @@ wait-for-expect@^0.5.0:
   resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-0.5.0.tgz#cc935a94c6039967bd7760c9e9cc557f4674887a"
   integrity sha512-C/fK4EhAWGT1z2FATE0X+w0LVrPmaZas9hvVHypnkgdt/vW7U5YkPe4ADGRtkLs+w+8GmoJ/F65vRHyWjBHmaA==
 
-wait-for-expect@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.1.0.tgz#6607375c3f79d32add35cd2c87ce13f351a3d453"
-  integrity sha512-vQDokqxyMyknfX3luCDn16bSaRcOyH6gGuUXMIbxBLeTo6nWuEWYqMTT9a+44FmW8c2m6TRWBdNvBBjA1hwEKg==
+wait-for-expect@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.2.0.tgz#fdab6a26e87d2039101db88bff3d8158e5c3e13f"
+  integrity sha512-EJhKpA+5UHixduMBEGhTFuLuVgQBKWxkFbefOdj2bbk2/OpA5Opsc4aUTGmF+qJ+v3kTGxDRNYwKaT4j6g5n8Q==
 
 wait-on@^3.0.1:
   version "3.2.0"
@@ -18513,7 +19596,7 @@ wait-on@^3.0.1:
     request "^2.88.0"
     rx "^4.1.0"
 
-walker@~1.0.5:
+walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
@@ -18569,56 +19652,56 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-dev-middleware@^3.1.3, webpack-dev-middleware@^3.5.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
-  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
+webpack-dev-middleware@^3.1.3, webpack-dev-middleware@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
+  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
   dependencies:
     memory-fs "^0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
+    mime "^2.4.2"
+    range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
 webpack-dev-server@^3.1.5:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
-  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.0.tgz#7da016e4f5abec61c7b4af95a264d623bde4df3c"
+  integrity sha512-B/c/aJoyOlhjgeGnxTWeJlDBvIEN/aBI2R6G1DiFHVluEs0KtuxylFcoDR2K6Um/edo4/BvZqMXS2tK+U7fsHw==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
+    chokidar "^2.1.6"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
+    del "^4.1.1"
+    express "^4.17.1"
+    html-entities "^1.2.1"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^4.2.0"
+    internal-ip "^4.3.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.2"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.1.1"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
+    strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.5.1"
+    webpack-dev-middleware "^3.7.0"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-hot-middleware@^2.22.1, webpack-hot-middleware@^2.22.3:
-  version "2.24.3"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.24.3.tgz#5bb76259a8fc0d97463ab517640ba91d3382d4a6"
-  integrity sha512-pPlmcdoR2Fn6UhYjAhp1g/IJy1Yc9hD+T6O9mjRcWV2pFbBjIFoJXhP0CoD0xPOhWJuWXuZXGBga9ybbOdzXpg==
+  version "2.25.0"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706"
+  integrity sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA==
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
@@ -18670,9 +19753,9 @@ webpack-virtual-modules@^0.1.10:
     debug "^3.0.0"
 
 webpack@^4.12.0, webpack@^4.29.3:
-  version "4.29.6"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
-  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e"
+  integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -18789,11 +19872,11 @@ win-release@^1.0.0:
     semver "^5.0.1"
 
 windows-release@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
-  integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
 
 winston@^2.3.1:
   version "2.4.4"
@@ -18817,10 +19900,10 @@ wordwrap@~0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-worker-farm@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
+worker-farm@^1.5.2, worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
   dependencies:
     errno "~0.1.7"
 
@@ -18854,6 +19937,15 @@ write-file-atomic@1.3.1:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
+write-file-atomic@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
+  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
 write-file-atomic@^1.2.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
@@ -18864,9 +19956,9 @@ write-file-atomic@^1.2.0:
     slide "^1.1.5"
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
-  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -19115,11 +20207,6 @@ xpipe@^1.0.5:
   resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf"
   integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98=
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -19140,12 +20227,12 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@10.x, yargs-parser@^10.1.0:
+yargs-parser@10.x:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
@@ -19181,13 +20268,13 @@ yargs-parser@^9.0.2:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+yargs@12.0.5, yargs@^12.0.1, yargs@^12.0.2:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^2.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -19197,7 +20284,7 @@ yargs@12.0.2:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
+    yargs-parser "^11.1.1"
 
 yargs@^11.0.0:
   version "11.1.0"
@@ -19217,24 +20304,6 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^12.0.1:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"

From 5a6b80308d311766e7e167a5a2150a87f4783d72 Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 7 Jun 2019 13:38:17 +0300
Subject: [PATCH 097/104] Update yarn lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 055c1b4..23ea108 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16312,7 +16312,7 @@ react-native-lightbox@^0.7.0:
   dependencies:
     prop-types "^15.5.10"
 
-"react-native-maps@github:expo/react-native-maps#v0.22.1-exp.0":
+react-native-maps@expo/react-native-maps#v0.22.1-exp.0:
   version "0.22.1"
   resolved "https://codeload.github.com/expo/react-native-maps/tar.gz/e6f98ff7272e5d0a7fe974a41f28593af2d77bb2"
 

From 40560ba3a25e6e349d427a6892bfa918bb037edd Mon Sep 17 00:00:00 2001
From: Ivan Isakov <washerd2008@gmail.com>
Date: Fri, 7 Jun 2019 13:59:24 +0300
Subject: [PATCH 098/104] Fix yarn.lock

---
 yarn.lock | 158 ++++++++++++++++++++++++------------------------------
 1 file changed, 69 insertions(+), 89 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 23ea108..b6a3f59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1031,9 +1031,9 @@
     safe-json-stringify "~1"
 
 "@expo/json-file@^8.0.0", "@expo/json-file@^8.0.1", "@expo/json-file@^8.1.0":
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.1.4.tgz#160f68a2ad08a1c1a34e9edfef6e87293ce0a6ac"
-  integrity sha512-0M6Hq2+iNV+wqc9hSffa05NgTwqmg08TVhpUSSBuHjOscYw2gxMi8JbTJ1v6fg5NqRW1AOga8mZb6Py8SE/b+g==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.1.3.tgz#75d265d57facb85f52079031a53c7c9f5fc6c50b"
+  integrity sha512-2Jjn/gN75n526lWD1oIOQvQTQt3UMbICjeDgO3Tjr48zkWPYCakWBbS2cj3UnBIUqd30vIkGsp4fRh2JFEoocA==
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.44"
     fs-extra "^8.0.1"
@@ -2350,9 +2350,9 @@
     "@types/react-native-vector-icons" "*"
 
 "@types/express-serve-static-core@*":
-  version "4.16.7"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz#50ba6f8a691c08a3dd9fa7fba25ef3133d298049"
-  integrity sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.6.tgz#66d4b29ece3e2fb6e5aac2232723002426e651bd"
+  integrity sha512-8wr3CA/EMybyb6/V8qvTRKiNkPmgUA26uA9XWD6hlA0yFDuqi4r2L0C2B0U2HAYltJamoYJszlkaWM31vrKsHg==
   dependencies:
     "@types/node" "*"
     "@types/range-parser" "*"
@@ -2366,9 +2366,9 @@
     "@types/node" "*"
 
 "@types/express@*":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287"
-  integrity sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.1.tgz#d756bd1a85c34d87eaf44c888bad27ba8a4b7cf0"
+  integrity sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -2490,9 +2490,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.112":
-  version "4.14.134"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.134.tgz#9032b440122db3a2a56200e91191996161dde5b9"
-  integrity sha512-2/O0khFUCFeDlbi7sZ7ZFRCcT812fAeOLm7Ev4KbwASkZ575TDrDcY7YyaoHdTOzKcNbfiwLYZqPmoC4wadrsw==
+  version "4.14.133"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.133.tgz#430721c96da22dd1694443e68e6cec7ba1c1003d"
+  integrity sha512-/3JqnvPnY58GLzG3Y7fpphOhATV1DDZ/Ak3DQufjlRK5E4u+s0CfClfNFtAGBabw+jDGtRFbOZe+Z02ZMWCBNQ==
 
 "@types/mime@*":
   version "2.0.1"
@@ -2517,9 +2517,9 @@
   integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
 
 "@types/node@*":
-  version "12.0.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
-  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.4.tgz#46832183115c904410c275e34cf9403992999c32"
+  integrity sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==
 
 "@types/nodemailer@^4.6.2":
   version "4.6.8"
@@ -2958,13 +2958,6 @@
     "@webassemblyjs/wast-parser" "1.8.5"
     "@xtuc/long" "4.2.2"
 
-"@wry/equality@^0.1.2":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
-  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
-  dependencies:
-    tslib "^1.9.3"
-
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -3083,14 +3076,7 @@ adjust-sourcemap-loader@^1.1.0:
     object-path "^0.9.2"
     regex-parser "^2.2.9"
 
-agent-base@4, agent-base@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@~4.2.1:
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -3348,11 +3334,10 @@ anymatch@^2.0.0:
     normalize-path "^2.1.1"
 
 apollo-utilities@^1.0.3:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
-  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.0.tgz#9803724c07ac94ca11dc26397edb58735d2b0211"
+  integrity sha512-wQjV+FdWcTWmWUFlChG5rS0vHKy5OsXC6XlV9STRstQq6VbXANwHy6DHnTEQAfLXWAbNcPgBu+nBUpR3dFhwrA==
   dependencies:
-    "@wry/equality" "^0.1.2"
     fast-json-stable-stringify "^2.0.0"
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
@@ -5173,9 +5158,9 @@ camelize@^1.0.0:
   integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
 caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000971:
-  version "1.0.30000974"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
-  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+  version "1.0.30000973"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000973.tgz#2f8e8e54f9e6c5b7a631c9e69bfa1093d8cfd360"
+  integrity sha512-/F3t/Yo8LEdRSEPCmI15fLu5vepVh9UCg/9inJXF5AAfW7xRRJkbaM2ut52iRMQMnGCLQouLbFdbOA+VEFOIsg==
 
 canvas-prebuilt@^1.6.5-prerelease.1:
   version "1.6.11"
@@ -7002,9 +6987,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.137, electron-to-chromium@^1.3.47:
-  version "1.3.150"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.150.tgz#afb972b53a702b37c76db843c39c967e9f68464b"
-  integrity sha512-5wuYlaXhXbBvavSTij5ZyidICB6sAK/1BwgZZoPCgsniid1oDgzVvDOV/Dw6J25lKV9QZ9ZdQCp8MEfF0/OIKA==
+  version "1.3.144"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.144.tgz#d742d2c451090798303a4a5eea4f33f5e60f5d94"
+  integrity sha512-jNRFJpfNrYm5uJ4x0q9oYMOfbL0JPOlkNli8GS/5zEmCjnE5jAtoCo4BYajHiqSPqEeAjtTdItL4p7EZw+jSfg==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -7163,9 +7148,9 @@ es6-error@^4.0.2:
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
 es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
+  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -13388,16 +13373,11 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1:
+ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.0.0, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 multi-progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/multi-progress/-/multi-progress-2.0.0.tgz#29ccb42cf24874b1c6384f03127ce5dff7b22f2c"
@@ -13772,9 +13752,9 @@ node-pre-gyp@^0.12.0:
     tar "^4"
 
 node-releases@^1.1.21:
-  version "1.1.23"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
-  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
+  version "1.1.22"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.22.tgz#d90cd5adc59ab9b0f377d4f532b09656399c88bf"
+  integrity sha512-O6XpteBuntW1j86mw6LlovBIwTe+sO2+7vi9avQffNeIW4upgnaCVm6xrBWH+KATz7mNNRNNeEpuWB7dT6Cr3w==
   dependencies:
     semver "^5.3.0"
 
@@ -15096,9 +15076,9 @@ postcss@^6.0.1, postcss@^6.0.23:
     supports-color "^5.4.0"
 
 postcss@^7.0.0, postcss@^7.0.16:
-  version "7.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
-  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+  version "7.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
+  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -15159,9 +15139,9 @@ prettier-linter-helpers@^1.0.0:
     fast-diff "^1.1.2"
 
 prettier@^1.9.2:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.0.tgz#d1701ca9b2941864b52f3262b35946d2c9cd88f0"
-  integrity sha512-YsdAD29M0+WY2xXZk3i0PA16olY9qZss+AuODxglXcJ+2ZBwFv+6k5tE8GS8/HKAthaajlS/WqhdgcjumOrPlg==
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"
+  integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==
 
 pretty-error@^2.0.2:
   version "2.1.1"
@@ -15447,9 +15427,9 @@ query-string@^5.0.1:
     strict-uri-encode "^1.0.0"
 
 query-string@^6.4.2:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.6.0.tgz#a6b7dfd57ad67e346b143d033df2b1e4cfb6b53a"
-  integrity sha512-Xhvaa80rZzfvI7gYXF6ism5otKTyea90XROstBTBKiWE/tDfnIDbQwkGLguJaQBNweVCW4T9DoTe5eyox0CbZQ==
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.5.0.tgz#2e1a70125af01f6f04573692d02c09302a1d8bfc"
+  integrity sha512-TYC4hDjZSvVxLMEucDMySkuAS9UIzSbAiYGyA9GWCjLKB8fQpviFbjd20fD7uejCDxZS+ftSdBKE6DS+xucJFg==
   dependencies:
     decode-uri-component "^0.2.0"
     split-on-first "^1.0.0"
@@ -15522,9 +15502,9 @@ range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
 raven-js@^3.17.0:
-  version "3.27.2"
-  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775"
-  integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ==
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.1.tgz#e187a12982061908ccbf935af0640c9043d7d666"
+  integrity sha512-r/9CwSbaGfBFjo4hGR45DAmrukUKkQ4HdMu80PlVLDY1t8f9b4aaZzTsFegaafu7EGhEYougWDJ9/IcTdYdLXQ==
 
 raven@^2.1.1:
   version "2.6.4"
@@ -15625,14 +15605,14 @@ rc-cascader@~0.17.0:
     warning "^4.0.1"
 
 rc-checkbox@~2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.7.tgz#ae6785525cf35fa4c62d706c4a1ff7b2b1fcb821"
-  integrity sha512-8L+0XuucUOMUM6F/7qH+hnQpEHPZfW1Um02lUHEVdpZNor5mC0Fj4x8GvTtwcM1pAl5tD3I6lHYD8cE1W8RZJw==
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.6.tgz#5dc00653e5277018c431fec55e38b91c1f976e90"
+  integrity sha512-+VxQbt2Cwe1PxCvwosrAYXT6EQeGwrbLJB2K+IPGCSRPCKnk9zcub/0eW8A4kxjyyfh60PkwsAUZ7qmB31OmRA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
     prop-types "15.x"
-    react-lifecycles-compat "^3.0.4"
+    rc-util "^4.0.4"
 
 rc-collapse@~1.11.1:
   version "1.11.3"
@@ -15757,9 +15737,9 @@ rc-mentions@~0.3.1:
     react-lifecycles-compat "^3.0.4"
 
 rc-menu@^7.3.0, rc-menu@^7.4.22, rc-menu@~7.4.12:
-  version "7.4.23"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.23.tgz#e07d497864274076299d7d8a84d14fc86b6bd30d"
-  integrity sha512-d0pUMN0Zr3GCFxNpas8p7AUTeX8viItUOQXku4AsyX82ZzUz79HgGul2Nk17BIFTtLzqdB7/NT6WVb5PAOOILw==
+  version "7.4.22"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.22.tgz#3305517cc284ba8979a45a0d16271780adafb2ee"
+  integrity sha512-6o/5H7y60O7Q9Yvp3YaqxPQA65zfh0goiWV98Xh2R95qYg2QRGP7aiMdYG0sjVpZR67oTneMMIoyfMudj9iQmA==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -15831,9 +15811,9 @@ rc-select@~9.1.0:
     warning "^4.0.2"
 
 rc-slider@~8.6.5:
-  version "8.6.12"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.12.tgz#40bb0a6e35f13183f08a3e6aa9a2adbd8dabd39d"
-  integrity sha512-mfYRg7H/smb2MlbqAB+/a34e8PeVqAr7t7hrfSS5+0njuDin4qCwoUHkX1jygGeEwtMAdGJ3buE0wRW988R7Xw==
+  version "8.6.11"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.11.tgz#f85620dedd97035e3670ed9a9fc6950683877ec5"
+  integrity sha512-k6dPXA7NkjSp5NCyjAJbRxnttj/U7qEMydT2Y/VY64INyoznMx968xz8s4KX1iTiTA69X7EBMD5TWM3cdsfzRg==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -16354,9 +16334,9 @@ react-native-reanimated@1.0.0-alpha.11:
   integrity sha512-lDakjY8CXmZiSN71hyc276b3d7M9mKV9ZyYw4W/rTnnJbgBFaqdIxSHq4S4LxSbVqpAoQMfUJqPTE0BKbAz7Aw==
 
 react-native-safe-area-view@^0.14.1:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.5.tgz#eeded66bbeb0807f0a7f5f449e7fb2871f7ecf76"
-  integrity sha512-1NxWK1G0gzwCOuyNV/zf4n18s6FWsiqgwkzU3P9C0Iu8AErjhstK1jUqpRwzLH8+/7hGLsrQedmn+ZbQTOrJPg==
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.4.tgz#1647fa74fd452cb8cee4f47bd08de3829451bf5d"
+  integrity sha512-ypDQVoAyNHBhMR1IGfadm8kskNzPg5czrDAzQEu5MXG9Ahoi5f1cL/rT2KO+R9f6xRjf6b1IjY53m0B0xHRd0A==
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
@@ -17404,9 +17384,9 @@ rsvp@^3.3.3:
   integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
 rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911"
+  integrity sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA==
 
 rtl-detect@^1.0.2:
   version "1.0.2"
@@ -18639,9 +18619,9 @@ tar@^2.0.0:
     inherits "2"
 
 tar@^4, tar@^4.0.2, tar@^4.4.6, tar@^4.4.8:
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
-  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
+  version "4.4.9"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.9.tgz#058fbb152f6fc45733e84585a40c39e59302e1b3"
+  integrity sha512-xisFa7Q2i3HOgfn+nmnWLGHD6Tm23hxjkx6wwGmgxkJFr6wxwXnJOdJYcZjL453PSdF0+bemO03+flAzkIdLBQ==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
@@ -19663,9 +19643,9 @@ webpack-dev-middleware@^3.1.3, webpack-dev-middleware@^3.7.0:
     webpack-log "^2.0.0"
 
 webpack-dev-server@^3.1.5:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.0.tgz#7da016e4f5abec61c7b4af95a264d623bde4df3c"
-  integrity sha512-B/c/aJoyOlhjgeGnxTWeJlDBvIEN/aBI2R6G1DiFHVluEs0KtuxylFcoDR2K6Um/edo4/BvZqMXS2tK+U7fsHw==
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.5.1.tgz#4290ac709bb989dc7382c912899f79fd5677dabf"
+  integrity sha512-0IdMGddJcnK9zesZOeHWl4uAOVfypn7DSrdNWtclROkVBXy/TcBN+6eEG1wNfLT9dXVfaRZZsLTJt0mJtgTQgw==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -19753,9 +19733,9 @@ webpack-virtual-modules@^0.1.10:
     debug "^3.0.0"
 
 webpack@^4.12.0, webpack@^4.29.3:
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e"
-  integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
+  version "4.32.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.2.tgz#3639375364a617e84b914ddb2c770aed511e5bc8"
+  integrity sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 308f1c218a6196aafc702c5c2b773ec752e48d3f Mon Sep 17 00:00:00 2001
From: Oleksandr Bazylevskyi <bazylevskyioleksandr@gmail.com>
Date: Thu, 27 Jun 2019 17:24:23 +0300
Subject: [PATCH 099/104] Add confirmation api route

---
 modules/user/server-ts/controllers.ts | 17 ++++++++++++++++-
 modules/user/server-ts/index.ts       | 10 +++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/user/server-ts/controllers.ts b/modules/user/server-ts/controllers.ts
index 55a80af..e69698c 100644
--- a/modules/user/server-ts/controllers.ts
+++ b/modules/user/server-ts/controllers.ts
@@ -98,7 +98,7 @@ export const addUser = async ({ body, user: identity, t }: any, res: any) => {
       // async email
       jwt.sign({ identity: pick(createdUser, 'id') }, secret, { expiresIn: '1d' }, (err: any, emailToken: string) => {
         const encodedToken = Buffer.from(emailToken).toString('base64');
-        const url = `${__WEBSITE_URL__}/confirmation/${encodedToken}`;
+        const url = `${__WEBSITE_URL__}/api/confirmation/${encodedToken}`;
         mailer.sendMail({
           from: `${app.name} <${process.env.EMAIL_USER}>`,
           to: createdUser.email,
@@ -211,3 +211,18 @@ export const deleteUser = async ({ user: identity, body: { id }, t }: any, res:
     res.send(t('user:userCouldNotDeleted'));
   }
 };
+
+export const confirmEmail = async ({ params, t }: any, res: any) => {
+  try {
+    const token = Buffer.from(params.token, 'base64').toString();
+    const {
+      identity: { id }
+    }: any = jwt.verify(token, settings.auth.secret);
+
+    await userDAO.updateActive(id, true);
+
+    res.redirect('/login/?email-verified');
+  } catch (e) {
+    throw e;
+  }
+};
diff --git a/modules/user/server-ts/index.ts b/modules/user/server-ts/index.ts
index c9b3c35..f67d90b 100644
--- a/modules/user/server-ts/index.ts
+++ b/modules/user/server-ts/index.ts
@@ -3,7 +3,7 @@ import i18n from 'i18next';
 
 import ServerModule, { RestMethod } from '@restapp/module-server-ts';
 
-import { user, users, currentUser, addUser, editUser, deleteUser } from './controllers';
+import { user, users, currentUser, addUser, editUser, deleteUser, confirmEmail } from './controllers';
 import password from './password';
 import social from './social';
 import UserDAO, { UserShapePassword } from './sql';
@@ -88,6 +88,14 @@ export default new ServerModule(password, social, {
       route: 'deleteUser',
       isAuthRoute: true,
       controller: deleteUser
+    },
+    {
+      ...(settings.auth.password.requireEmailConfirmation && {
+        method: RestMethod.GET,
+        route: 'confirmation/:token',
+        isAuthRoute: false,
+        controller: confirmEmail
+      })
     }
   ]
 });

From 5cdd618be825b54d11a73bf9f14a99a99629e30c Mon Sep 17 00:00:00 2001
From: Oleksandr Bazylevskyi <bazylevskyioleksandr@gmail.com>
Date: Thu, 27 Jun 2019 17:25:45 +0300
Subject: [PATCH 100/104] Update confirmation link

---
 modules/user/server-ts/password/controllers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index 74f475e..afbcb98 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -65,7 +65,7 @@ export const register = async ({ body, t }: any, res: any) => {
     // async email
     jwt.sign({ identity: pick(user, 'id') }, secret, { expiresIn: '1d' }, (err, emailToken) => {
       const encodedToken = Buffer.from(emailToken).toString('base64');
-      const url = `${__WEBSITE_URL__}/confirmation/${encodedToken}`;
+      const url = `${__WEBSITE_URL__}/api/confirmation/${encodedToken}`;
       mailer.sendMail({
         from: `${app.name} <${process.env.EMAIL_USER}>`,
         to: user.email,

From 18521959ec5fba2746befd85c5be5eec278924e9 Mon Sep 17 00:00:00 2001
From: Oleksandr Bazylevskyi <bazylevskyioleksandr@gmail.com>
Date: Thu, 27 Jun 2019 17:29:31 +0300
Subject: [PATCH 101/104] Fix type of isActive argument

---
 modules/user/server-ts/sql.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/user/server-ts/sql.ts b/modules/user/server-ts/sql.ts
index a8e0dc1..84ff877 100644
--- a/modules/user/server-ts/sql.ts
+++ b/modules/user/server-ts/sql.ts
@@ -186,7 +186,7 @@ class UserDAO {
       .where({ id });
   }
 
-  public updateActive(id: number, isActive: number) {
+  public updateActive(id: number, isActive: boolean) {
     return knex('user')
       .update({ is_active: isActive })
       .where({ id });

From d362d2224a100d3cf0154d8dc171e487353f48e9 Mon Sep 17 00:00:00 2001
From: Oleksandr Bazylevskyi <bazylevskyioleksandr@gmail.com>
Date: Thu, 27 Jun 2019 17:30:59 +0300
Subject: [PATCH 102/104] Clear env

---
 packages/server/.env | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/server/.env b/packages/server/.env
index e43508d..f59989f 100644
--- a/packages/server/.env
+++ b/packages/server/.env
@@ -19,8 +19,7 @@ GOOGLE_CLIENTID=
 GOOGLE_CLIENTSECRET=
 
 # Email
-EMAIL_HOST=smtp.ethereal.email
-EMAIL_PORT=587
-EMAIL_USER=olgv7abv3lcmipb7@ethereal.email
-EMAIL_PASSWORD=VTKxTbK7RPFNBjQwp9
-
+EMAIL_HOST=
+EMAIL_PORT=
+EMAIL_USER=
+EMAIL_PASSWORD=

From 0dcb21a5af91cbb4ebe78be5ca0407df0494c8fa Mon Sep 17 00:00:00 2001
From: Oleksandr Bazylevskyi <bazylevskyioleksandr@gmail.com>
Date: Thu, 27 Jun 2019 17:56:36 +0300
Subject: [PATCH 103/104] Fix forgotPassword controller

---
 modules/user/server-ts/password/controllers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/user/server-ts/password/controllers.ts b/modules/user/server-ts/password/controllers.ts
index afbcb98..e3ca661 100644
--- a/modules/user/server-ts/password/controllers.ts
+++ b/modules/user/server-ts/password/controllers.ts
@@ -81,7 +81,7 @@ export const register = async ({ body, t }: any, res: any) => {
 
 export const forgotPassword = async ({ body, t }: any, res: any) => {
   try {
-    const localAuth = pick(body, 'email');
+    const localAuth = pick(body.value, 'email');
     const identity = (await userDAO.getUserByEmail(localAuth.email)) as UserShapePassword;
 
     if (identity && mailer) {
@@ -106,7 +106,8 @@ export const forgotPassword = async ({ body, t }: any, res: any) => {
       res.send(t('user:auth.password.forgotPassword'));
     }
   } catch (e) {
-    res.send(e);
+    res.status(500);
+    res.end();
   }
 };
 

From 709291e81216bc23657ded1ef3cb40aa3f7209b0 Mon Sep 17 00:00:00 2001
From: Oleksandr Bazylevskyi <bazylevskyioleksandr@gmail.com>
Date: Thu, 27 Jun 2019 18:09:09 +0300
Subject: [PATCH 104/104] Fix broken link

---
 modules/user/server-ts/emailTemplate.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/user/server-ts/emailTemplate.ts b/modules/user/server-ts/emailTemplate.ts
index 8f4d9e2..83b6008 100644
--- a/modules/user/server-ts/emailTemplate.ts
+++ b/modules/user/server-ts/emailTemplate.ts
@@ -22,7 +22,9 @@ const confirmEmail = (url: string, user: UserShape) =>
    <p>Below are your login information</p>
    <p>Your email is: ${user.email}</p>`;
 
-const passwordReset = (url: string) => `Please click this link to reset your password: <a href="${url}">${url}</a>`;
+const passwordReset = (url: string) => `
+  <p>Please click this link to reset your password: <a href="${url}">reset</a>.</p>
+`;
 
 export default {
   accountCreated,