Skip to content

Commit a426074

Browse files
BlariBlari
authored
Merge pull request #1 from flatlogic/update-dependencies
Update dependencies
2 parents b9a6c08 + 5356587 commit a426074

File tree

26 files changed

+1104
-1547
lines changed

26 files changed

+1104
-1547
lines changed

‎changelog.md

+45
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,49 @@
11
# Changelog
2+
## [1.1.7]
3+
### Updated following dependencies:
4+
"react": "^16.14.0" - "^18.2.0",
5+
"react-dom": "^16.14.0" - "^18.2.0",
6+
"node-sass": "4.14.1" --> "sass": "^1.63.4",
7+
"@amcharts/amcharts4": "4.10.21" - "4.10.36"
8+
"@amcharts/amcharts4-geodata": "4.1.21" - "4.1.27"
9+
"@fullcalendar/core": "5.9.0" - "6.1.8"
10+
"@fullcalendar/daygrid": "5.9.0" - "6.1.8"
11+
"@fullcalendar/interaction": "5.9.0" - "6.1.8"
12+
"@fullcalendar/list": "5.9.0" - "6.1.8"
13+
"@fullcalendar/react": "5.9.0" - "6.1.8"
14+
"@fullcalendar/timegrid": "5.9.0" - "6.1.8"
15+
"@nivo/bar": "0.73.1" - "0.80.0"
16+
"@nivo/calendar": "0.73.0" - "0.80.0"
17+
"@nivo/chord": "0.73.0" - "0.80.0"
18+
"@nivo/circle-packing": "0.73.0" - "0.80.0"
19+
"@nivo/core": "0.73.0" - "0.80.0"
20+
"@nivo/pie": "0.73.0" - "0.80.0"
21+
"@nivo/radar": "0.73.0" - "0.80.0"
22+
"@nivo/stream": "0.73.0" - "0.80.0"
23+
"@nivo/sunburst": "0.73.0" - "0.80.0"
24+
"@nivo/swarmplot": "0.73.0" - "0.80.0"
25+
"@nivo/waffle": "0.73.0" - "0.80.0"
26+
"apexcharts": "3.27.3" - "3.41.0"
27+
"axios": "0.21.1" - "1.4.0"
28+
"bootstrap": "4.6.0" - "4.6.2"
29+
"chroma-js": "2.1.2" - "2.4.2"
30+
"echarts": "4.9.0" - "5.4.2"
31+
"echarts-for-react": "2.0.16" - "3.0.2"
32+
"formik": "1.5.8" - "2.4.2"
33+
"jsonwebtoken": "8.5.1" - "9.0.0"
34+
"moment": "2.29.1" - "2.29.4"
35+
"react-animate-height": "2.0.23" - "3.1.1"
36+
"react-apexcharts": "1.3.9" - "1.4.0"
37+
"react-autosize-textarea": "5.0.1" - "7.1.0"
38+
"react-datetime": "2.16.3" - "3.2.0"
39+
"react-draft-wysiwyg": "1.14.7" - "1.15.0"
40+
"react-select": "3.2.0" - "5.7.3"
41+
"react-slick": "0.28.1" - "0.29.0"
42+
"react-sortable-hoc": "0.8.4" - "2.0.0"
43+
"react-syntax-highlighter": "10.3.5" - "15.5.0"
44+
"react-transition-group": "2.9.0" - "4.4.5"
45+
"reactstrap": "7.1.0" - "8.10.0"
46+
247
## [1.1.6]
348
- Added User Management Component
449
- Added Route Components

‎package.json

