erin
/
lila-chat
1
0
Fork 0
Code Issues 10 Pull Requests Projects 2 Releases Wiki Activity

Frontend changed twitch embed to chaos stream embed

pull/13/head
Luna 2021-07-25 14:12:24 -07:00
parent 356524d35e
commit ccd7a2c267
3 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/chat.js
View File

@ -47,7 +47,7 @@ async function sendMessage() {
// RECIEVE MESSAGES // RECIEVE MESSAGES
let messageUpdate = window.setInterval(fetchMessages, 500); let messageUpdate = window.setInterval(fetchMessages, 1000);
async function fetchMessages() { async function fetchMessages() {
const response = await fetch('/api/message/messages.json'); const response = await fetch('/api/message/messages.json');

18
frontend/index.css
View File

@ -14,22 +14,24 @@ a {
height: 100%; height: 100%;
max-width: 960px; max-width: 960px;
margin: 0 auto; margin: 0 auto;
margin-top: -1%;
} }
#stream { #stream {
background-color: white; width: 960px;
padding: 5%; height: 540px;
box-shadow: 10px 10px 10px black;
border-radius: 5px;
width: 854px;
height: 480px;
margin-right: 0.3em; margin-right: 0.3em;
margin-left: -40%; margin-left: -40%;
margin-top: auto; margin-top: auto;
margin-bottom: 20%; margin-bottom: 20%;
} }
#streamframe {
height: 100%;
width: 100%;
}
#chatbox { #chatbox {
flex: 1; flex: 1;
height: 53rem; height: 53rem;
@ -60,6 +62,6 @@ a {
padding: 15px; padding: 15px;
border-bottom: solid; border-bottom: solid;
border-left: solid; border-left: solid;
border-color: white; border-color: lightblue;
border-width: 1px; border-width: 2px;
} }

66
frontend/index.html
View File

@ -1,46 +1,56 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Maya's Stream</title> <title>Maya's Stream</title>
<meta name="author" content="Luna"> <meta name="author" content="Luna">
<meta name="description" content="Maya's Stream"> <meta name="description" content="Maya's Stream">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="index.css"> <link rel="stylesheet" href="index.css">
<link rel="icon" href="/favicon.svg"> <link rel="icon" href="/favicon.svg">
</head> </head>
<body> <body>
<nav> <nav>
<ul class="navigation-list"> <ul class="navigation-list">
<li><a href="index.html"><div class="buttons">Stream</div></a></li> <li><a href="index.html">
<li><a href="chat.html"><div class="buttons">Just Chat</div></a></li> <div class="buttons">Stream</div>
<li><a href="register.html"><div class="buttons">Register</div></a></li> </a></li>
<li><a href="login.html"><div class="buttons">Login</div></a></li> <li><a href="chat.html">
<li><a href="updateinfo.html"><div class="buttons">Update Info</div></a></li> <div class="buttons">Just Chat</div>
</ul> </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> <main>
<section> <section>
<div id="streamchat"> <div id="streamchat">
<div id="stream"> <div id="stream">
<h1>This is where the stream will go.</h1> <iframe id="streamframe" src="https://live.on.chaos.stream/maya" title="mayas stream" scrolling="no"></iframe>
</div> </div>
<iframe id="chatbox" src="chat.html" title="chat box" scrolling="no"></iframe> <iframe id="chatbox" src="chat.html" title="chat box" scrolling="no"></iframe>
</div> </div>
</section> </section>
</main> </main>
</body> </body>
</html> </html>