Skip to content

Commit

Permalink
ispras#971: back react17 fix distance_map
Browse files Browse the repository at this point in the history
  • Loading branch information
nataliauvarova committed Oct 10, 2023
1 parent 9ee0b98 commit ac65a68
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 19 deletions.
33 changes: 18 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@
"lodash": "^4.17.21",
"moment": "^2.29.2",
"plotly.js": "^2.20.0",
"react": "^18.2.0",
"react": "^17.0.2",
"react-autocomplete": "^1.8.1",
"react-datepicker": "^4.7.0",
"react-dom": "^18.2.0",
"react-dom": "^17.0.2",
"react-plotly.js": "^2.6.0",
"react-redux": "^8.0.0",
"react-router-dom": "^6.3.0",
Expand Down
18 changes: 16 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React from "react";
import { Provider } from "react-redux";
import { BrowserRouter } from "react-router-dom";
import { createRoot } from 'react-dom/client';
import ReactDOM from "react-dom";
/*import { createRoot } from 'react-dom/client';*/
import { ApolloProvider } from "@apollo/client";
import { applyMiddleware, bindActionCreators, compose, createStore } from "redux";
import createSagaMiddleware from "redux-saga";
Expand Down Expand Up @@ -42,6 +43,18 @@ window.logger = bindActionCreators(

window.dispatch = store.dispatch;

ReactDOM.render(
<Provider store={store}>
<ApolloProvider client={apollo}>
<BrowserRouter>
<Layout />
</BrowserRouter>
</ApolloProvider>
</Provider>,
document.getElementById("root")
);

/*
const root = createRoot(document.getElementById("root"));
root.render(<Provider store={store}>
Expand All @@ -50,4 +63,5 @@ root.render(<Provider store={store}>
<Layout />
</BrowserRouter>
</ApolloProvider>
</Provider>);
</Provider>);
*/

0 comments on commit ac65a68

Please sign in to comment.