From 810a05203f42d5099bf80f4efd888f18e30eefdc Mon Sep 17 00:00:00 2001
From: michael-grace <michael.dp.grace@outlook.com>
Date: Wed, 22 Apr 2020 22:33:41 +0100
Subject: [PATCH] move mic meter

---
 src/App.css               | 13 +++++++++++++
 src/navbar/index.tsx      | 10 ----------
 src/navbar/navbar.scss    |  4 ----
 src/showplanner/index.tsx |  9 +++++++++
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/App.css b/src/App.css
index f659e04..1109cde 100644
--- a/src/App.css
+++ b/src/App.css
@@ -94,38 +94,46 @@ button {
   z-index: 5;
   /* padding: 1px; */
 }
+
 .waveform .current,
 .waveform .remaining,
 .waveform .length {
   font-weight: 800;
 }
+
 .waveform .remaining,
 .waveform .outro {
   right: 0;
   position: absolute;
 }
+
 .waveform .intro,
 .waveform .outro,
 .waveform .length {
   bottom: 0;
   position: absolute;
 }
+
 .waveform .length {
   text-align: center;
   width: 100%;
 }
+
 .waveform {
   height: 6vh;
 }
+
 .waveform .graph {
   position: absolute;
   height: 6vh;
   width: 100%;
   overflow: hidden;
 }
+
 .waveform .graph wave {
   height: 6vh !important;
 }
+
 .waveform .loading {
   background: #ccccff;
 }
@@ -135,6 +143,7 @@ button {
 }
 
 /* Flash class and keyframe animation */
+
 .sp-ending-soon {
   -webkit-animation: green-flash steps(1) 0.5s infinite;
   animation: green-flash steps(1) 0.5s infinite;
@@ -154,3 +163,7 @@ button {
   pointer-events: none;
   box-shadow: inset 0 0 3px 6px red;
 }
+
+#micMeter {
+  margin: 0.4rem 0 0 0.6rem;
+}
diff --git a/src/navbar/index.tsx b/src/navbar/index.tsx
index d3748a2..feb8c5b 100644
--- a/src/navbar/index.tsx
+++ b/src/navbar/index.tsx
@@ -1,7 +1,6 @@
 import React, { useRef, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import Clock from "react-live-clock";
-import { VUMeter } from "../optionsMenu/helpers/VUMeter";
 
 import { FaRegClock, FaRegUser } from "react-icons/fa";
 
@@ -69,15 +68,6 @@ export function NavBar() {
             />
           </div>
         </div>
-
-        <div className="nav-item" id="navMeter">
-          <VUMeter
-            width={400}
-            height={40}
-            range={[-70, 0]}
-            greenRange={[-14, -3]}
-          />
-        </div>
       </div>
 
       <ul className="nav navbar-nav navbar-right">
diff --git a/src/navbar/navbar.scss b/src/navbar/navbar.scss
index 36c4434..b21e6cd 100644
--- a/src/navbar/navbar.scss
+++ b/src/navbar/navbar.scss
@@ -251,7 +251,3 @@
   font-weight: bold;
   font-size: 1.1em;
 }
-
-#navMeter {
-  margin: 0.4rem 0 0 1rem;
-}
diff --git a/src/showplanner/index.tsx b/src/showplanner/index.tsx
index d066a87..3be6c23 100644
--- a/src/showplanner/index.tsx
+++ b/src/showplanner/index.tsx
@@ -2,6 +2,7 @@ import React, { useState, useReducer, useEffect } from "react";
 import { ContextMenu, MenuItem } from "react-contextmenu";
 import { useBeforeunload } from "react-beforeunload";
 import { FaAlignJustify, FaBookOpen, FaMicrophone } from "react-icons/fa";
+import { VUMeter } from "../optionsMenu/helpers/VUMeter";
 
 import { TimeslotItem } from "../api";
 import appLogo from "../assets/images/webstudio.svg";
@@ -145,6 +146,14 @@ function MicControl() {
           The microphone has not been setup. Go to options.
         </p>
       )}
+      <div id="micMeter">
+        <VUMeter
+          width={400}
+          height={40}
+          range={[-70, 0]}
+          greenRange={[-14, -3]}
+        />
+      </div>
       <div className={`mixer-buttons ${!state.open && "disabled"}`}>
         <div
           className="mixer-buttons-backdrop"