Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Frikanalen/frikanalen
Browse files Browse the repository at this point in the history
  • Loading branch information
toresbe committed May 11, 2020
2 parents e70de49 + f866dde commit f40f1a0
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 21 deletions.
4 changes: 2 additions & 2 deletions packages/fkweb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ ADD . /srv/frikanalen/
RUN ./manage.py migrate
RUN ./manage.py loaddata frikanalen

CMD ["./manage.py", "runserver", "0.0.0.0:80"]
CMD ["./manage.py", "runserver", "0.0.0.0:8080"]

EXPOSE 80
EXPOSE 8080
1 change: 1 addition & 0 deletions packages/fkweb/fkbeta/settings/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def get_env_setting(setting):
########## HOST CONFIGURATION
# See: https://docs.djangoproject.com/en/1.5/releases/1.5/#allowed-hosts-required-in-production
ALLOWED_HOSTS = [
'forrige.frikanalen.no',
'frikanalen.no',
'frikanalen-prod.nuug.no',
'frikanalen-dev.nuug.no',
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Header extends Component {
<header>
<div id="header-logo">
<Link href="/" as="/">
<a><img className="logo" src="/static/frikanalen.png" alt="Frikanalen" /></a>
<a><img className="logo" src="/images/frikanalen.png" alt="Frikanalen" /></a>
</Link>
</div>

Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const Layout = props => (
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
</MetaTags>
<link href="scripts/video-js.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="static/controls.css" />
<link rel="stylesheet" type="text/css" href="style/controls.css" />
<Header className="foo"/>
<main>{props.children}</main>
<Footer />
Expand Down
6 changes: 3 additions & 3 deletions packages/frontend/components/ScheduleInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export class ScheduleInfo extends Component {
constructor(props){
super(props);
const json = this.fetchJSON().then(json => {
const sched = json.data.fkOnRightNows.edges
const sched = json.data.allFkOnRightNows.edges
//console.log(sched[2].node)
this.setState({
previous: sched[2].node,
Expand All @@ -22,7 +22,7 @@ export class ScheduleInfo extends Component {
fetchJSON = async () => {
const query = `
query {
fkOnRightNows {
allFkOnRightNows {
edges {
node {
starttime
Expand All @@ -45,7 +45,7 @@ export class ScheduleInfo extends Component {

updateSchedule = async () => {
const json = await this.fetchJSON()
const sched = json.data.fkOnRightNows.edges
const sched = json.data.allFkOnRightNows.edges
//console.log(sched[2].node)
this.setState({
previous: sched[2].node,
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/components/UserAuth.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class UserAuth extends Component {
token: cookies(props).token || null,
field_email:'',
field_password:'',
showLogin: false
showLogin: true
};
this.load_profile_data()
}
Expand All @@ -52,7 +52,7 @@ class UserAuth extends Component {
</div>
)
} else {
staff_button = <></>
staff_button = <div></div>
}
return (
<div className="user_nav">
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/components/WebRTC.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default class Realtime extends React.Component {
};
init_janus = () => {
var server = null;
server = "https://janus.frikanalen.no/";
server = "http://simula.frikanalen.no:3005";

this.opaqueId = "streamingtest-"+Janus.randomString(12);

Expand Down Expand Up @@ -123,7 +123,7 @@ export default class Realtime extends React.Component {
render = () => {
return (
<div>
<video autoPlay="true" ref={this.videoRef} />
<video autoPlay={true} ref={this.videoRef} />
</div>
);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/components/constants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
console.log(process.env.API_BASE_URL)
console.log(process.env.GRAPHQL_URL)
export const API_BASE_URL = process.env.API_BASE_URL || 'https://forrige.frikanalen.no/api/'
export const GRAPHQL_URL = process.env.GRAPHQL_URL || 'https://forrige.frikanalen.no/graphql'
export const API_BASE_URL = process.env.API_BASE_URL || 'https://frikanalen.no/api/'
export const GRAPHQL_URL = process.env.GRAPHQL_URL || 'https://frikanalen.no/graphql'
22 changes: 22 additions & 0 deletions packages/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"license": "GPL",
"dependencies": {
"isomorphic-unfetch": "^3.0.0",
"minimist": ">1.2.3",
"moment": "^2.24.0",
"next": "^9.3.5",
"next-cookies": "^2.0.3",
Expand All @@ -25,6 +26,6 @@
"sass-loader": "^8.0.2",
"shaka-player": "^2.5.10",
"video.js": "^7.7.5",
"minimist": ">1.2.3"
"webrtc-adapter": "^7.6.0"
}
}
6 changes: 1 addition & 5 deletions packages/frontend/pages/playout.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ class Playout extends Component {
return knapperad
}

MezzanineSource = () => {

}

ATEM = () => {
var inputs = [
{index: 2, name: "tx1"},
Expand Down Expand Up @@ -130,13 +126,13 @@ class Playout extends Component {
}

// <DASHPlayer manifestUri="https://beta.frikanalen.no/stream/multiviewer.webm" />
//<this.ATEM/>
render = () => {
return (
<Layout>
<div className="playoutControl">
<div className="header">playout-styring</div>
<Realtime />
<this.ATEM />
</div>
<style jsx global>{`
.playoutControl >div {
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/playout/database/video.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LEGACY_API='https://forrige.frikanalen.no/api/'
LEGACY_API='https://frikanalen.no/api/'

import logging
import requests
Expand Down
2 changes: 1 addition & 1 deletion packages/playout/vision/playout.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Playout(object):
def getDelayForNext(self):
# Queue next
next_program = self.schedule.get_next_program()
if program == None:
if next_program == None:
self.scheduler_task.stop()
self.set_next_program(None)
# This will actually call cue_next_program once more.
Expand Down

0 comments on commit f40f1a0

Please sign in to comment.