Made logo show up, and fixed notification loading problems onprem

frontend/src/App.jsx

@@ -8,8 +8,8 @@ import Workflows from "./views/Workflows";
 import GettingStarted from "./views/GettingStarted";
 import AngularWorkflow from "./views/AngularWorkflow.jsx";
 
-//import Header from "./components/NewHeader.jsx";
-import Header from "./components/Header.jsx";
+import Header from "./components/NewHeader.jsx";
+//import Header from "./components/Header.jsx";
 import theme from "./theme";
 import Apps from "./views/Apps";
 import AppCreator from "./views/AppCreator";
@@ -240,6 +240,7 @@ const App = (message, props) => {
         	      setCookie={setCookie}
         	      cookies={cookies}
         	      checkLogin={checkLogin}
+				  notifications={notifications}
         	      {...props}
         	    />
         	  }

frontend/src/components/NewHeader.jsx

@@ -235,7 +235,7 @@ const Header = (props) => {
     setLoginHoverColor(hoverOutColor);
   };
 
-	const notificationWidth = 300
+	const notificationWidth = 335
 	const imagesize = 22;
   	const boxColor = "#86c142";
 
@@ -398,7 +398,8 @@ const Header = (props) => {
               <Button
                 color="primary"
                 variant="contained"
-                style={{ marginLeft: 30 }}
+				disabled={notifications.filter((data) => !data.read).length === 0}
+                style={{ marginLeft: 30, }}
                 onClick={() => {
                   clearNotifications();
                 }}
@@ -629,7 +630,7 @@ const Header = (props) => {
   };
   
   // Handle top bar or something
-  const defaultTop = isCloud ? 0 : 7;
+  const defaultTop = -2
   const loginTextBrowser = !isLoggedIn ? (
     <div
       style={{
@@ -662,7 +663,7 @@ const Header = (props) => {
                 <img
                   src={"/images/logos/topleft_logo.svg"}
                   alt="shuffle logo"
-                  style={{ height: 25, marginTop: 5, }}
+                  style={{ height: 25, }}
                 />
               </Grid>
             </Link>