4 files changed, 39 insertions, 17 deletions
diff --git a/src/components/sidebars/topology/TopologySidebarComponent.js b/src/components/sidebars/topology/TopologySidebarComponent.js
index 932d2ecf..dc4dc231 100644
--- a/src/components/sidebars/topology/TopologySidebarComponent.js
+++ b/src/components/sidebars/topology/TopologySidebarComponent.js
@@ -1,24 +1,24 @@
 import React from "react";
-import BuildingSidebarContent from "../../../containers/sidebars/topology/building/BuildingSidebarContent";
+import BuildingSidebarContainer from "../../../containers/sidebars/topology/building/BuildingSidebarContainer";
+import RoomSidebarContainer from "../../../containers/sidebars/topology/room/RoomSidebarContainer";
 import Sidebar from "../Sidebar";
 
 const TopologySidebarComponent = ({interactionLevel}) => {
-    let sidebarHeading;
     let sidebarContent;
 
     switch (interactionLevel.mode) {
         case "BUILDING":
-            sidebarHeading = "Building";
-            sidebarContent = <BuildingSidebarContent/>;
+            sidebarContent = <BuildingSidebarContainer/>;
+            break;
+        case "ROOM":
+            sidebarContent = <RoomSidebarContainer/>;
             break;
         default:
-            sidebarHeading = "Error";
             sidebarContent = "Missing Content";
     }
 
     return (
         <Sidebar isRight={true}>
-            <h3>{sidebarHeading}</h3>
             {sidebarContent}
         </Sidebar>
     );
diff --git a/src/components/sidebars/topology/building/BuildingSidebarContentComponent.js b/src/components/sidebars/topology/building/BuildingSidebarComponent.js
index b88b23b7..002184ae 100644
--- a/src/components/sidebars/topology/building/BuildingSidebarContentComponent.js
+++ b/src/components/sidebars/topology/building/BuildingSidebarComponent.js
@@ -3,18 +3,19 @@ import CancelNewRoomConstructionButton from "../../../../containers/sidebars/top
 import FinishNewRoomConstructionButton from "../../../../containers/sidebars/topology/building/FinishNewRoomConstructionButton";
 import StartNewRoomConstructionButton from "../../../../containers/sidebars/topology/building/StartNewRoomConstructionButton";
 
-const BuildingSidebarContentComponent = ({currentRoomInConstruction}) => {
-    if (currentRoomInConstruction !== -1) {
-        return (
-            <div>
-                <FinishNewRoomConstructionButton/>
-                <CancelNewRoomConstructionButton/>
-            </div>
-        );
-    }
+const BuildingSidebarComponent = ({currentRoomInConstruction}) => {
     return (
-        <StartNewRoomConstructionButton/>
+        <div>
+            <h2>Building</h2>
+            {currentRoomInConstruction === -1 ?
+                <StartNewRoomConstructionButton/> :
+                <div>
+                    <FinishNewRoomConstructionButton/>
+                    <CancelNewRoomConstructionButton/>
+                </div>
+            }
+        </div>
     );
 };
 
-export default BuildingSidebarContentComponent;
+export default BuildingSidebarComponent;
diff --git a/src/components/sidebars/topology/room/RoomNameComponent.js b/src/components/sidebars/topology/room/RoomNameComponent.js
new file mode 100644
index 00000000..4a8de76d
--- /dev/null
+++ b/src/components/sidebars/topology/room/RoomNameComponent.js
@@ -0,0 +1,13 @@
+import React from "react";
+import FontAwesome from "react-fontawesome";
+
+const RoomNameComponent = ({roomName, onEdit}) => (
+    <h2>
+        {roomName}
+        <button className="btn btn-outline-secondary float-right" onClick={onEdit}>
+            <FontAwesome name="pencil"/>
+        </button>
+    </h2>
+);
+
+export default RoomNameComponent;
diff --git a/src/components/sidebars/topology/room/RoomSidebarComponent.js b/src/components/sidebars/topology/room/RoomSidebarComponent.js
new file mode 100644
index 00000000..5ee9821a
--- /dev/null
+++ b/src/components/sidebars/topology/room/RoomSidebarComponent.js
@@ -0,0 +1,8 @@
+import React from "react";
+import RoomNameContainer from "../../../../containers/sidebars/topology/room/RoomNameContainer";
+
+const RoomSidebarComponent = ({roomType}) => {
+    return <RoomNameContainer/>
+};
+
+export default RoomSidebarComponent;