Merge pull request #6 from FabienLavocat/master

Version 1.5.0 - Use Voxeet SDK 3.0

Author: Energizz

.gitignore

@@ -1,3 +1,4 @@
 /node_modules
 .DS_Store
-/dist
+/dist
+*.lock

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Dolby Laboratories
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -2,7 +2,7 @@ Dolby Interactivity APIs Mixer Layout App
 =========================================
 
 <p align="center">
-<img src="https://cdn.dolby.io/wp-content/uploads/2020/05/Dolbyio-white-horizontal-e1589344433251.jpg" alt="Voxeet SDK logo" title="Dolby.io logo" width="200"/>
+<img src="wiki/dolbyio.jpeg" alt="Dolby.io logo" title="Dolby.io logo" width="200"/>
 </p>
 
 
@@ -63,7 +63,7 @@ For example, the layout may be equal sized tiles for the majority of the video b
     - `record`, which is used to record live conference;
     - `replay`, which is used to record a replay of a conference;
     - `stream`, which is used to stream to YouTube or Facebook; or
-    - `hls`, which is usef for streaming using HLS.
+    - `hls`, which is used for streaming using HLS.
 
     The mixer layout can vary the layout based on the type.
     For example, for a live recording of a conference, the Platform will set the vaue for the input with id `layoutType` to  `record`.
@@ -74,15 +74,21 @@ For example, the layout may be equal sized tiles for the majority of the video b
 
 * Download the project with:
 
-    `git clone git@github.com:voxeet/voxeet-uxkit-web-mixerlayout.git`
+    ```
+    git clone git@github.com:voxeet/voxeet-uxkit-web-mixerlayout.git
+    ```
 
-* Install the dependancies with:
+* Install the dependencies with:
 
-    `yarn install`
+    ```
+    yarn install
+    ```
 
 * Start the application with:
 
-    `yarn start`
+    ```
+    yarn start
+    ```
 
 
 ## Test
@@ -98,7 +104,9 @@ Change the default value for `isDemo` to `true` and set the `consumerKey` and `c
 
 2. Start the server
 
-`yarn start`
+```
+yarn start
+```
 
 3. Launch Chrome and go to `http://127.0.0.1:8081/`. The layout type can be selected and a mix started:
 
@@ -196,7 +204,9 @@ This component is used by `TileVideo` to show a presenter who does not have came
 
 To generate a bundle of the JavaScript of the project, in the root directory of the app run:
 
-`yarn run build`
+```
+yarn run build
+```
 
 This will generate `dist/index.html` and `dist/out.js`.
 

package.json

@@ -1,9 +1,9 @@
 {
   "name": "voxeet-mix-layout",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "private": true,
   "dependencies": {
-    "@voxeet/voxeet-web-sdk": "^2.3.1",
+    "@voxeet/voxeet-web-sdk": "^3.0.1",
     "axios": "^0.18.0",
     "express": "^4.16.4",
     "react": "^16.7.0",
@@ -41,6 +41,6 @@
   },
   "scripts": {
     "start": "webpack-dev-server -d",
-    "build": "npx webpack  --output-filename out.js --output-path dist"
+    "build": "npx webpack --output-filename out.js --output-path dist"
   }
 }

public/index.html

@@ -4,7 +4,6 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/efdjhmbmjlhomjhnnmpeeillhpnldoje">
 </head>
 
 <body>

src/app/components/ConferenceRoom.js

@@ -239,7 +239,7 @@ class ConferenceRoom extends Component {
               <div>
                 <h3>Live conference</h3>
                 <input
-                  placeholder="Conference name"
+                  placeholder="Conference name (alias)"
                   id="conferenceNameTest"
                   name="conferenceNameTest"
                 />

webpack.config.js

@@ -14,9 +14,9 @@ module.exports = {
   ],
   devServer: {
     port: 8081,
-    https: true,
+    https: false,
     disableHostCheck: true,
-    host: '0.0.0.0',
+    host: 'localhost',
   },
   module: {
     loaders: [