From 956816c4c7514bad4be17fa0349a7b9a3d850ca5 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Thu, 7 Jan 2016 18:38:13 +0000
Subject: [PATCH] Remove need for react bootstrap in navbar

---
 .../navbar/{dropdown-item.js => item.js}      |  2 +-
 static/src/js/components/navbar/navbar.js     | 34 +++++++------------
 2 files changed, 13 insertions(+), 23 deletions(-)
 rename static/src/js/components/navbar/{dropdown-item.js => item.js} (75%)

diff --git a/static/src/js/components/navbar/dropdown-item.js b/static/src/js/components/navbar/item.js
similarity index 75%
rename from static/src/js/components/navbar/dropdown-item.js
rename to static/src/js/components/navbar/item.js
index 12048a9..bdaa72a 100644
--- a/static/src/js/components/navbar/dropdown-item.js
+++ b/static/src/js/components/navbar/item.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-export default class DropdownItem extends React.Component {
+export default class Item extends React.Component {
   render() {
     return (
       <li><a href={this.props.href}><i className={'icon ' + this.props.icon}></i> {this.props.children}</a></li>
diff --git a/static/src/js/components/navbar/navbar.js b/static/src/js/components/navbar/navbar.js
index 726f89f..962c8ae 100644
--- a/static/src/js/components/navbar/navbar.js
+++ b/static/src/js/components/navbar/navbar.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import Header from './header';
 import Dropdown from './dropdown';
-import DropdownItem from './dropdown-item';
-var NavItem = require('react-bootstrap').NavItem;
+import Item from './item';
 
 export default class NavBar extends React.Component {
   render() {
@@ -19,27 +18,18 @@ export default class NavBar extends React.Component {
                 </ul>
                 <ul className="nav navbar-nav" id="navigation">
                   <Dropdown title="Projects">
-                    <DropdownItem href="#" icon="ion-social-freebsd-devil">Pithos</DropdownItem>
-                    <DropdownItem href="#" icon="ion-ios-monitor">BSOD Enabler</DropdownItem>
-                    <DropdownItem href="#" icon="ion-chatbox-working">Hipchat Emoticons for All</DropdownItem>
-                    <DropdownItem href="#" icon="ion-social-windows">Custom PC</DropdownItem>
-                    <DropdownItem href="#" icon="ion-android-more-vertical">More Projects...</DropdownItem>
+                    <Item href="#" icon="ion-social-freebsd-devil">Pithos</Item>
+                    <Item href="#" icon="ion-ios-monitor">BSOD Enabler</Item>
+                    <Item href="#" icon="ion-chatbox-working">Hipchat Emoticons for All</Item>
+                    <Item href="#" icon="ion-social-windows">Custom PC</Item>
+                    <Item href="#" icon="ion-android-more-vertical">All Projects...</Item>
                   </Dropdown>
-                  <li className="dropdown">
-                    <a className="dropdown-toggle"
-                      data-toggle="dropdown"
-                      role="button"
-                      aria-haspopup="true"
-                      aria-expanded="false">
-                      Code <i className="icon ion-ios-arrow-up navbar-icon h4"></i>
-                    </a>
-                    <ul className="dropdown-menu dropup">
-                      <li><a href="#"><i className="icon ion-code-working"></i> Code Challenges</a></li>
-                      <li><a href=""><i className="icon ion-ios-circle-filled"></i> Morse Code Decoder</a></li>
-                      <li><a href=""><i className="icon ion-ios-game-controller-a"></i> The Wiki Game Solver</a></li>
-                    </ul>
-                  </li>
-                  <NavItem href="#">Link 1</NavItem>
+                  <Dropdown title="Code">
+                    <Item href="#" icon="ion-code-working">Code Challenges</Item>
+                    <Item href="#" icon="ion-ios-circle-filled">BSOD Enabler</Item>
+                    <Item href="#" icon="ion-ios-game-controller-a">The Wiki Game Solver</Item>
+                  </Dropdown>
+                  <Item href="#">Link 1</Item>
                 </ul>
               </div>
             </div>