+42-42
Original file line numberDiff line numberDiff line change
@@ -55,69 +55,69 @@
5555
]
5656
},
5757
"dependencies": {
58-
"@amcharts/amcharts4": "^4.10.21",
59-
"@amcharts/amcharts4-geodata": "^4.1.21",
60-
"@fullcalendar/core": "5.9.0",
61-
"@fullcalendar/daygrid": "5.9.0",
62-
"@fullcalendar/interaction": "5.9.0",
63-
"@fullcalendar/list": "5.9.0",
64-
"@fullcalendar/react": "5.9.0",
65-
"@fullcalendar/timegrid": "5.9.0",
58+
"@amcharts/amcharts4": "^4.10.36",
59+
"@amcharts/amcharts4-geodata": "^4.1.27",
60+
"@fullcalendar/core": "6.1.8",
61+
"@fullcalendar/daygrid": "6.1.8",
62+
"@fullcalendar/interaction": "6.1.8",
63+
"@fullcalendar/list": "6.1.8",
64+
"@fullcalendar/react": "6.1.8",
65+
"@fullcalendar/timegrid": "6.1.8",
6666
"@material-ui/core": "^4.12.3",
67-
"@nivo/bar": "^0.73.1",
68-
"@nivo/calendar": "^0.73.0",
69-
"@nivo/chord": "^0.73.0",
70-
"@nivo/circle-packing": "^0.73.0",
71-
"@nivo/core": "^0.73.0",
72-
"@nivo/pie": "^0.73.0",
73-
"@nivo/radar": "^0.73.0",
74-
"@nivo/stream": "^0.73.0",
75-
"@nivo/sunburst": "^0.73.0",
76-
"@nivo/swarmplot": "^0.73.0",
77-
"@nivo/waffle": "^0.73.0",
67+
"@nivo/bar": "^0.80.0",
68+
"@nivo/calendar": "^0.80.0",
69+
"@nivo/chord": "^0.80.0",
70+
"@nivo/circle-packing": "^0.80.0",
71+
"@nivo/core": "^0.80.0",
72+
"@nivo/pie": "^0.80.0",
73+
"@nivo/radar": "^0.80.0",
74+
"@nivo/stream": "^0.80.0",
75+
"@nivo/sunburst": "^0.80.0",
76+
"@nivo/swarmplot": "^0.80.0",
77+
"@nivo/waffle": "^0.80.0",
7878
"animate.css": "4.1.1",
79-
"apexcharts": "^3.27.3",
79+
"apexcharts": "^3.41.0",
8080
"awesome-bootstrap-checkbox": "1.0.1",
81-
"axios": "^0.21.1",
82-
"bootstrap": "4.6.0",
81+
"axios": "^1.4.0",
82+
"bootstrap": "4.6.2",
8383
"bootstrap_calendar": "https://github.com/xero/bootstrap_calendar.git#1.0.1",
84-
"chroma-js": "^2.1.2",
84+
"chroma-js": "^2.4.2",
8585
"classnames": "^2.3.1",
8686
"connected-react-router": "^6.9.1",
8787
"draft-js": "0.11.7",
88-
"echarts": "4.9.0",
89-
"echarts-for-react": "2.0.16",
88+
"echarts": "5.4.2",
89+
"echarts-for-react": "3.0.2",
9090
"font-awesome": "4.7.0",
91-
"formik": "^1.5.8",
91+
"formik": "^2.4.2",
9292
"formsy-react": "0.19.5",
9393
"glyphicons-halflings": "^1.9.1",
9494
"history": "^4.10.1",
9595
"jasny-bootstrap": "3.1.3",
96-
"jsonwebtoken": "^8.5.1",
96+
"jsonwebtoken": "9.0.0",
9797
"line-awesome": "1.3.0",
9898
"lodash": "^4.17.21",
99-
"moment": "^2.29.1",
99+
"moment": "2.29.4",
100100
"nivo": "^0.31.0",
101101
"prettier": "^2.3.2",
102102
"prop-types": "^15.7.2",
103103
"rc-color-picker": "^1.2.6",
104104
"rc-hammerjs": "^0.6.10",
105105
"rc-slider": "8.7.1",
106-
"react": "^16.14.0",
107-
"react-animate-height": "^2.0.23",
106+
"react": "^18.2.0",
107+
"react-animate-height": "^3.1.1",
108108
"react-animated-number": "^0.4.4",
109-
"react-apexcharts": "^1.3.9",
110-
"react-autosize-textarea": "5.0.1",
109+
"react-apexcharts": "^1.4.0",
110+
"react-autosize-textarea": "7.1.0",
111111
"react-bootstrap-table": "4.3.1",
112112
"react-bootstrap-table-next": "^4.0.3",
113113
"react-bootstrap-table2-editor": "^1.4.0",
114114
"react-bootstrap-table2-filter": "^1.3.3",
115115
"react-bootstrap-table2-paginator": "^2.1.2",
116116
"react-bootstrap-table2-toolkit": "^2.1.3",
117-
"react-datetime": "2.16.3",
117+
"react-datetime": "3.2.0",
118118
"react-dev-utils": "^6.1.1",
119-
"react-dom": "^16.14.0",
120-
"react-draft-wysiwyg": "1.14.7",
119+
"react-dom": "^18.2.0",
120+
"react-draft-wysiwyg": "1.15.0",
121121
"react-dropzone": "6.2.4",
122122
"react-google-maps": "^9.4.5",
123123
"react-images": "0.5.19",
@@ -128,17 +128,17 @@
128128
"react-router-dom": "^4.4.0-beta.8",
129129
"react-router-hash-link": "^1.2.2",
130130
"react-scrollspy": "3.4.3",
131-
"react-select": "3.2.0",
132-
"react-slick": "0.28.1",
133-
"react-sortable-hoc": "0.8.4",
131+
"react-select": "5.7.3",
132+
"react-slick": "0.29.0",
133+
"react-sortable-hoc": "2.0.0",
134134
"react-sortable-tree": "2.8.0",
135135
"react-sortablejs": "1.5.1",
136136
"react-sparklines": "^1.7.0",
137-
"react-syntax-highlighter": "10.3.5",
137+
"react-syntax-highlighter": "15.5.0",
138138
"react-table": "6.11.5",
139139
"react-toastify": "^5.5.0",
140-
"react-transition-group": "^2.9.0",
141-
"reactstrap": "7.1.0",
140+
"react-transition-group": "^4.4.5",
141+
"reactstrap": "8.10.0",
142142
"redux": "^4.0.1",
143143
"redux-logger": "^3.0.6",
144144
"redux-thunk": "^2.3.0",
@@ -188,7 +188,6 @@
188188
"lodash.assign": "^4.2.0",
189189
"lodash.clonedeep": "^4.5.0",
190190
"mini-css-extract-plugin": "0.12.0",
191-
"node-sass": "4.14.1",
192191
"optimize-css-assets-webpack-plugin": "5.0.6",
193192
"pnp-webpack-plugin": "1.7.0",
194193
"postcss-flexbugs-fixes": "4.2.1",
@@ -197,6 +196,7 @@
197196
"postcss-safe-parser": "4.0.2",
198197
"react-responsive-carousel": "^3.2.20",
199198
"resolve": "1.20.0",
199+
"sass": "^1.63.4",
200200
"sass-loader": "7.3.1",
201201
"style-loader": "0.23.1",
202202
"terser-webpack-plugin": "1.4.5",

‎src/components/Users/changePassword/ChangePasswordForm.js

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class UsersForm extends Component {
2525
return (
2626
<Widget className="widget-p-md">
2727
<Formik
28+
initialValues={{}}
2829
onSubmit={this.handleSubmit}
2930
render={(form) => {
3031
return (

‎src/documentation/pages/Libs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, {Component} from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Button } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
4-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
4+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
55
import {Sparklines, SparklinesBars} from "react-sparklines";
66
import ColorPiker from 'rc-color-picker';
77
import TextareaAutosize from 'react-autosize-textarea';

‎src/documentation/pages/Pages.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, {Component} from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
4-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
4+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
55
import ProductCard from '../../pages/products/components/ProductCard/ProductCard';
66
import products from '../../pages/products/mock';
77
import chatImg from '../../images/chat/chat_preview.png';

‎src/documentation/pages/components/Alerts.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Alert, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class Overview extends Component {
88
state = {

‎src/documentation/pages/components/Badge.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Badge, Button, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class Badges extends Component {
88
state = {

‎src/documentation/pages/components/Buttons.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Button, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class Buttons extends Component {
88
state = {

‎src/documentation/pages/components/Card.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Button, Card, CardBody, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class Buttons extends Component {
88
state = {

‎src/documentation/pages/components/Carousel.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, UncontrolledCarousel } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
4-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
4+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
55

66
import firstSlide from '../../../images/slides/1.png';
77
import secondSlide from '../../../images/slides/2.png';

‎src/documentation/pages/components/Modal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Button, Modal, ModalHeader, ModalBody, ModalFooter, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class Modals extends Component {
88
state = {

‎src/documentation/pages/components/Nav.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class NavPage extends Component {
88
state = {

‎src/documentation/pages/components/Navbar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import {
1818
DropdownMenu,
1919
DropdownItem
2020
} from 'reactstrap';
21-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
21+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
2222
import classnames from 'classnames';
23-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
23+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
2424

2525
class NavbarPage extends Component {
2626
state = {

‎src/documentation/pages/components/Popovers.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import {
1515
PopoverBody,
1616
UncontrolledTooltip,
1717
} from 'reactstrap';
18-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
18+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
1919
import classnames from 'classnames';
20-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
20+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
2121

2222
class NavbarPage extends Component {
2323
state = {

‎src/documentation/pages/components/Progress.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Progress, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class Buttons extends Component {
88
state = {

‎src/documentation/pages/components/Tabs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Row, Col, Breadcrumb, BreadcrumbItem, Collapse, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
3-
import SyntaxHighlighter from 'react-syntax-highlighter/dist/prism';
3+
import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism';
44
import classnames from 'classnames';
5-
import { tomorrow } from 'react-syntax-highlighter/dist/styles/prism';
5+
import { tomorrow } from 'react-syntax-highlighter/dist/esm/styles/prism';
66

77
class Buttons extends Component {
88
state = {

‎src/index.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import ReactDOM from 'react-dom';
2+
import ReactDOM from 'react-dom/client';
33
import { routerMiddleware } from "connected-react-router";
44
import {createStore, applyMiddleware, compose} from 'redux';
55
import { Provider } from 'react-redux';
@@ -14,6 +14,8 @@ import createRootReducer from './reducers';
1414
import { doInit } from "./actions/auth";
1515
import { createHashHistory } from "history";
1616

17+
import 'bootstrap/dist/css/bootstrap.min.css';
18+
1719

1820
const history = createHashHistory();
1921

@@ -40,11 +42,11 @@ export const store = createStore(
4042

4143
store.dispatch(doInit());
4244

43-
ReactDOM.render(
45+
const root = ReactDOM.createRoot(document.getElementById("root"));
46+
root.render(
4447
<Provider store={store}>
4548
<App />
46-
</Provider>,
47-
document.getElementById('root')
49+
</Provider>
4850
);
4951

5052
// If you want your app to work offline and load faster, you can change

‎src/pages/charts/Charts.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ import {chartData} from './mock';
1212

1313
import ReactEchartsCore from 'echarts-for-react/lib/core';
1414

15-
import echarts from 'echarts/lib/echarts';
15+
import * as echarts from 'echarts/lib/echarts';
1616

1717
import 'echarts/lib/chart/line';
1818
import 'echarts/lib/chart/pie';
1919
import 'echarts/lib/chart/themeRiver';
2020
import 'echarts/lib/component/tooltip';
2121
import 'echarts/lib/component/legend';
22+
import 'echarts/lib/component/singleAxis'
2223

2324
class Charts extends React.Component {
2425

0 commit comments

Comments
 (0)