From f866ddefd2f92321076f9f4caffe77e9a63e0947 Mon Sep 17 00:00:00 2001 From: Tore Sinding Bekkedal Date: Mon, 11 May 2020 10:50:04 +0200 Subject: [PATCH] address various issues with the frontend --- packages/frontend/components/ScheduleInfo.js | 6 +++--- packages/frontend/components/UserAuth.js | 4 ++-- packages/frontend/components/WebRTC.js | 4 ++-- packages/frontend/components/constants.js | 4 ++-- packages/frontend/pages/playout.js | 6 +----- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/frontend/components/ScheduleInfo.js b/packages/frontend/components/ScheduleInfo.js index 6bb77505..5fad0e89 100644 --- 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 index fb6a6c98..965a4099 100644 --- 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 { ) } else { - staff_button = <> + staff_button =
} return (
diff --git a/packages/frontend/components/WebRTC.js b/packages/frontend/components/WebRTC.js index 76438cae..ce2d9b39 100644 --- 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 (
-
); } diff --git a/packages/frontend/components/constants.js b/packages/frontend/components/constants.js index 39cf1166..08cc179a 100644 --- 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/pages/playout.js b/packages/frontend/pages/playout.js index 1aa87cd6..4e1523dd 100644 --- 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 { } // + // render = () => { return (
playout-styring
-