This commit is contained in:
cha0s 2021-01-20 09:49:51 -06:00
parent 4d1d857be1
commit c7c7ca5edb
9 changed files with 55 additions and 46 deletions

View File

@ -2,29 +2,18 @@ import './humus.scss';
import {hot} from 'react-hot-loader';
// TODO should be betta
import 'pixi.js-legacy';
import {LatusContext, useLatus} from '@latus/react/client';
import {Provider, useStore} from '@latus/redux';
import {ConnectedRouter} from 'connected-react-router';
import PropTypes from 'prop-types';
import React from 'react';
import {
__RouterContext,
} from 'react-router';
import {
Redirect,
Route,
Switch,
useLocation,
} from 'react-router-dom';
import Dumb from 'components/renderers/dumb';
import Login from 'components/login';
import Play from 'components/play';
import Stage from 'components/stage';
import RoomView from 'components/renderers/room-view';
import Renderer from 'components/renderer';
import Title from 'components/title';
import Ui from 'components/ui';
import Universe from 'components/universe';
@ -36,36 +25,12 @@ const HEIGHT = 900;
const isLoggedIn = true;
const RoutedStage = () => {
const location = useLocation();
const latus = useLatus();
const store = useStore();
return (
<Stage width={320} height={180}>
<LatusContext.Provider value={latus} >
<__RouterContext.Provider value={{location}}>
<Provider store={store}>
<Switch>
<Route path="/login">
<Dumb />
</Route>
<Route path="/universe">
<RoomView />
</Route>
</Switch>
</Provider>
</__RouterContext.Provider>
</LatusContext.Provider>
</Stage>
);
};
const Humus = ({history}) => {
const isNative = useIsNative();
return (
<div className="humus">
<ConnectedRouter history={history}>
<RoutedStage />
<Renderer />
<Ui width={WIDTH} height={HEIGHT}>
<Switch>
<Route path="/login">

View File

@ -4,7 +4,6 @@ import {ActionRegistry, InputNormalizer} from '@avocado/input';
import {setSelfEntity, useSelfEntity} from '@humus/core';
import {useDispatch} from '@latus/redux';
import {useSocket} from '@latus/socket';
import {hot} from 'react-hot-loader';
import React, {useEffect, useRef} from 'react';
import {useParams} from 'react-router';
@ -64,4 +63,4 @@ const Play = () => {
);
};
export default hot(module)(Play);
export default Play;

View File

@ -0,0 +1,49 @@
// TODO should be betta
import 'pixi.js-legacy';
import {LatusContext, useLatus} from '@latus/react/client';
import {Provider, useStore} from '@latus/redux';
import React from 'react';
import {
__RouterContext,
} from 'react-router';
import {
Route,
Switch,
useLocation,
} from 'react-router-dom';
import Stage from 'components/stage';
import Dumb from './dumb';
import RoomView from './room-view';
const Renderer = () => {
const location = useLocation();
const latus = useLatus();
const store = useStore();
return (
<Stage width={320} height={180}>
<LatusContext.Provider value={latus} >
<__RouterContext.Provider value={{location}}>
<Provider store={store}>
<Switch>
<Route path="/login">
<Dumb />
</Route>
<Route path="/universe">
<RoomView />
</Route>
</Switch>
</Provider>
</__RouterContext.Provider>
</LatusContext.Provider>
</Stage>
);
};
export default Renderer;
if (module.hot) {
module.hot.decline();
}

View File

@ -1,6 +1,5 @@
import './index.scss';
import {hot} from 'react-hot-loader';
import React from 'react';
import {
@ -34,4 +33,4 @@ const Title = () => (
</div>
);
export default hot(module)(Title);
export default Title;

View File

@ -2,7 +2,6 @@ import './index.scss';
import {universesByLocalitySelector} from '@humus/universe';
import {useSelector} from '@latus/redux';
import {hot} from 'react-hot-loader';
import PropTypes from 'prop-types';
import React from 'react';
@ -23,4 +22,4 @@ Universes.propTypes = {
isLocal: PropTypes.bool.isRequired,
};
export default hot(module)(Universes);
export default Universes;

View File

@ -1,7 +1,5 @@
import './ui.scss';
import {hot} from 'react-hot-loader';
import PropTypes from 'prop-types';
import React, {useEffect, useRef} from 'react';
@ -56,4 +54,4 @@ Ui.propTypes = {
width: PropTypes.number,
};
export default hot(module)(Ui);
export default Ui;