From ae7edcc8ccf36d1746e2e2caa1acfece9026a572 Mon Sep 17 00:00:00 2001 From: Chris Sprance Date: Sat, 24 Aug 2019 18:54:04 -0400 Subject: [PATCH] 3.0.1-rc-1 --- package.json | 2 +- src/components/ListItemLink.tsx | 10 +++++- src/containers/NavigationBar.tsx | 55 ++++++++++++++++---------------- src/redux/app/selectors.ts | 2 +- 4 files changed, 39 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index bcb4a9df..9fe91817 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misrcon", "productName": "MisRCON", - "version": "3.0.1-dev-16", + "version": "3.0.1-rc-1", "description": "RCON Tool and Map for Miscreated game.", "main": "src/index.ts", "scripts": { diff --git a/src/components/ListItemLink.tsx b/src/components/ListItemLink.tsx index 75d44ac7..4e28f778 100755 --- a/src/components/ListItemLink.tsx +++ b/src/components/ListItemLink.tsx @@ -8,10 +8,13 @@ interface Props { primary: string; // Link to to: string; + // is it clickable + disabled?: boolean; // What the current path is currentPath: string; } const ListItemLink: React.FunctionComponent = ({ + disabled = false, primary, to, currentPath @@ -22,7 +25,12 @@ const ListItemLink: React.FunctionComponent = ({ return ( // @ts-ignore - + ); diff --git a/src/containers/NavigationBar.tsx b/src/containers/NavigationBar.tsx index 4dd9f36b..6d933247 100755 --- a/src/containers/NavigationBar.tsx +++ b/src/containers/NavigationBar.tsx @@ -90,33 +90,34 @@ const NavigationBar: React.FunctionComponent = ({ location }) => { to={'/help'} primary={'# Help'} /> - {activeServer.selfHosted ? ( - - ) : ( - '' - )} - {activeServer.selfHosted ? ( - - ) : ( - '' - )} - {activeServer.selfHosted ? ( - - ) : ( - '' - )} + {/*TODO: Enable these when they work */} + {/*{activeServer.selfHosted ? (*/} + {/* */} + {/*) : (*/} + {/* ''*/} + {/*)}*/} + {/*{activeServer.selfHosted ? (*/} + {/* */} + {/*) : (*/} + {/* ''*/} + {/*)}*/} + {/*{activeServer.selfHosted ? (*/} + {/* */} + {/*) : (*/} + {/* ''*/} + {/*)}*/} ); diff --git a/src/redux/app/selectors.ts b/src/redux/app/selectors.ts index 1e6e7b39..8019001a 100755 --- a/src/redux/app/selectors.ts +++ b/src/redux/app/selectors.ts @@ -64,7 +64,7 @@ export const terminalThemeSelector = createSelector( export const updateNeededSelector = createSelector( appStateSelector, - app => app.remoteVersion !== app.localVersion + app => app.remoteVersion === app.localVersion ); export const firstRunSelector = createSelector(