mirror of
https://github.com/PlayEdu/backend
synced 2025-12-27 19:49:29 +08:00
resolve conflict
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import "./index.less";
|
||||
import App from "./App";
|
||||
@@ -7,12 +6,14 @@ import { BrowserRouter } from "react-router-dom";
|
||||
import { Provider } from "react-redux";
|
||||
import store from "./store/store";
|
||||
|
||||
const basename = process.env.REACT_BASE_NAME || "";
|
||||
|
||||
const root = ReactDOM.createRoot(
|
||||
document.getElementById("root") as HTMLElement
|
||||
);
|
||||
root.render(
|
||||
<Provider store={store}>
|
||||
<BrowserRouter>
|
||||
<BrowserRouter basename={basename}>
|
||||
<App />
|
||||
</BrowserRouter>
|
||||
</Provider>
|
||||
|
||||
Reference in New Issue
Block a user