From 6e048c1279c89f85c6c66b847e0314941f33f5c4 Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 15 Sep 2020 11:38:25 +0300 Subject: [PATCH] recompose package not updated --- server/app.js | 6 +- server/config.js | 6 +- src/App.js | 1 - src/components/DatatablePagination.js | 2 +- .../ReactSiema/ReactSiemaCarousel.js | 2 +- src/components/applications/ChatHeading.js | 2 +- src/components/applications/MessageCard.js | 2 +- src/components/charts/SmallLine.js | 2 +- .../NotificationContainer.js | 2 +- .../react-notifications/Notifications.js | 6 +- .../applications/ChatApplicationMenu.js | 4 +- .../applications/SurveyApplicationMenu.js | 2 +- .../SurveyDetailApplicationMenu.js | 2 +- .../applications/TodoApplicationMenu.js | 2 +- src/containers/dashboards/Logs.js | 3 +- src/containers/dashboards/NewComments.js | 2 +- src/containers/dashboards/RecentOrders.js | 2 +- src/containers/dashboards/Tickets.js | 2 +- src/containers/navs/Breadcrumb.js | 2 +- src/containers/navs/Sidebar.js | 6 +- src/containers/navs/Topnav.Notifications.js | 2 +- src/containers/navs/Topnav.js | 8 +- src/containers/ui/ReactTableCards.js | 2 +- src/lang/locales/en_US.js | 15 ++ src/layout/UserLayout.js | 2 +- src/views/app/applications/chat.js | 4 +- src/views/app/applications/survey-detail.js | 2 +- src/views/app/applications/survey.js | 2 +- src/views/app/applications/todo.js | 2 +- src/views/app/blank-page.js | 2 +- src/views/app/bots/sber.jsx | 5 +- src/views/app/dashboards/analytics.js | 2 +- src/views/app/dashboards/content.js | 2 +- src/views/app/dashboards/default.js | 4 +- src/views/app/dashboards/ecommerce.js | 3 +- src/views/app/menu/levels/third-level-1.js | 2 +- src/views/app/menu/levels/third-level-2.js | 2 +- src/views/app/menu/levels/third-level-3.js | 2 +- src/views/app/menu/types.js | 2 +- src/views/app/pages/data-list.js | 2 +- src/views/app/pages/details.js | 12 +- src/views/app/pages/image-list.js | 2 +- src/views/app/pages/invoice.js | 2 +- src/views/app/pages/mailing.js | 2 +- src/views/app/pages/search.js | 2 +- src/views/app/pages/thumb-list.js | 2 +- src/views/app/ui/alerts.js | 2 +- src/views/app/ui/badges.js | 2 +- src/views/app/ui/buttons.js | 2 +- src/views/app/ui/cards.js | 2 +- src/views/app/ui/carousel.js | 2 +- src/views/app/ui/charts.js | 2 +- src/views/app/ui/collapse.js | 2 +- src/views/app/ui/dropdowns.js | 2 +- src/views/app/ui/editors.js | 2 +- src/views/app/ui/form-components.js | 2 +- src/views/app/ui/form-layouts.js | 4 +- src/views/app/ui/form-validations.js | 2 +- src/views/app/ui/icons.js | 6 +- src/views/app/ui/input-groups.js | 2 +- src/views/app/ui/jumbotron.js | 2 +- src/views/app/ui/maps.js | 2 +- src/views/app/ui/modal.js | 206 +++++++++--------- src/views/app/ui/navigation.js | 2 +- src/views/app/ui/popover-tooltip.js | 2 +- src/views/app/ui/sortable.js | 2 +- src/views/app/ui/tables.js | 2 +- src/views/error.js | 2 +- src/views/user/login.js | 1 - 69 files changed, 203 insertions(+), 199 deletions(-) diff --git a/server/app.js b/server/app.js index f9a2387..ed93db5 100644 --- 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 index 04b7f53..d101816 100644 --- 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 index ee89012..f8c3891 100644 --- 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 index a8aaaf7..4075a21 100644 --- 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 index 64e6304..2388292 100644 --- 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 index 2eb36cc..88acaf7 100644 --- 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 index 6ffb0d4..3804c9f 100644 --- 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 index 4c90fc3..076b8ec 100644 --- 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 index 7bad6b9..f51a98e 100644 --- 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 index 47ad97e..2618a74 100644 --- 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 (
{notifications.map(notification => { const key = notification.id || new Date().getTime(); diff --git a/src/containers/applications/ChatApplicationMenu.js b/src/containers/applications/ChatApplicationMenu.js index 058d99d..be509f2 100644 --- a/src/containers/applications/ChatApplicationMenu.js +++ b/src/containers/applications/ChatApplicationMenu.js @@ -135,7 +135,7 @@ class ChatApplicationMenu extends Component { >
{loadingContacts && @@ -180,7 +180,7 @@ class ChatApplicationMenu extends Component {
{loadingContacts && diff --git a/src/containers/applications/SurveyApplicationMenu.js b/src/containers/applications/SurveyApplicationMenu.js index 15e7fd4..dd9d54e 100644 --- a/src/containers/applications/SurveyApplicationMenu.js +++ b/src/containers/applications/SurveyApplicationMenu.js @@ -32,7 +32,7 @@ export class SurveyApplicationMenu extends Component { return (

diff --git a/src/containers/applications/SurveyDetailApplicationMenu.js b/src/containers/applications/SurveyDetailApplicationMenu.js index 3e96094..e200c7a 100644 --- a/src/containers/applications/SurveyDetailApplicationMenu.js +++ b/src/containers/applications/SurveyDetailApplicationMenu.js @@ -8,7 +8,7 @@ import ApplicationMenu from '../../components/common/ApplicationMenu'; const SurveyDetailApplicationMenu = () => (

Status

diff --git a/src/containers/applications/TodoApplicationMenu.js b/src/containers/applications/TodoApplicationMenu.js index f680d21..f30941d 100644 --- a/src/containers/applications/TodoApplicationMenu.js +++ b/src/containers/applications/TodoApplicationMenu.js @@ -31,7 +31,7 @@ class TodoApplicationMenu extends Component { return (

diff --git a/src/containers/dashboards/Logs.js b/src/containers/dashboards/Logs.js index 7482e02..1cdc254 100644 --- 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: []}]) => (

@@ -14,7 +13,7 @@ const Logs = (params = [{ logsData: []}]) => (
diff --git a/src/containers/dashboards/NewComments.js b/src/containers/dashboards/NewComments.js index a4d1976..f5842d7 100644 --- a/src/containers/dashboards/NewComments.js +++ b/src/containers/dashboards/NewComments.js @@ -16,7 +16,7 @@ const NewComments = ({ className = '', displayRate = false }) => (
{comments.map((item, index) => (
{data.slice(0, 6).map((order, index) => (
diff --git a/src/containers/dashboards/Tickets.js b/src/containers/dashboards/Tickets.js index fc88d2b..6b8828c 100644 --- a/src/containers/dashboards/Tickets.js +++ b/src/containers/dashboards/Tickets.js @@ -14,7 +14,7 @@ const Tickets = () => (
{data.map((ticket, index) => (