recompose package not updated

Opexflow · Sep 15, 2020 · 6e048c1 · 6e048c1 · jtarasova · Sep 15, 2020
1 parent 446998e
commit 6e048c1
Show file tree

Hide file tree

Showing 69 changed files with 203 additions and 199 deletions.
diff --git a/server/app.js b/server/app.js
@@ -32,8 +32,8 @@ passport.deserializeUser((obj, done) => {
 
 const HOSTNAME = 'http://localhost:3000';
 config.callback_url = 'http://localhost:3001/api/auth/facebook/callback';
-config.facebook_api_secret = '8f891ee90229fd861d4c71bdf648ad14';
-config.facebook_api_key = '2640133479605924';
+config.facebook_api_secret = '28d6d64b25d647d30f08f3e9c489eb04';
+config.facebook_api_key = '3606748869337149';
 
 // let HOSTNAME = 'https://opexflow.com';
 
@@ -69,7 +69,7 @@ function replaceHost(host) {
 }
 
 app.use(bodyParser.urlencoded({ extended: false }));
-app.use(session({ secret: 'secret123', key: 'sid' }));
+app.use(session({ secret: 'secret123', key: 'sid', resave: false, saveUninitialized: false }));
 app.use(passport.initialize());
 app.use(passport.session());
 

diff --git a/server/config.js b/server/config.js
@@ -1,6 +1,8 @@
 module.exports = {
-    facebook_api_key: '2969806906408505',
-    facebook_api_secret: '4e4c8607d69bec65298a406838026b89',
+    // facebook_api_key: '2969806906408505',
+    // facebook_api_secret: '4e4c8607d69bec65298a406838026b89',
+    facebook_api_key: '3606748869337149',
+    facebook_api_secret: '28d6d64b25d647d30f08f3e9c489eb04',
     // 'http://localhost:3001/api/auth/facebook/callback',
     callback_url: 'https://opexflow.com/api/auth/facebook/callback',
     host: '78.24.216.16',

diff --git a/src/App.js b/src/App.js
@@ -11,7 +11,6 @@ import { IntlProvider } from 'react-intl';
 import AppLocale from './lang';
 // import ColorSwitcher from './components/common/ColorSwitcher';
 import NotificationContainer from './components/common/react-notifications/NotificationContainer';
-import { isMultiColorActive } from './constants/defaultValues';
 import { getDirection } from './helpers/Utils';
 
 const ViewMain = React.lazy(() => import(/* webpackChunkName: "views" */ './views'));

diff --git a/src/components/DatatablePagination.js b/src/components/DatatablePagination.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import {
     Pagination, PaginationItem, PaginationLink,
     UncontrolledDropdown, DropdownMenu, DropdownToggle, DropdownItem,

diff --git a/src/components/ReactSiema/ReactSiemaCarousel.js b/src/components/ReactSiema/ReactSiemaCarousel.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import ReactSiema from './lib';
 
 export default class ReactSiemaCarousel extends Component {

diff --git a/src/components/applications/ChatHeading.js b/src/components/applications/ChatHeading.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 
 const ChatHeading = ({ name, thumb, lastSeenDate }) => (
     <>

diff --git a/src/components/applications/MessageCard.js b/src/components/applications/MessageCard.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import { Card, CardBody } from 'reactstrap';
 
 const MessageCard = ({ sender, item, currentUserid }) => (

diff --git a/src/components/charts/SmallLine.js b/src/components/charts/SmallLine.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import ChartComponent, { Chart } from 'react-chartjs-2';
 
 import { smallLineChartOptions } from './config';

diff --git a/src/components/common/react-notifications/NotificationContainer.js b/src/components/common/react-notifications/NotificationContainer.js
@@ -18,7 +18,7 @@ class NotificationContainer extends React.Component {
       notifications: [],
   };
 
-  componentWillMount = () => {
+  UNSAFE_componentWillMount = () => {
       NotificationManager.addChangeListener(this.handleStoreChange);
   };
 

diff --git a/src/components/common/react-notifications/Notifications.js b/src/components/common/react-notifications/Notifications.js
@@ -35,9 +35,9 @@ class Notifications extends React.Component {
       return (
           <div className={className}>
               <CSSTransitionGroup
-                  transitionName="notification"
-                  transitionEnterTimeout={enterTimeout}
-                  transitionLeaveTimeout={leaveTimeout}
+                  transitionname="notification"
+                  transitionentertimeout={enterTimeout}
+                  transitionleavetimeout={leaveTimeout}
             >
                   {notifications.map(notification => {
                       const key = notification.id || new Date().getTime();

diff --git a/src/containers/applications/ChatApplicationMenu.js b/src/containers/applications/ChatApplicationMenu.js
@@ -135,7 +135,7 @@ class ChatApplicationMenu extends Component {
             >
                   <TabPane tabId="messages" className="chat-app-tab-pane">
                       <PerfectScrollbar
-                          option={{ suppressScrollX: true, wheelPropagation: false }}
+                          options={{ suppressScrollX: true, wheelPropagation: false }}
                     >
                           <div className="pt-2 pr-4 pl-4 pb-2">
                               {loadingContacts &&
@@ -180,7 +180,7 @@ class ChatApplicationMenu extends Component {
                 </TabPane>
                   <TabPane tabId="contacts" className="chat-app-tab-pane">
                       <PerfectScrollbar
-                          option={{ suppressScrollX: true, wheelPropagation: false }}
+                          options={{ suppressScrollX: true, wheelPropagation: false }}
                     >
                           <div className="pt-2 pr-4 pl-4 pb-2">
                               {loadingContacts &&

diff --git a/src/containers/applications/SurveyApplicationMenu.js b/src/containers/applications/SurveyApplicationMenu.js
@@ -32,7 +32,7 @@ export class SurveyApplicationMenu extends Component {
         return (
             <ApplicationMenu>
                 <PerfectScrollbar
-                    option={{ suppressScrollX: true, wheelPropagation: false }}
+                    options={{ suppressScrollX: true, wheelPropagation: false }}
               >
                     <div className="p-4">
                         <p className="text-muted text-small">

diff --git a/src/containers/applications/SurveyDetailApplicationMenu.js b/src/containers/applications/SurveyDetailApplicationMenu.js
@@ -8,7 +8,7 @@ import ApplicationMenu from '../../components/common/ApplicationMenu';
 const SurveyDetailApplicationMenu = () => (
     <ApplicationMenu>
     <PerfectScrollbar
-          option={{ suppressScrollX: true, wheelPropagation: false }}
+          options={{ suppressScrollX: true, wheelPropagation: false }}
         >
           <div className="p-4">
               <p className="text-muted text-small">Status</p>

diff --git a/src/containers/applications/TodoApplicationMenu.js b/src/containers/applications/TodoApplicationMenu.js
@@ -31,7 +31,7 @@ class TodoApplicationMenu extends Component {
       return (
           <ApplicationMenu>
               <PerfectScrollbar
-                  option={{ suppressScrollX: true, wheelPropagation: false }}
+                  options={{ suppressScrollX: true, wheelPropagation: false }}
             >
                   <div className="p-4">
                       <p className="text-muted text-small">

diff --git a/src/containers/dashboards/Logs.js b/src/containers/dashboards/Logs.js
@@ -3,7 +3,6 @@ import PerfectScrollbar from 'react-perfect-scrollbar';
 import { Card, CardBody, CardTitle } from 'reactstrap';
 
 import IntlMessages from '../../helpers/IntlMessages';
-import data from '../../data/logs';
 
 const Logs = (params = [{ logsData: []}]) => (
     <div>
@@ -14,7 +13,7 @@ const Logs = (params = [{ logsData: []}]) => (
                 </CardTitle>
               <div className="dashboard-logs">
                   <PerfectScrollbar
-                      option={{ suppressScrollX: true, wheelPropagation: false }}
+                      options={{ suppressScrollX: true, wheelPropagation: false }}
                     >
                       <table className="table table-sm table-borderless">
                           <tbody>

diff --git a/src/containers/dashboards/NewComments.js b/src/containers/dashboards/NewComments.js
@@ -16,7 +16,7 @@ const NewComments = ({ className = '', displayRate = false }) => (
             </CardTitle>
           <div className="dashboard-list-with-user">
               <PerfectScrollbar
-                  option={{ suppressScrollX: true, wheelPropagation: false }}
+                  options={{ suppressScrollX: true, wheelPropagation: false }}
                 >
                   {comments.map((item, index) => (
                         <div

diff --git a/src/containers/dashboards/RecentOrders.js b/src/containers/dashboards/RecentOrders.js
@@ -22,7 +22,7 @@ export default function RecentOrders() {
               </CardTitle>
                 <div className="scroll dashboard-list-with-thumbs">
                     <PerfectScrollbar
-                        option={{ suppressScrollX: true, wheelPropagation: false }}
+                        options={{ suppressScrollX: true, wheelPropagation: false }}
                   >
                         {data.slice(0, 6).map((order, index) => (
                         <div key={index} className="d-flex flex-row mb-3">

diff --git a/src/containers/dashboards/Tickets.js b/src/containers/dashboards/Tickets.js
@@ -14,7 +14,7 @@ const Tickets = () => (
             </CardTitle>
           <div className="dashboard-list-with-user">
               <PerfectScrollbar
-                  option={{ suppressScrollX: true, wheelPropagation: false }}
+                  options={{ suppressScrollX: true, wheelPropagation: false }}
                 >
                   {data.map((ticket, index) => (
                         <div

diff --git a/src/containers/navs/Breadcrumb.js b/src/containers/navs/Breadcrumb.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import { Breadcrumb, BreadcrumbItem } from 'reactstrap';
 import { NavLink } from 'react-router-dom';
 import IntlMessages from '../../helpers/IntlMessages';

diff --git a/src/containers/navs/Sidebar.js b/src/containers/navs/Sidebar.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import ReactDOM from 'react-dom';
 import { Nav, NavItem, UncontrolledCollapse } from 'reactstrap';
@@ -292,7 +292,7 @@ class Sidebar extends Component {
               <div className="main-menu">
                   <div className="scroll">
                       <PerfectScrollbar
-                          option={{ suppressScrollX: true, wheelPropagation: false }}
+                          options={{ suppressScrollX: true, wheelPropagation: false }}
                     >
                           <Nav vertical className="list-unstyled">
                               {menuItems &&
@@ -337,7 +337,7 @@ class Sidebar extends Component {
               <div className="sub-menu">
                   <div className="scroll">
                       <PerfectScrollbar
-                          option={{ suppressScrollX: true, wheelPropagation: false }}
+                          options={{ suppressScrollX: true, wheelPropagation: false }}
                     >
                           {menuItems &&
                 menuItems.map(item => (

diff --git a/src/containers/navs/Topnav.Notifications.js b/src/containers/navs/Topnav.Notifications.js
@@ -38,7 +38,7 @@ const TopnavNotifications = () => (
               id="notificationDropdown"
             >
               <PerfectScrollbar
-                  option={{ suppressScrollX: true, wheelPropagation: false }}
+                  options={{ suppressScrollX: true, wheelPropagation: false }}
                 >
                   {notifications.map((notification, index) => <NotificationItem key={index} {...notification} />)}
                 </PerfectScrollbar>

diff --git a/src/containers/navs/Topnav.js b/src/containers/navs/Topnav.js
@@ -5,13 +5,11 @@ import {
     DropdownItem,
     DropdownToggle,
     DropdownMenu,
-    Input,
 } from 'reactstrap';
 
 import { NavLink } from 'react-router-dom';
 import { connect } from 'react-redux';
 
-import IntlMessages from '../../helpers/IntlMessages';
 import {
     setContainerClassnames,
     clickOnMobileMenu,
@@ -22,14 +20,11 @@ import {
 import {
     menuHiddenBreakpoint,
     searchPath,
-    localeOptions,
-    isDarkSwitchActive,
 } from '../../constants/defaultValues';
 
 import { MobileMenuIcon, MenuIcon } from '../../components/svg';
 import TopnavEasyAccess from './Topnav.EasyAccess';
 import TopnavNotifications from './Topnav.Notifications';
-import TopnavDarkSwitch from './Topnav.DarkSwitch';
 
 import { getDirection, setDirection } from '../../helpers/Utils';
 
@@ -200,8 +195,7 @@ class TopNav extends Component {
   };
 
   render() {
-      const { containerClassnames, menuClickCount, locale } = this.props;
-      const { messages } = this.props.intl;
+      const { containerClassnames, menuClickCount } = this.props;
       const { user, finance } = this.props.authUser;
 
       return (

diff --git a/src/containers/ui/ReactTableCards.js b/src/containers/ui/ReactTableCards.js
@@ -10,7 +10,7 @@ import data from '../../data/products';
 
 const CustomTbodyComponent = props => (
     <div {...props} className={classnames('rt-tbody', props.className || [])}>
-        <PerfectScrollbar option={{ suppressScrollX: true }}>
+        <PerfectScrollbar options={{ suppressScrollX: true }}>
             {props.children}
       </PerfectScrollbar>
   </div>

diff --git a/src/lang/locales/en_US.js b/src/lang/locales/en_US.js
@@ -32,6 +32,7 @@ Table of Contents
   07.18.Sortable
   07.19.Maps
   07.20.Tables
+08.Indicators
 */
 
 module.exports = {
@@ -55,7 +56,13 @@ module.exports = {
     /* 03.Menu */
     'menu.app': 'Home',
     'menu.dashboards': 'Dashboards',
+    'menu.gogo': 'Gogo',
+    'menu.start': 'Start',
+    'menu.second-menu': 'Second menu',
+    'menu.second': 'Second',
     'menu.default': 'Default',
+    'menu.bots': 'Bots',
+    'menu.sber': 'Sber',
     'menu.analytics': 'Analytics',
     'menu.ecommerce': 'Ecommerce',
     'menu.content': 'Content',
@@ -574,4 +581,12 @@ module.exports = {
     'table.react-scrollable': 'Scrollable',
     'table.react-advanced': 'Filter, Length and Jump',
 
+
+/* 08.Indicators */
+    'Balance': 'Balance',
+    'Balance with stocks': 'Balance with stocks',
+    'Stocks delta': 'Stocks delta',
+    'Current price': 'Current price',
+    'Stocks count': 'Stocks count',
+    'Commission': 'Commission',
 };
diff --git a/src/layout/UserLayout.js b/src/layout/UserLayout.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 
 class UserLayout extends Component {
     componentDidMount() {

diff --git a/src/views/app/applications/chat.js b/src/views/app/applications/chat.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import PerfectScrollbar from 'react-perfect-scrollbar';
@@ -128,7 +128,7 @@ class ChatApp extends Component {
                                   this._scrollBarRef = ref;
                               }}
                             containerRef={ref => {}}
-                            option={{ suppressScrollX: true, wheelPropagation: false }}
+                            options={{ suppressScrollX: true, wheelPropagation: false }}
                           >
                               {selectedConversation.messages.map((item, index) => {
                                   const sender = allContacts.find(x => x.id === item.sender);

diff --git a/src/views/app/applications/survey-detail.js b/src/views/app/applications/survey-detail.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import {

diff --git a/src/views/app/applications/survey.js b/src/views/app/applications/survey.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { injectIntl } from 'react-intl';
 import {

diff --git a/src/views/app/applications/todo.js b/src/views/app/applications/todo.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import {
     Row,
     Button,

diff --git a/src/views/app/blank-page.js b/src/views/app/blank-page.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component} from 'react';
 import { Row } from 'reactstrap';
 import IntlMessages from '../../helpers/IntlMessages';
 import { Colxx, Separator } from '../../components/common/CustomBootstrap';

diff --git a/src/views/app/bots/sber.jsx b/src/views/app/bots/sber.jsx
@@ -1,8 +1,7 @@
-import React, { PureComponent, Component } from 'react';
+import React, { Component } from 'react';
 import { Row, Button } from 'reactstrap';
 import Chart from 'react-apexcharts';
 import ApexCharts from 'apexcharts';
-import IntlMessages from '../../../helpers/IntlMessages';
 import { Colxx, Separator } from '../../../components/common/CustomBootstrap';
 import Breadcrumb from '../../../containers/navs/Breadcrumb';
 import IconCard from '../../../components/cards/IconCard';
@@ -113,7 +112,7 @@ export default class Sber extends Component {
                 }
 
                 if (!tick[2] || !tick[3]) {
-                    return;
+                    return false;
                 }
 
                 // console.log(`${tick[2]} ${tick[3]}`, [parseFloat(tick[4]), parseFloat(tick[5]), parseFloat(tick[6]), parseFloat(tick[7])]);

diff --git a/src/views/app/dashboards/analytics.js b/src/views/app/dashboards/analytics.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import { injectIntl } from 'react-intl';
 import { Row } from 'reactstrap';
 

diff --git a/src/views/app/dashboards/content.js b/src/views/app/dashboards/content.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import { injectIntl } from 'react-intl';
 import { Row } from 'reactstrap';
 

diff --git a/src/views/app/dashboards/default.js b/src/views/app/dashboards/default.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component} from 'react';
 import { injectIntl } from 'react-intl';
 import { Row } from 'reactstrap';
 
@@ -10,12 +10,10 @@ import RecentOrders from '../../../containers/dashboards/RecentOrders';
 import Logs from '../../../containers/dashboards/Logs';
 import Tickets from '../../../containers/dashboards/Tickets';
 import Calendar from '../../../containers/dashboards/Calendar';
-import BestSellers from '../../../containers/dashboards/BestSellers';
 import ProfileStatuses from '../../../containers/dashboards/ProfileStatuses';
 import GradientCardContainer from '../../../containers/dashboards/GradientCardContainer';
 import Cakes from '../../../containers/dashboards/Cakes';
 import GradientWithRadialProgressCard from '../../../components/cards/GradientWithRadialProgressCard';
-import SortableStaticticsRow from '../../../containers/dashboards/SortableStaticticsRow';
 import AdvancedSearch from '../../../containers/dashboards/AdvancedSearch';
 import SmallLineCharts from '../../../containers/dashboards/SmallLineCharts';
 import SalesChartCard from '../../../containers/dashboards/SalesChartCard';