Frontend changed twitch embed to chaos stream embed
parent
356524d35e
commit
ccd7a2c267
|
@ -47,7 +47,7 @@ async function sendMessage() {
|
|||
|
||||
// RECIEVE MESSAGES
|
||||
|
||||
let messageUpdate = window.setInterval(fetchMessages, 500);
|
||||
let messageUpdate = window.setInterval(fetchMessages, 1000);
|
||||
|
||||
async function fetchMessages() {
|
||||
const response = await fetch('/api/message/messages.json');
|
||||
|
|
|
@ -14,22 +14,24 @@ a {
|
|||
height: 100%;
|
||||
max-width: 960px;
|
||||
margin: 0 auto;
|
||||
margin-top: -1%;
|
||||
|
||||
}
|
||||
|
||||
#stream {
|
||||
background-color: white;
|
||||
padding: 5%;
|
||||
box-shadow: 10px 10px 10px black;
|
||||
border-radius: 5px;
|
||||
width: 854px;
|
||||
height: 480px;
|
||||
width: 960px;
|
||||
height: 540px;
|
||||
margin-right: 0.3em;
|
||||
margin-left: -40%;
|
||||
margin-top: auto;
|
||||
margin-bottom: 20%;
|
||||
}
|
||||
|
||||
#streamframe {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#chatbox {
|
||||
flex: 1;
|
||||
height: 53rem;
|
||||
|
@ -60,6 +62,6 @@ a {
|
|||
padding: 15px;
|
||||
border-bottom: solid;
|
||||
border-left: solid;
|
||||
border-color: white;
|
||||
border-width: 1px;
|
||||
border-color: lightblue;
|
||||
border-width: 2px;
|
||||
}
|
||||
|
|
|
@ -1,46 +1,56 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<title>Maya's Stream</title>
|
||||
<meta name="author" content="Luna">
|
||||
<meta name="description" content="Maya's Stream">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta charset="UTF-8">
|
||||
<link rel="stylesheet" href="index.css">
|
||||
<link rel="icon" href="/favicon.svg">
|
||||
</head>
|
||||
<head>
|
||||
<title>Maya's Stream</title>
|
||||
<meta name="author" content="Luna">
|
||||
<meta name="description" content="Maya's Stream">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta charset="UTF-8">
|
||||
<link rel="stylesheet" href="index.css">
|
||||
<link rel="icon" href="/favicon.svg">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<nav>
|
||||
<body>
|
||||
<nav>
|
||||
|
||||
<ul class="navigation-list">
|
||||
<li><a href="index.html"><div class="buttons">Stream</div></a></li>
|
||||
<li><a href="chat.html"><div class="buttons">Just Chat</div></a></li>
|
||||
<li><a href="register.html"><div class="buttons">Register</div></a></li>
|
||||
<li><a href="login.html"><div class="buttons">Login</div></a></li>
|
||||
<li><a href="updateinfo.html"><div class="buttons">Update Info</div></a></li>
|
||||
</ul>
|
||||
<ul class="navigation-list">
|
||||
<li><a href="index.html">
|
||||
<div class="buttons">Stream</div>
|
||||
</a></li>
|
||||
<li><a href="chat.html">
|
||||
<div class="buttons">Just Chat</div>
|
||||
</a></li>
|
||||
<li><a href="register.html">
|
||||
<div class="buttons">Register</div>
|
||||
</a></li>
|
||||
<li><a href="login.html">
|
||||
<div class="buttons">Login</div>
|
||||
</a></li>
|
||||
<li><a href="updateinfo.html">
|
||||
<div class="buttons">Update Info</div>
|
||||
</a></li>
|
||||
</ul>
|
||||
|
||||
|
||||
</nav>
|
||||
</nav>
|
||||
|
||||
<main>
|
||||
|
||||
<section>
|
||||
|
||||
<div id="streamchat">
|
||||
<div id="stream">
|
||||
<h1>This is where the stream will go.</h1>
|
||||
</div>
|
||||
<div id="streamchat">
|
||||
<div id="stream">
|
||||
<iframe id="streamframe" src="https://live.on.chaos.stream/maya" title="mayas stream" scrolling="no"></iframe>
|
||||
</div>
|
||||
|
||||
<iframe id="chatbox" src="chat.html" title="chat box" scrolling="no"></iframe>
|
||||
|
||||
</div>
|
||||
<iframe id="chatbox" src="chat.html" title="chat box" scrolling="no"></iframe>
|
||||
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
</main>
|
||||
</body>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
Loading…
Reference in New Issue