From 4d21e7b4e9fd76400d5db1f4ab96a622dd689c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Mon, 1 Apr 2019 10:21:14 +0200
Subject: [PATCH] Put theme into config

---
 app/public/config.example.js                  | 37 ++++++++++++++++++-
 app/src/components/Controls/Sidebar.js        |  8 ++--
 .../MeetingDrawer/Chat/MessageList.js         |  2 +-
 app/src/index.js                              | 14 +------
 4 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/app/public/config.example.js b/app/public/config.example.js
index 4e322ed..8f41474 100644
--- a/app/public/config.example.js
+++ b/app/public/config.example.js
@@ -16,5 +16,40 @@ var config =
 	{
 		tcp : true
 	},
-	lastN : 4
+	lastN : 4,
+	theme :
+	{
+		palette :
+		{
+			primary :
+			{
+				main : '#313131'
+			}
+		},
+		overrides :
+		{
+			MuiAppBar :
+			{
+				colorPrimary :
+				{
+					backgroundColor : '#313131'
+				}
+			},
+			MuiFab :
+			{
+				primary :
+				{
+					backgroundColor : '#5F9B2D',
+					'&:hover'       :
+					{
+						backgroundColor : '#518029'
+					}
+				}
+			}
+		},
+		typography :
+		{
+			useNextVariants : true
+		}
+	}
 };
diff --git a/app/src/components/Controls/Sidebar.js b/app/src/components/Controls/Sidebar.js
index b696de8..c2bbbe7 100644
--- a/app/src/components/Controls/Sidebar.js
+++ b/app/src/components/Controls/Sidebar.js
@@ -44,7 +44,7 @@ const styles = (theme) =>
 		{
 			opacity    : 0,
 			transition : 'opacity .5s'
-		},
+		}
 	});
 
 class Sidebar extends React.PureComponent
@@ -89,7 +89,7 @@ class Sidebar extends React.PureComponent
 					aria-label='Share screen'
 					className={classes.fab}
 					disabled={!me.canShareScreen || me.screenShareInProgress}
-					color={screenState === 'on' ? 'secondary' : 'default'}
+					color={screenState === 'on' ? 'primary' : 'default'}
 					
 					onClick={() =>
 					{
@@ -134,7 +134,7 @@ class Sidebar extends React.PureComponent
 				<Fab
 					aria-label='Room lock'
 					className={classes.fab}
-					color={locked ? 'secondary' : 'default'}
+					color={locked ? 'primary' : 'default'}
 					onClick={() =>
 					{
 						if (locked)
@@ -158,7 +158,7 @@ class Sidebar extends React.PureComponent
 					aria-label='Raise hand'
 					className={classes.fab}
 					disabled={me.raiseHandInProgress}
-					color={me.raiseHand ? 'secondary' : 'default'}
+					color={me.raiseHand ? 'primary' : 'default'}
 					onClick={() => roomClient.sendRaiseHandState(!me.raiseHand)}
 				>
 					<Avatar alt='Hand' src={me.raiseHand ? HandOn : HandOff} />
diff --git a/app/src/components/MeetingDrawer/Chat/MessageList.js b/app/src/components/MeetingDrawer/Chat/MessageList.js
index ad711b2..9aec4ba 100644
--- a/app/src/components/MeetingDrawer/Chat/MessageList.js
+++ b/app/src/components/MeetingDrawer/Chat/MessageList.js
@@ -18,7 +18,7 @@ const styles = (theme) =>
 		}
 	});
 
-class MessageList extends React.PureComponent
+class MessageList extends React.Component
 {
 	componentDidMount()
 	{
diff --git a/app/src/index.js b/app/src/index.js
index 96f57a6..d6fcdcf 100644
--- a/app/src/index.js
+++ b/app/src/index.js
@@ -32,19 +32,7 @@ let roomClient;
 
 RoomClient.init({ store });
 
-const theme = createMuiTheme({
-	palette :
-	{
-		primary :
-		{
-			main : '#313131'
-		}
-	},
-	typography :
-	{
-		useNextVariants : true
-	}
-});
+const theme = createMuiTheme(window.config.theme);
 
 domready(() =>
 {