Merge branch 'develop' into save-settings

aszecsei · Apr 20, 2018 · fa63f78 · fa63f78
2 parents 27c33c5 + f0aa4ef
commit fa63f78
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/renderer/components/sidebar.tsx b/app/renderer/components/sidebar.tsx
@@ -10,6 +10,7 @@ interface ISidebarProps {
   curChanID: Guid | undefined
   onChannelClick: (conn: Connection, channel: Channel) => void
   onAddServerClick: () => void
+  onSettingsClick: () => void
 }
 
 export const Sidebar: React.SFC<ISidebarProps> = props => {
@@ -39,6 +40,11 @@ export const Sidebar: React.SFC<ISidebarProps> = props => {
         <li>
           <a href="#">About</a>
         </li>
+        <li>
+          <a href="#" onClick={props.onSettingsClick}>
+            Settings
+          </a>
+        </li>
       </ul>
     </nav>
   )

diff --git a/app/renderer/containers/sidebar-container.ts b/app/renderer/containers/sidebar-container.ts
@@ -1,7 +1,11 @@
 import { connect, Dispatch } from 'react-redux'
 import { Sidebar } from '../components/sidebar'
 import { ElectricState } from '../store'
-import { viewChannel, toggleAddServerModal } from '../actions'
+import {
+  viewChannel,
+  toggleAddServerModal,
+  toggleSettingsModal
+} from '../actions'
 import { Connection } from '../models/connections'
 import { Channel } from '../models/channel'
 
@@ -19,6 +23,9 @@ const mapDispatchToProps = (dispatch: Dispatch<ElectricState>) => {
     },
     onAddServerClick: () => {
       dispatch(toggleAddServerModal(true))
+    },
+    onSettingsClick: () => {
+      dispatch(toggleSettingsModal(true))
     }
   }
 }