Browse Source

Fixed compilation warnings and errors

update-deps
Alex Mikhalev 7 years ago
parent
commit
efe7f745fc
  1. 18
      app/components/NavBar.tsx
  2. 2
      app/state/AppState.ts
  3. 2
      app/state/TokenStore.ts

18
app/components/NavBar.tsx

@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
import * as History from "history";
import * as React from "react";
import { Link } from "react-router-dom";
import { Menu } from "semantic-ui-react";
import { AppState, injectState } from "@app/state";
import { AppState, ConsumeState, injectState } from "@app/state";
import { observer } from "mobx-react";
interface NavItemProps {
to: string;
children: React.ReactNode;
location: History.Location;
}
@observer
function NavItem({ to, children, location }: NavItemProps) {
return <Menu.Item as={Link} to={to} active={location.pathname.startsWith(to)}>{children}</Menu.Item>;
}
const NavItem = observer(({ to, children }: NavItemProps) => {
function consumeState(appState: AppState) {
const { location } = appState.routerStore;
return (
<Menu.Item as={Link} to={to} active={location.pathname.startsWith(to)}>{children}</Menu.Item>
);
}
return (<ConsumeState>{consumeState}</ConsumeState>);
});
function NavBar({ appState }: { appState: AppState }) {
let loginMenu;

2
app/state/AppState.ts

@ -2,8 +2,8 @@ import { WebSocketRpcClient } from "@app/sprinklersRpc/websocketClient"; @@ -2,8 +2,8 @@ import { WebSocketRpcClient } from "@app/sprinklersRpc/websocketClient";
import HttpApi from "@app/state/HttpApi";
import { UiStore } from "@app/state/UiStore";
import { createBrowserHistory, History } from "history";
import { RouterStore, syncHistoryWithStore } from "mobx-react-router";
import { computed } from "mobx";
import { RouterStore, syncHistoryWithStore } from "mobx-react-router";
const isDev = process.env.NODE_ENV === "development";
const websocketPort = isDev ? 8080 : location.port;

2
app/state/TokenStore.ts

@ -61,7 +61,7 @@ export class TokenStore { @@ -61,7 +61,7 @@ export class TokenStore {
}
toJSON() {
return { accessToken: this.accessToken.toJSON(), refreshToken: this.refreshToken.toJSON() }
return { accessToken: this.accessToken.toJSON(), refreshToken: this.refreshToken.toJSON() };
}
updateFromJson(json: any) {

Loading…
Cancel
Save