update TG to fix app

This commit is contained in:
Luke Berndt
2023-11-13 09:17:06 -05:00
parent b792843be7
commit 48414672d3
4 changed files with 9 additions and 6 deletions

View File

@@ -44,7 +44,7 @@ const ConfirmEmail = (props) => {
<Message.Content> <Message.Content>
<Message.Header>Success</Message.Header> <Message.Header>Success</Message.Header>
<p>You have successfully confirmed you email address.</p> <p>You have successfully confirmed you email address.</p>
<Link to="/login"> <Link to="/login?nextLocation=admin">
<Button <Button
size="large" size="large"
content="Continue to Login" content="Continue to Login"

View File

@@ -48,9 +48,12 @@ const Login = (props) => {
window.location = process.env.REACT_APP_FRONTEND_SERVER; window.location = process.env.REACT_APP_FRONTEND_SERVER;
break; break;
default: default:
case "admin": case "admin":
window.location = process.env.REACT_APP_ADMIN_SERVER; window.location = process.env.REACT_APP_ADMIN_SERVER;
break; break;
case "account":
navigate("/");
break;
} }
} else { } else {
navigate("/"); navigate("/");

View File

@@ -10,7 +10,7 @@ exports.get_talkgroups = async function (req, res) {
var talkgroups = {}; var talkgroups = {};
for (var tg in tg_results) { for (var tg in tg_results) {
var talkgroup = {num: tg_results[tg].num, alpha: tg_results[tg].alpha, description: tg_results[tg].description} var talkgroup = {_id: tg_results[tg]._id, num: tg_results[tg].num, alpha: tg_results[tg].alpha, description: tg_results[tg].description}
talkgroups[tg_results[tg].num] = talkgroup; talkgroups[tg_results[tg].num] = talkgroup;
} }
res.contentType('json'); res.contentType('json');

View File

@@ -284,8 +284,8 @@ const Main = (props) => {
</Grid.Column> </Grid.Column>
</Grid.Row> </Grid.Row>
</Grid> </Grid>
</Segment> </Segment>
<Segment style={{ padding: '0em' }} vertical> <Segment style={{ padding: '0em' }} vertical>
<Grid celled='internally' columns='equal' stackable> <Grid celled='internally' columns='equal' stackable>
<Grid.Row textAlign='center'> <Grid.Row textAlign='center'>