mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-13 09:17:30 -05:00
update worked?
This commit is contained in:
@@ -3,26 +3,27 @@
|
|||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@artsy/fresnel": "1.3.1",
|
"@artsy/fresnel": "6.1.0",
|
||||||
"@reduxjs/toolkit": "^1.1.0",
|
"@reduxjs/toolkit": "^1.9.1",
|
||||||
"@testing-library/jest-dom": "^4.2.4",
|
"@testing-library/jest-dom": "^5.16.5",
|
||||||
"@testing-library/react": "^9.3.2",
|
"@testing-library/react": "^13.4.0",
|
||||||
"@testing-library/user-event": "^7.1.2",
|
"@testing-library/user-event": "^14.4.3",
|
||||||
"axios": "0.21.1",
|
"axios": "1.2.1",
|
||||||
"connected-react-router": "6.8.0",
|
"connected-react-router": "^6.9.3",
|
||||||
"date-fns": "2.16.1",
|
"date-fns": "2.29.3",
|
||||||
"ejs": "3.1.6",
|
"ejs": "3.1.8",
|
||||||
"react": "^17.0.1",
|
"history": "^5.3.0",
|
||||||
"react-audio-player": "0.14.0",
|
"react": "^18.2.0",
|
||||||
"react-datepicker": "3.3.0",
|
"react-audio-player": "0.17.0",
|
||||||
"react-dom": "^17.0.1",
|
"react-datepicker": "4.8.0",
|
||||||
"react-ga": "^3.3.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-redux": "^7.1.3",
|
"react-ga": "^3.3.1",
|
||||||
"react-router-dom": "5.2.0",
|
"react-redux": "^8.0.5",
|
||||||
"react-scripts": "4.0.1",
|
"react-router-dom": "6.6.1",
|
||||||
"redux-thunk": "2.3.0",
|
"react-scripts": "5.0.1",
|
||||||
"semantic-ui-css": "2.4.1",
|
"redux-thunk": "2.4.2",
|
||||||
"semantic-ui-react": "2.0.1"
|
"semantic-ui-css": "2.5.0",
|
||||||
|
"semantic-ui-react": "2.1.4"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
|
|||||||
@@ -1,14 +1,15 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import ReactDOM from 'react-dom';
|
import ReactDOM from 'react-dom';
|
||||||
|
import { createRoot } from 'react-dom/client';
|
||||||
import { Provider } from 'react-redux'
|
import { Provider } from 'react-redux'
|
||||||
import { Route, Switch } from 'react-router' // react-router v4/v5
|
import { Routes ,Route } from 'react-router-dom';
|
||||||
import { ConnectedRouter } from 'connected-react-router'
|
import { ConnectedRouter } from 'connected-react-router'
|
||||||
import configureStore, { history } from './redux-router/configureStore'
|
import configureStore, { history } from './redux-router/configureStore'
|
||||||
import ReactGA from 'react-ga';
|
import ReactGA from 'react-ga';
|
||||||
|
|
||||||
|
|
||||||
import 'semantic-ui-css/semantic.min.css'
|
import 'semantic-ui-css/semantic.min.css'
|
||||||
|
/*
|
||||||
// withTracker
|
// withTracker
|
||||||
import withTracker from './withTracker';
|
import withTracker from './withTracker';
|
||||||
|
|
||||||
@@ -21,25 +22,26 @@ import ListSystemsContainer from "./System/ListSystemsContainer"
|
|||||||
// Call
|
// Call
|
||||||
import CallPlayerContainer from "./Call/CallPlayerContainer"
|
import CallPlayerContainer from "./Call/CallPlayerContainer"
|
||||||
|
|
||||||
import AboutComponent from "./About/AboutComponent"
|
import AboutComponent from "./About/AboutComponent"*/
|
||||||
|
|
||||||
ReactGA.initialize(process.env.REACT_APP_GOOGLE_ANALYTICS);
|
ReactGA.initialize(process.env.REACT_APP_GOOGLE_ANALYTICS);
|
||||||
|
|
||||||
const store = configureStore(/* provide initial state if any */)
|
const store = configureStore(/* provide initial state if any */)
|
||||||
|
const container = document.getElementById('root');
|
||||||
ReactDOM.render(
|
const root = createRoot(container);
|
||||||
|
root.render(
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<ConnectedRouter history={history}> { /* place ConnectedRouter under Provider */ }
|
<ConnectedRouter history={history}> { /* place ConnectedRouter under Provider */ }
|
||||||
<> { /* your usual react-router v4/v5 routing */ }
|
<> { /* your usual react-router v4/v5 routing */ }
|
||||||
<Switch>
|
<Routes>
|
||||||
|
{/*
|
||||||
<Route exact path="/" component={withTracker(MainContainer)} />
|
<Route exact path="/" component={withTracker(MainContainer)} />
|
||||||
<Route exact path="/systems" component={withTracker(ListSystemsContainer)} />
|
<Route exact path="/systems" component={withTracker(ListSystemsContainer)} />
|
||||||
<Route exact path="/system/:shortName" component={withTracker(CallPlayerContainer)} />
|
<Route exact path="/system/:shortName" component={withTracker(CallPlayerContainer)} />
|
||||||
<Route exact path="/about" component={withTracker(AboutComponent)} />
|
<Route exact path="/about" component={withTracker(AboutComponent)} />*/}
|
||||||
<Route render={() => (<div>Miss</div>)} />
|
<Route render={() => (<div>Miss</div>)} />
|
||||||
</Switch>
|
</Routes>
|
||||||
</>
|
</>
|
||||||
</ConnectedRouter>
|
</ConnectedRouter>
|
||||||
</Provider>,
|
</Provider>
|
||||||
document.getElementById('root')
|
|
||||||
)
|
)
|
||||||
@@ -7,13 +7,10 @@ import talkgroupReducer from "../Talkgroups/talkgroup-reducer"
|
|||||||
import groupReducer from "../Group/group-reducer"
|
import groupReducer from "../Group/group-reducer"
|
||||||
import callReducer from "../Call/call-reducer"
|
import callReducer from "../Call/call-reducer"
|
||||||
|
|
||||||
const createRootReducer = (history) => combineReducers({
|
export default (history) => combineReducers({
|
||||||
router: connectRouter(history),
|
router: connectRouter(history),
|
||||||
system: systemReducer,
|
system: systemReducer,
|
||||||
talkgroup: talkgroupReducer,
|
talkgroup: talkgroupReducer,
|
||||||
group: groupReducer,
|
group: groupReducer,
|
||||||
call: callReducer
|
call: callReducer
|
||||||
})
|
})
|
||||||
export default createRootReducer
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
13941
frontend/yarn.lock
13941
frontend/yarn.lock
File diff suppressed because it is too large
Load Diff
10
node_modules/.yarn-integrity
generated
vendored
Normal file
10
node_modules/.yarn-integrity
generated
vendored
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"systemParams": "darwin-arm64-93",
|
||||||
|
"modulesFolders": [],
|
||||||
|
"flags": [],
|
||||||
|
"linkedModules": [],
|
||||||
|
"topLevelPatterns": [],
|
||||||
|
"lockfileEntries": {},
|
||||||
|
"files": [],
|
||||||
|
"artifacts": {}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user