Merge pull request #16 from flatlogic/update

update project

Author: Blari

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [8.2.2] - 18.05.2023
+- Update dependencies
+- Update react version
+- Corrected minor errors
+
 ## [8.2.1] - 01.07.2022
 - UI Adjust
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "light-blue-react",
-  "version": "8.2.0",
+  "version": "8.2.2",
   "private": true,
   "scripts": {
     "build": "cross-env REACT_APP_BACKEND=true cross-env PUBLIC_URL='./' node scripts/build.js",
@@ -54,61 +54,62 @@
     ]
   },
   "dependencies": {
-    "@amcharts/amcharts4": "^4.10.25",
-    "@amcharts/amcharts4-geodata": "^4.1.23",
+    "@amcharts/amcharts4": "^4.10.35",
+    "@amcharts/amcharts4-geodata": "^4.1.26",
     "@fullcalendar/core": "5.11.0",
     "@fullcalendar/daygrid": "5.11.0",
     "@fullcalendar/interaction": "5.11.0",
     "@fullcalendar/list": "5.11.0",
     "@fullcalendar/react": "5.11.1",
     "@fullcalendar/timegrid": "5.11.0",
     "animate.css": "4.1.1",
-    "apexcharts": "^3.35.3",
+    "apexcharts": "^3.40.0",
     "awesome-bootstrap-checkbox": "https://github.com/flatlogic/awesome-bootstrap-checkbox#bump-to-bootstrap5",
     "axios": "^0.27.2",
-    "bootstrap": "5.1.3",
-    "classnames": "^2.3.1",
+    "bootstrap": "5.2.3",
+    "classnames": "^2.3.2",
     "connected-react-router": "6.9.2",
     "draft-js": "^0.11.7",
     "echarts": "^4.9.0",
     "echarts-for-react": "^2.0.16",
     "file-saver": "^2.0.5",
-    "filesize": "^6.3.0",
+    "filesize": "^6.4.0",
     "font-awesome": "4.7.0",
     "formik": "1.5.8",
     "formsy-react": "0.19.5",
     "glyphicons-halflings": "^1.9.1",
-    "highcharts": "^10.1.0",
-    "highcharts-react-official": "^3.1.0",
+    "highcharts": "^10.3.3",
+    "highcharts-react-official": "^3.2.0",
     "history": "^4.10.1",
     "jasny-bootstrap": "^4.0.0",
     "jsonwebtoken": "^8.5.1",
     "line-awesome": "^1.3.0",
     "md5": "^2.3.0",
     "messenger": "https://github.com/HubSpot/messenger.git",
-    "moment": "^2.29.3",
+    "moment": "^2.29.4",
+    "node-sass": "^8.0.0",
     "nvd3": "1.8.6",
     "rc-color-picker": "^1.2.6",
     "rc-hammerjs": "0.6.10",
     "rc-slider": "^9.7.5",
-    "react": "^17.0.2",
-    "react-animate-height": "^2.0.23",
+    "react": "^18.2.0",
+    "react-animate-height": "^2.1.2",
     "react-animated-number": "^0.4.4",
     "react-apexcharts": "^1.4.0",
-    "react-app-polyfill": "^0.2.0",
+    "react-app-polyfill": "^0.2.2",
     "react-autosize-textarea": "^5.0.1",
     "react-bootstrap-table": "4.3.1",
     "react-bootstrap-table-next": "^3.3.5",
     "react-bootstrap-table2-paginator": "^2.1.2",
     "react-bootstrap-table2-toolkit": "^1.4.2",
-    "react-datetime": "^3.1.1",
+    "react-datetime": "^3.2.0",
     "react-dev-utils": "^6.1.1",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.2.0",
     "react-draft-wysiwyg": "1.14.7",
     "react-dropzone": "^11.7.1",
     "react-google-maps": "^9.4.5",
     "react-images": "0.5.19",
-    "react-joyride": "^2.3.0",
+    "react-joyride": "^2.5.4",
     "react-maskedinput": "^4.0.1",
     "react-mde": "^11.5.0",
     "react-redux": "7.2.8",
@@ -125,18 +126,19 @@
     "react-sparklines": "^1.7.0",
     "react-syntax-highlighter": "^13.5.3",
     "react-table": "6.11.5",
-    "react-tagsinput": "^3.19.0",
+    "react-tagsinput": "^3.20.0",
     "react-toastify": "^6.2.0",
     "react-transition-group": "^4.4.2",
     "react-trend": "^1.2.5",
-    "reactstrap": "^9.1.1",
-    "redux": "^4.2.0",
+    "reactstrap": "^9.1.10",
+    "redux": "^4.2.1",
     "redux-thunk": "^2.4.1",
     "rickshaw": "1.7.1",
+    "sass-loader": "^10",
     "showdown": "^1.9.1",
     "skycons": "^1.0.0",
     "sortablejs": "1.15.0",
-    "styled-components": "^5.3.5",
+    "styled-components": "^5.3.10",
     "uuid": "^8.3.2",
     "yup": "^0.32.11"
   },
