diff --git a/.gitignore b/.gitignore index 252868b..122f774 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules/ /app/build/ /app/public/config.js +/app/public/images/logo.* /server/config/ !/server/config/config.example.js /server/public/ diff --git a/app/public/chooseRoom.html b/app/public/chooseRoom.html index 8012d34..ee10a2b 100644 --- a/app/public/chooseRoom.html +++ b/app/public/chooseRoom.html @@ -15,7 +15,7 @@ top: 40%; width: 90%; transform: translate(-50%, 0%); - background-image: url('/images/background.svg'); + background-image: url('/images/background.jpg'); background-attachment: fixed; background-position: center; background-size: cover; diff --git a/app/public/config.example.js b/app/public/config.example.js index 8f41474..08621eb 100644 --- a/app/public/config.example.js +++ b/app/public/config.example.js @@ -1,8 +1,9 @@ +// eslint-disable-next-line var config = { loginEnabled : false, developmentPort : 3443, - turnServers : [ + turnServers : [ { urls : [ 'turn:turn.example.com:443?transport=tcp' @@ -16,8 +17,11 @@ var config = { tcp : true }, - lastN : 4, - theme : + lastN : 4, + background : 'images/background.jpg', + // Add file and uncomment for adding logo to appbar + // logo : 'images/logo.svg', + theme : { palette : { diff --git a/app/public/images/background.jpg b/app/public/images/background.jpg new file mode 100644 index 0000000..fd3831d Binary files /dev/null and b/app/public/images/background.jpg differ diff --git a/app/public/images/background.svg b/app/public/images/background.svg deleted file mode 100644 index e5006e9..0000000 --- a/app/public/images/background.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/components/Room.js b/app/src/components/Room.js index 7f6de46..0c3604d 100644 --- a/app/src/components/Room.js +++ b/app/src/components/Room.js @@ -42,9 +42,15 @@ const styles = (theme) => ({ root : { - display : 'flex', - width : '100%', - height : '100%' + display : 'flex', + width : '100%', + height : '100%', + backgroundColor : 'var(--background-color)', + backgroundImage : `url(${window.config.background})`, + backgroundAttachment : 'fixed', + backgroundPosition : 'center', + backgroundSize : 'cover', + backgroundRepeat : 'no-repeat' }, message : { @@ -60,6 +66,10 @@ const styles = (theme) => margin : 0, padding : 0 }, + logo : + { + marginLeft : 20 + }, show : { opacity : 1, @@ -288,6 +298,10 @@ class Room extends React.PureComponent + { window.config.logo ? + Logo + :null + }