Merge branch 'master' into tab

add favicon

app/assets/javascripts/signaling-server.js

@@ -16,10 +16,12 @@ let pcPeers = {}; // peer connection
 let localstream;
 
 window.onload = () => {
-  currentUser = document.getElementById("current-user").innerHTML;
-  console.log(currentUser)
-  localVideo = document.getElementById("local-video");
-  remoteVideoContainer = document.getElementById("remote-video-container");
+  if (document.getElementById("current-user")) {
+    currentUser = document.getElementById("current-user").innerHTML;
+    console.log(currentUser)
+    localVideo = document.getElementById("local-video");
+    remoteVideoContainer = document.getElementById("remote-video-container");
+  }
 };
 
 // Ice Credentials
@@ -35,8 +37,10 @@ document.onreadystatechange = async () => {
       })
 
       localstream = stream;
-      localVideo.srcObject = stream
-      localVideo.muted = true
+      if (localVideo) {
+        localVideo.srcObject = stream
+        localVideo.muted = true
+      }
     } catch (e) { console.error(e); }
   }
 };
@@ -67,7 +71,11 @@ document.onreadystatechange = async () => {
 //     }
 //   });
 // };
-const chatroomId = document.getElementById('chatroom-hook').dataset["chatroomId"]
+
+if (document.getElementById('chatroom-hook')) {
+  const chatroomId = document.getElementById('chatroom-hook').dataset["chatroomId"]
+
+}
 
 const handleJoinSession = async () => {
   App['chatroom' + chatroomId] = await App.cable.subscriptions.create({

app/assets/stylesheets/users/_index.scss

@@ -1,2 +1,3 @@
 @import "show";
 @import "edit";
+@import "setting";

app/assets/stylesheets/users/_show.scss

@@ -34,6 +34,7 @@
       display: flex;
       flex-direction: column;
       justify-content: center;
+      color: #f2321f;
       h1 {
         margin: 0 0 .5em 0 ;
       }
@@ -49,3 +50,4 @@
 
   }
 
+