From 2b278c45e17063be29791676d0bcd6695746b194 Mon Sep 17 00:00:00 2001
From: Ginger Wong <ginger@philo.com>
Date: Thu, 22 Oct 2020 01:03:15 -0700
Subject: [PATCH] adding a nicer layout frame, setting up for pages

---
 web/pages/_app.tsx                         |  2 +
 web/pages/components/connected-clients.tsx |  6 +--
 web/pages/home.tsx                         | 63 ++--------------------
 web/pages/index2.tsx                       |  7 ++-
 web/pages/utils/apis.ts                    |  1 -
 web/styles/globals.scss                    | 13 ++++-
 6 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index 22af59f11..f1a4e0eb9 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -4,6 +4,8 @@
 import 'antd/dist/antd.dark.css';
 import 'antd/dist/antd.compact.css';
 
+import "../styles/globals.scss";
+
 import { AppProps } from 'next/app'
 
 function App({ Component, pageProps }: AppProps) {
diff --git a/web/pages/components/connected-clients.tsx b/web/pages/components/connected-clients.tsx
index 70b913491..5a3e8d29b 100644
--- a/web/pages/components/connected-clients.tsx
+++ b/web/pages/components/connected-clients.tsx
@@ -3,9 +3,6 @@ import { Table } from 'antd';
 
 import { CONNECTED_CLIENTS, fetchData, FETCH_INTERVAL } from '../utils/apis';
 
-export default function HardwareInfo() {
-  const [clients, setClients] = useState({});
-
 /*
 geo data looks like this
   "geo": {
@@ -15,6 +12,8 @@ geo data looks like this
   }
 */
 
+export default function HardwareInfo() {
+  const [clients, setClients] = useState([]);
   const getInfo = async () => {
     try {
       const result = await fetchData(CONNECTED_CLIENTS);
@@ -72,6 +71,7 @@ geo data looks like this
     },
   ];
   
+  console.log({clients})
   return (
     <div>
       <h2>Connected Clients</h2>
diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 97f823a4c..1609d3893 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -1,65 +1,12 @@
-import React, { useState, useEffect } from 'react';
-import { Layout } from 'antd';
+import React from 'react';
 
+import adminStyles from './components/styles.module.css';
 
-import BroadcastInfo from './components/broadcast-info';
-import HardwareInfo from './components/hardware-info';
-import ViewerInfo from './components/viewer-info';
-import ServerConfig from './components/server-config';
-import ConnectedClients from './components/connected-clients';
 
 export default function HomeView(props) {
-  const { broadcastActive, broadcaster, message } = props;
-
-  const { Header, Footer, Content } = Layout;
-
-  const broadcastDetails = broadcastActive ? (
-    <>
-      {/* <BroadcastInfo {...broadcaster} />
-      <HardwareInfo /> */}
-      <ViewerInfo />
-      <ConnectedClients />
-      {/* <ServerConfig /> */}
-    </>
-  ) : null;
-
-  const disconnectButton = broadcastActive ? <button type="button">Boot (Disconnect)</button> : null;
-
   return (
-    <Layout className="layout">
-      <Header>
-        <div className="logo">logo</div>
-        {/* <Menu theme="dark" mode="horizontal" defaultSelectedKeys={['2']}>
-          <Menu.Item key="1">nav 1</Menu.Item>
-          <Menu.Item key="2">nav 2</Menu.Item>
-          <Menu.Item key="3">nav 3</Menu.Item>
-        </Menu> */}
-      </Header>
-      <Content style={{ padding: '0 50px' }}>
-        <div className="site-layout-content">
-          <p>
-            <b>Status: {broadcastActive ? 'on' : 'off'}</b>
-          </p>
-
-          <h2>Utilities</h2>
-          <p>(these dont do anything yet)</p>
-
-          {disconnectButton}
-          <button type="button">Change Stream Key</button>
-          <button type="button">Server Config</button>
-
-          <br />
-          <br />
-
-          {broadcastDetails}
-
-
-        </div>
-      </Content>
-      <Footer style={{ textAlign: 'center' }}><a href="https://owncast.online/">About Owncast</a></Footer>
-    </Layout>
-
-    
-
+    <div>
+     &lt;  pick something
+    </div>        
   );
 }
diff --git a/web/pages/index2.tsx b/web/pages/index2.tsx
index e085ba74e..fdb9060ae 100644
--- a/web/pages/index2.tsx
+++ b/web/pages/index2.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { BROADCASTER, fetchData, FETCH_INTERVAL } from './utils/apis';
-import Main from './home';
+import MainLayout from './components/main-layout';
+import Home from './home';
 
 export default function Admin() {
   const [broadcasterStatus, setBroadcasterStatus] = useState({});
@@ -35,6 +36,8 @@ export default function Admin() {
 
   
   return (
-    <Main {...broadcasterStatus} />
+    <MainLayout {...broadcasterStatus} >
+      <Home />
+    </MainLayout>
   );
 }
diff --git a/web/pages/utils/apis.ts b/web/pages/utils/apis.ts
index 92904db25..898242ddc 100644
--- a/web/pages/utils/apis.ts
+++ b/web/pages/utils/apis.ts
@@ -50,7 +50,6 @@ export async function fetchData(url) {
       const message = `An error has occured: ${response.status}`;
       throw new Error(message);
     }
-
     const json = await response.json();
     return json;
   } catch (error) {
diff --git a/web/styles/globals.scss b/web/styles/globals.scss
index e5e2dcc23..00a0ff23f 100644
--- a/web/styles/globals.scss
+++ b/web/styles/globals.scss
@@ -1,16 +1,25 @@
+$owncast-purple: rgba(90,103,216,1);;
+
 html,
 body {
   padding: 0;
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
-    Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+  font-family: system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
+
+  font-size: 16px;
 }
 
 a {
   color: inherit;
   text-decoration: none;
+  color: rgba(90,103,216,1);
 }
 
 * {
   box-sizing: border-box;
 }
+
+
+.owncast-layout .ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal) .ant-menu-item-selected {
+  background-color: $owncast-purple;
+}