From 48ca3a4007c8b9c40a3bc3789563ed9992e9b64d Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 3 Sep 2015 13:38:22 -0700
Subject: Adding initial admin console html pages

---
 web/react/pages/admin_console.jsx | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 web/react/pages/admin_console.jsx

(limited to 'web/react/pages/admin_console.jsx')

diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
new file mode 100644
index 000000000..67ed231c5
--- /dev/null
+++ b/web/react/pages/admin_console.jsx
@@ -0,0 +1,8 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+export function setupAdminConsolePage() {
+    console.log('setting up admin page');
+}
+
+global.window.setup_admin_console_page = setupAdminConsolePage;
-- 
cgit v1.2.3-1-g7c22


From e54d0da392119e75788f3d5a431b85e931a7e824 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Fri, 4 Sep 2015 16:56:18 -0700
Subject: Adding unit tests for cmd line

---
 web/react/pages/admin_console.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/pages/admin_console.jsx')

diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 67ed231c5..0e14d3ff8 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 export function setupAdminConsolePage() {
-    console.log('setting up admin page');
+
 }
 
 global.window.setup_admin_console_page = setupAdminConsolePage;
-- 
cgit v1.2.3-1-g7c22


From 8bf35081c80a56051037d0bc374e9fec3fb9529e Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 10 Sep 2015 14:56:37 -0700
Subject: PLT-12 UI framework for admin console

---
 web/react/pages/admin_console.jsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'web/react/pages/admin_console.jsx')

diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 0e14d3ff8..7bffeab08 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -1,8 +1,19 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx');
+var AdminController = require('../components/admin_console/admin_controller.jsx');
+
 export function setupAdminConsolePage() {
+    React.render(
+        <AdminController />,
+        document.getElementById('admin_controller')
+    );
 
+    React.render(
+        <SelectTeamModal />,
+        document.getElementById('select_team_modal')
+    );
 }
 
 global.window.setup_admin_console_page = setupAdminConsolePage;
-- 
cgit v1.2.3-1-g7c22


From 41439eb801c6c8c0a55bcada3eeba3b4a561c663 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 10 Sep 2015 15:44:14 -0700
Subject: Cleaning up html

---
 web/react/pages/admin_console.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'web/react/pages/admin_console.jsx')

diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 7bffeab08..689a6b3a2 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -1,6 +1,7 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+var ErrorBar = require('../components/error_bar.jsx');
 var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx');
 var AdminController = require('../components/admin_console/admin_controller.jsx');
 
@@ -14,6 +15,11 @@ export function setupAdminConsolePage() {
         <SelectTeamModal />,
         document.getElementById('select_team_modal')
     );
+
+    React.render(
+        <ErrorBar/>,
+        document.getElementById('error_bar')
+    );
 }
 
 global.window.setup_admin_console_page = setupAdminConsolePage;
-- 
cgit v1.2.3-1-g7c22

