LogalDeveloper/owncast
0
Fork 0
Code Activity

low hanging cleanup for extrauser content

Browse Source
This commit is contained in:
Ginger Wong
2020-07-05 01:29:48 -07:00
parent 9bd1df8530
commit 34b3806806
5 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webroot/index.html
View File

@@ -101,7 +101,7 @@ GW TODO:
v-bind:tags="tags" v-bind:tags="tags"
>{{streamerName}}</user-details> >{{streamerName}}</user-details>
<div v-html="extraUserContent">{{extraUserContent}}</div> <div v-html="extraUserContent" class="extra-user-content">{{extraUserContent}}</div>
</section> </section>
@@ -120,7 +120,7 @@ GW TODO:
v-bind:tags="tags" v-bind:tags="tags"
>{{streamerName}}</user-details> >{{streamerName}}</user-details>
<div v-html="extraUserContent">{{extraUserContent}}</div> <div v-html="extraUserContent" class="extra-user-content">{{extraUserContent}}</div>
<owncast-footer v-bind:app-version="appVersion"></owncast-footer> <owncast-footer v-bind:app-version="appVersion"></owncast-footer>

12
webroot/js/app.js
View File

@@ -50,17 +50,7 @@ async function setupApp() {
app.title = config.title; app.title = config.title;
window.document.title = config.title; window.document.title = config.title;
getExtraUserContent(`${URL_PREFIX}${config.extraUserInfoFileName}`);
try {
const pageContentFile = config.extraUserInfoFileName;
const response = await fetch(pageContentFile);
const descriptionMarkdown = await response.text()
const descriptionHTML = new showdown.Converter().makeHtml(descriptionMarkdown);
app.extraUserContent = descriptionHTML;
return this;
} catch (error) {
console.log("Error", error);
}
} }
var websocketReconnectTimer; var websocketReconnectTimer;

2
webroot/js/components.js
View File

@@ -9,7 +9,7 @@ Vue.component('owncast-footer', {
template: ` template: `
<footer class="flex"> <footer class="flex">
<span> <span>
<a href="https://github.com/gabek/owncast" target="_blank">About Owncast</a> <a href="${URL_OWNCAST}" target="_blank">About Owncast</a>
</span> </span>
<span>Version {{appVersion}}</span> <span>Version {{appVersion}}</span>
</footer> </footer>

24
webroot/js/utils.js
View File

@@ -6,8 +6,9 @@ const URL_PREFIX = 'https://goth.land';
const URL_STATUS = `${URL_PREFIX}/status`; const URL_STATUS = `${URL_PREFIX}/status`;
const URL_STREAM = `${URL_PREFIX}/hls/stream.m3u8`; const URL_STREAM = `${URL_PREFIX}/hls/stream.m3u8`;
const URL_WEBSOCKET = 'wss://goth.land/entry'; const URL_WEBSOCKET = URL_PREFIX
// const URL_WEBSOCKET = `${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/entry`; ? 'wss://goth.land/entry'
: `${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/entry`;
const POSTER_DEFAULT = `${URL_PREFIX}/img/logo.png`; const POSTER_DEFAULT = `${URL_PREFIX}/img/logo.png`;
const POSTER_THUMB = `${URL_PREFIX}/thumbnail.jpg`; const POSTER_THUMB = `${URL_PREFIX}/thumbnail.jpg`;
@@ -23,6 +24,8 @@ const KEY_CHAT_DISPLAYED = 'owncast_chat';
const VIDEO_ID = 'video'; const VIDEO_ID = 'video';
const URL_OWNCAST = 'https://github.com/gabek/owncast';
function getLocalStorage(key) { function getLocalStorage(key) {
try { try {
@@ -120,3 +123,20 @@ function setVideoPoster(online) {
const poster = online ? POSTER_THUMB : POSTER_DEFAULT; const poster = online ? POSTER_THUMB : POSTER_DEFAULT;
player.poster(poster); player.poster(poster);
} }
function getExtraUserContent(path) {
fetch(path)
.then(response => {
if (!response.ok) {
throw new Error(`Network response was not ok ${response.ok}`);
}
return response.text();
})
.then(text => {
const descriptionHTML = new showdown.Converter().makeHtml(text);
app.extraUserContent = descriptionHTML;
})
.catch(error => {
console.log("Error", error);
});
}

4
webroot/styles/layout.css
View File

@@ -155,8 +155,8 @@ footer span {
margin: 1em 0; margin: 1em 0;
} }
.extra-user-content { .extra-user-content {
margin: 1em 0; padding: 1em 3em 3em 3em;
} }
h2 { h2 {
font-size: 3em; font-size: 3em;