Skip to content

Commit

Permalink
Quick tips button in the vertical menu.
Browse files Browse the repository at this point in the history
  • Loading branch information
smelamud committed Jan 11, 2021
1 parent b1f5b37 commit 3c1e487
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 8 deletions.
13 changes: 5 additions & 8 deletions src/ui/mainmenu/connectionstatus/ConnectionStatus.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';
import { connect } from 'react-redux';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

import { Browser } from "ui/browser";
import { Button, Loading } from "ui/control";
import HomeButton from "ui/mainmenu/connectionstatus/HomeButton";
import QuickTipsButton from "ui/quicktips/QuickTipsButton";
import NewPostButton from "ui/mainmenu/connectionstatus/NewPostButton";
import NewsButton from "ui/mainmenu/connectionstatus/NewsButton";
import InstantButton from "ui/instant/InstantButton";
Expand All @@ -13,15 +13,12 @@ import ConnectionsButton from "ui/mainmenu/connections/ConnectionsButton";
import DisconnectButton from "ui/mainmenu/connectionstatus/DisconnectButton";
import ConnectDialog from "ui/connectdialog/ConnectDialog";
import { openConnectDialog } from "state/connectdialog/actions";
import { openQuickTips } from "state/quicktips/actions";
import { openSignUpDialog } from "state/signupdialog/actions";
import { isConnectedToHome } from "state/home/selectors";
import { isAtNode } from "state/node/selectors";
import "./ConnectionStatus.css";

const ConnectionButtons = ({
atNode, connecting, connected, showNavigator, openConnectDialog, openQuickTips, openSignUpDialog
}) => {
const ConnectionButtons = ({atNode, connecting, connected, showNavigator, openConnectDialog, openSignUpDialog}) => {
if (showNavigator && Browser.isTinyScreen()) {
return null;
}
Expand All @@ -42,8 +39,8 @@ const ConnectionButtons = ({
}
return (
<>
<span className="connection-button d-none d-lg-inline" title="Help" onClick={() => openQuickTips()}>
<FontAwesomeIcon icon="question-circle"/>
<span className="d-none d-lg-inline">
<QuickTipsButton/>
</span>
<span className="d-none d-lg-inline">
<NewPostButton/>
Expand Down Expand Up @@ -76,5 +73,5 @@ export default connect(
connected: isConnectedToHome(state),
showNavigator: state.owner.showNavigator
}),
{ openConnectDialog, openQuickTips, openSignUpDialog }
{ openConnectDialog, openSignUpDialog }
)(ConnectionStatus);
4 changes: 4 additions & 0 deletions src/ui/mainmenu/vertical/VerticalMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
border: solid var(--status-icon) 1px;
}

#vertical-menu .navbar-nav {
line-height: 1.1;
}

#vertical-menu BUTTON {
display: inline;
margin-left: 1rem;
Expand Down
4 changes: 4 additions & 0 deletions src/ui/mainmenu/vertical/VerticalMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import SettingsButton from "ui/mainmenu/connectionstatus/SettingsButton";
import HomeButton from "ui/mainmenu/connectionstatus/HomeButton";
import DisconnectButton from "ui/mainmenu/connectionstatus/DisconnectButton";
import HomeName from "ui/mainmenu/connections/HomeName";
import QuickTipsButton from "ui/quicktips/QuickTipsButton";
import "./VerticalMenu.css";

const VerticalMenu = ({atNode, connected, openConnectDialog, openSignUpDialog}) => (
Expand All @@ -34,6 +35,9 @@ const VerticalMenu = ({atNode, connected, openConnectDialog, openSignUpDialog})
<DisconnectButton/>
<br/>
<HomeName/>
<div className="text-right">
<QuickTipsButton/>
</div>
</>
}
</div>
Expand Down
16 changes: 16 additions & 0 deletions src/ui/quicktips/QuickTipsButton.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
import { connect } from 'react-redux';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

import { openQuickTips } from "state/quicktips/actions";

const QuickTipsButton = ({openQuickTips}) => (
<span className="connection-button" title="Help" onClick={() => openQuickTips()}>
<FontAwesomeIcon icon="question-circle"/>
</span>
);

export default connect(
null,
{ openQuickTips }
)(QuickTipsButton);

0 comments on commit 3c1e487

Please sign in to comment.