Merge branch 'master' of github.com:Frikanalen/frikanalen

Frikanalen · May 11, 2020 · 5858008 · 5858008
2 parents 3d273ff + 12ae820
commit 5858008
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 21 deletions.
diff --git a/packages/fkweb/Dockerfile b/packages/fkweb/Dockerfile
@@ -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
diff --git a/packages/fkweb/fkbeta/settings/production.py b/packages/fkweb/fkbeta/settings/production.py
@@ -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',

diff --git a/packages/frontend/components/Header.js b/packages/frontend/components/Header.js
@@ -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>
 

diff --git a/packages/frontend/components/Layout.js b/packages/frontend/components/Layout.js
@@ -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 />

diff --git a/packages/frontend/components/ScheduleInfo.js b/packages/frontend/components/ScheduleInfo.js
@@ -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,
@@ -22,7 +22,7 @@ export class ScheduleInfo extends Component {
     fetchJSON = async () => {
         const query = `
         query {
-          fkOnRightNows {
+          allFkOnRightNows {
             edges {
               node {
                 starttime
@@ -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,

diff --git a/packages/frontend/components/UserAuth.js b/packages/frontend/components/UserAuth.js
@@ -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()
     }
@@ -52,7 +52,7 @@ class UserAuth extends Component {
                 </div>
             )
         } else {
-            staff_button = <></>
+            staff_button = <div></div>
         }
         return (
             <div className="user_nav">

diff --git a/packages/frontend/components/WebRTC.js b/packages/frontend/components/WebRTC.js
@@ -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);
 
@@ -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>
         );
     }

diff --git a/packages/frontend/components/constants.js b/packages/frontend/components/constants.js
@@ -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'
diff --git a/packages/frontend/package-lock.json b/packages/frontend/package-lock.json
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -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",
@@ -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"
   }
 }
diff --git a/packages/frontend/pages/playout.js b/packages/frontend/pages/playout.js
@@ -86,10 +86,6 @@ class Playout extends Component {
         return knapperad
     }
 
-    MezzanineSource = () => {
-
-    }
-
     ATEM = () => {
         var inputs = [
             {index: 2, name: "tx1"},
@@ -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 {

diff --git a/...ges/frontend/public/static/frikanalen.png → ...ges/frontend/public/images/frikanalen.png b/...ges/frontend/public/static/frikanalen.png → ...ges/frontend/public/images/frikanalen.png
diff --git a/packages/frontend/public/static/controls.css → packages/frontend/public/style/controls.css b/packages/frontend/public/static/controls.css → packages/frontend/public/style/controls.css
diff --git a/packages/frontend/public/static/demo.css → packages/frontend/public/style/demo.css b/packages/frontend/public/static/demo.css → packages/frontend/public/style/demo.css
diff --git a/packages/playout/database/video.py b/packages/playout/database/video.py
@@ -1,4 +1,4 @@
-LEGACY_API='https://forrige.frikanalen.no/api/'
+LEGACY_API='https://frikanalen.no/api/'
 
 import logging
 import requests

diff --git a/packages/playout/vision/playout.py b/packages/playout/vision/playout.py
@@ -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.