@@ -179,7 +181,6 @@
     "lodash.assign": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",
     "mini-css-extract-plugin": "0.12.0",
-    "node-sass": "4.14.1",
     "optimize-css-assets-webpack-plugin": "5.0.4",
     "pnp-webpack-plugin": "1.6.4",
     "postcss-flexbugs-fixes": "4.2.1",
@@ -188,7 +189,6 @@
     "postcss-safe-parser": "4.0.2",
     "redux-logger": "^3.0.6",
     "resolve": "1.20.0",
-    "sass-loader": "7.3.1",
     "style-loader": "0.23.1",
     "terser-webpack-plugin": "1.4.4",
     "url-loader": "1.1.2",
@@ -197,7 +197,10 @@
     "webpack-manifest-plugin": "2.2.0",
     "workbox-webpack-plugin": "4.3.1"
   },
+  "engines": {
+    "node": ">=16"
+  },
   "resolutions": {
-    "react-dom": "17.0.0"
+    "react-dom": "18.2.0"
   }
 }

src/components/Header/Header.js

@@ -144,8 +144,8 @@ class Header extends React.Component {
         </div>
         <div className={`d-print-none ${s.root}`}>
           <UncontrolledAlert className={`me-3 d-lg-down-none animate__animated animate__bounceIn animate__delay-1s`}>
-                Check out Light Blue 
-                <button 
+                Check out Light Blue
+                <button
                   className="btn-link"
                   onClick={() => this.setState({ settingsOpen: true })}
                 >
@@ -166,7 +166,7 @@ class Header extends React.Component {
               />
             </InputGroup>
           </Collapse>
-          <Form className="d-md-down-none mx-3 my-auto" inline>
+          <Form className="d-md-down-none mx-3 my-auto">
             <InputGroup className={`input-group-no-border ${s.searchForm}`} >
               <InputGroupText className={s.inputGroupText}>
                 <SearchIcon className={s.headerIcon} />

src/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import ReactDOM from 'react-dom/client';
 import { routerMiddleware } from 'connected-react-router';
 import { createStore, applyMiddleware, compose } from 'redux';
 import { Provider } from 'react-redux'
@@ -16,7 +16,7 @@ import { createHashHistory } from 'history';
 const history = createHashHistory();
 
 export function getHistory() {
-  return history;
+    return history;
 }
 
 axios.defaults.baseURL = config.baseURLApi;
@@ -28,21 +28,22 @@ if (token) {
 
 export const store = createStore(
     createRootReducer(history),
-        compose(
+    compose(
         applyMiddleware(
-        routerMiddleware(history),
-        ReduxThunk
+            routerMiddleware(history),
+            ReduxThunk
         ),
     )
 );
 
 store.dispatch(doInit());
 
-ReactDOM.render(
+const root = ReactDOM.createRoot(document.getElementById('root'))
+
+root.render(
     <Provider store={store}>
         <App />
     </Provider>,
-    document.getElementById('root')
 );
 
 // If you want your app to work offline and load faster, you can change