Skip to content

Commit ae7edcc

Browse files
committed
3.0.1-rc-1
1 parent 84e225f commit ae7edcc

File tree

4 files changed

+39
-30
lines changed

4 files changed

+39
-30
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "misrcon",
33
"productName": "MisRCON",
4-
"version": "3.0.1-dev-16",
4+
"version": "3.0.1-rc-1",
55
"description": "RCON Tool and Map for Miscreated game.",
66
"main": "src/index.ts",
77
"scripts": {

src/components/ListItemLink.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ interface Props {
88
primary: string;
99
// Link to
1010
to: string;
11+
// is it clickable
12+
disabled?: boolean;
1113
// What the current path is
1214
currentPath: string;
1315
}
1416
const ListItemLink: React.FunctionComponent<Props> = ({
17+
disabled = false,
1518
primary,
1619
to,
1720
currentPath
@@ -22,7 +25,12 @@ const ListItemLink: React.FunctionComponent<Props> = ({
2225

2326
return (
2427
// @ts-ignore
25-
<ListItem selected={currentPath === to} button component={renderLink}>
28+
<ListItem
29+
disabled={disabled}
30+
selected={currentPath === to}
31+
button
32+
component={renderLink}
33+
>
2634
<ListItemText primary={primary} />
2735
</ListItem>
2836
);

src/containers/NavigationBar.tsx

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -90,33 +90,34 @@ const NavigationBar: React.FunctionComponent<Props> = ({ location }) => {
9090
to={'/help'}
9191
primary={'# Help'}
9292
/>
93-
{activeServer.selfHosted ? (
94-
<ListItemLink
95-
currentPath={location.pathname}
96-
to={'/hosting'}
97-
primary={'# Hosting'}
98-
/>
99-
) : (
100-
''
101-
)}
102-
{activeServer.selfHosted ? (
103-
<ListItemLink
104-
currentPath={location.pathname}
105-
to={'/logs'}
106-
primary={'# Logs'}
107-
/>
108-
) : (
109-
''
110-
)}
111-
{activeServer.selfHosted ? (
112-
<ListItemLink
113-
currentPath={location.pathname}
114-
to={'/chat'}
115-
primary={'# Chat'}
116-
/>
117-
) : (
118-
''
119-
)}
93+
{/*TODO: Enable these when they work */}
94+
{/*{activeServer.selfHosted ? (*/}
95+
{/* <ListItemLink*/}
96+
{/* currentPath={location.pathname}*/}
97+
{/* to={'/hosting'}*/}
98+
{/* primary={'# Hosting'}*/}
99+
{/* />*/}
100+
{/*) : (*/}
101+
{/* ''*/}
102+
{/*)}*/}
103+
{/*{activeServer.selfHosted ? (*/}
104+
{/* <ListItemLink*/}
105+
{/* currentPath={location.pathname}*/}
106+
{/* to={'/logs'}*/}
107+
{/* primary={'# Logs'}*/}
108+
{/* />*/}
109+
{/*) : (*/}
110+
{/* ''*/}
111+
{/*)}*/}
112+
{/*{activeServer.selfHosted ? (*/}
113+
{/* <ListItemLink*/}
114+
{/* currentPath={location.pathname}*/}
115+
{/* to={'/chat'}*/}
116+
{/* primary={'# Chat'}*/}
117+
{/* />*/}
118+
{/*) : (*/}
119+
{/* ''*/}
120+
{/*)}*/}
120121
</List>
121122
</Wrapper>
122123
);

src/redux/app/selectors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const terminalThemeSelector = createSelector(
6464

6565
export const updateNeededSelector = createSelector(
6666
appStateSelector,
67-
app => app.remoteVersion !== app.localVersion
67+
app => app.remoteVersion === app.localVersion
6868
);
6969

7070
export const firstRunSelector = createSelector(

0 commit comments

Comments
 (0)