From b053c936554736e575f26e63b58a34f4195ae942 Mon Sep 17 00:00:00 2001 From: Lukas Brabec Date: Jan 22 2019 15:23:28 +0000 Subject: use new api for landingpage --- diff --git a/public/env.js b/public/env.js index ed18a2b..997a556 100644 --- a/public/env.js +++ b/public/env.js @@ -1,5 +1,4 @@ window.env = { SUBDIR: '/landing_page', - ORACULUM_API_URL: "http://localhost:5000/api/v0/", ORACULUM_API_URL_v1: "http://localhost:5000/api/v1/" }; diff --git a/src/config.js b/src/config.js index fbaad30..8ba8ff2 100644 --- a/src/config.js +++ b/src/config.js @@ -4,12 +4,10 @@ const durationString = { "72": "Several days", } -const oraculumApiUrl = window.env.ORACULUM_API_URL; const oraculumApiUrl_v1 = window.env.ORACULUM_API_URL_v1; export { durationString, - oraculumApiUrl, oraculumApiUrl_v1 } diff --git a/src/landingpage/Blockers.js b/src/landingpage/Blockers.js index 0e7fc56..9d0bbbb 100644 --- a/src/landingpage/Blockers.js +++ b/src/landingpage/Blockers.js @@ -7,25 +7,12 @@ class Blockers extends Component { this.state = { blockerbugs: {}, release: 0 }; } - componentDidMount() { - fetch(this.props.apiurl + 'blockerbugs') - .then(data => { - return data.json(); - }) - .then(data => { - console.log(data); - this.setState({ - blockerbugs: data.blockerbugs, - release: data.release - }); - }); - } render() { - if (this.state.blockerbugs) + if (this.props.data) return (
-
Fedora {this.state.release} blockers and FEs{' '} +
Fedora {this.props.release} blockers and FEs{' '} @@ -40,16 +27,16 @@ class Blockers extends Component { - Proposed Blockers{this.state.blockerbugs.beta_blockers_proposed} + Proposed Blockers{this.props.data.beta_blockers_proposed} - Accepted Blockers{this.state.blockerbugs.beta_blockers} + Accepted Blockers{this.props.data.beta_blockers} - Proposed FEs{this.state.blockerbugs.beta_fe_proposed} + Proposed FEs{this.props.data.beta_fe_proposed} - Accepted FEs{this.state.blockerbugs.beta_fe} + Accepted FEs{this.props.data.beta_fe} @@ -64,16 +51,16 @@ class Blockers extends Component { - Proposed Blockers{this.state.blockerbugs.final_blockers_proposed} + Proposed Blockers{this.props.data.final_blockers_proposed} - Accepted Blockers{this.state.blockerbugs.final_blockers} + Accepted Blockers{this.props.data.final_blockers} - Proposed FEs{this.state.blockerbugs.final_fe_proposed} + Proposed FEs{this.props.data.final_fe_proposed} - Accepted FEs{this.state.blockerbugs.final_fe} + Accepted FEs{this.props.data.final_fe} diff --git a/src/landingpage/Events.js b/src/landingpage/Events.js index 1d13622..456310d 100644 --- a/src/landingpage/Events.js +++ b/src/landingpage/Events.js @@ -7,19 +7,8 @@ class Events extends Component { this.state = { meetings: [] }; } - componentDidMount() { - fetch(this.props.apiurl + 'meetings') - .then(data => { - return data.json(); - }) - .then(data => { - console.log(data); - this.setState({ meetings: data.meetings }); - }); - } - render() { - const meetings = this.state.meetings.map(meeting => { + const meetings = this.props.data.map(meeting => { const old = new Date(meeting.start); meeting.start = dateFormat(new Date(old.getTime() - old.getTimezoneOffset()*60000), "d mmm yyyy - HH:MM") if (meeting.fullday){ diff --git a/src/landingpage/LandingPage.js b/src/landingpage/LandingPage.js index bd3474a..19bffb7 100644 --- a/src/landingpage/LandingPage.js +++ b/src/landingpage/LandingPage.js @@ -5,10 +5,31 @@ import Layout from '../layout/Layout'; import Timeline from "./Timeline"; import Events from "./Events"; import Blockers from "./Blockers"; -import {oraculumApiUrl} from "../config"; +import {oraculumApiUrl_v1} from "../config"; class LandingPage extends Component { + constructor(props) { + super(props); + this.state = { + blockerbugs: {}, + devel: 0, + meetings: [], + schedule: [], + last_qa_meeting: {}, + stable: 0, + } + } + + componentDidMount() { + fetch(oraculumApiUrl_v1 + 'landing_page') + .then(data => data.json()) + .then(data => { + console.log(data) + this.setState(data) + }) + } + render() { return ( @@ -16,7 +37,7 @@ class LandingPage extends Component {
- +
@@ -24,16 +45,16 @@ class LandingPage extends Component {
- +
- +
{/*
- +
*/} diff --git a/src/landingpage/Minutes.js b/src/landingpage/Minutes.js index 679ead1..c775c0b 100644 --- a/src/landingpage/Minutes.js +++ b/src/landingpage/Minutes.js @@ -6,24 +6,14 @@ class Events extends Component { this.state = { link: "", date: "" }; } - componentDidMount() { - fetch(this.props.apiurl + 'last_qa_meeting') - .then(data => { - return data.json(); - }) - .then(data => { - console.log(data); - this.setState({ link: data.link, date: data.date }); - }); - } render() { return (
- Latest QA Meeting Minutes From {this.state.date} + Latest QA Meeting Minutes From {this.props.data.date}
- Here! + Here!
); } diff --git a/src/landingpage/Timeline.js b/src/landingpage/Timeline.js index 73d3f5d..02331d4 100644 --- a/src/landingpage/Timeline.js +++ b/src/landingpage/Timeline.js @@ -7,17 +7,6 @@ class Timeline extends Component { this.state = { schedule: [] }; } - componentDidMount() { - fetch(this.props.apiurl + 'schedule') - .then(data => { - return data.json(); - }) - .then(data => { - console.log(data); - this.setState({ schedule: data.schedule }); - }); - } - get_title(summary) { summary = summary.toLowerCase(); if (summary.includes("freeze")) @@ -31,7 +20,7 @@ class Timeline extends Component { } render() { - const line = this.state.schedule.map(milestone => { + const line = this.props.data.map(milestone => { return ( @@ -39,7 +28,7 @@ class Timeline extends Component { ) }) - const dates = this.state.schedule.map(milestone => { + const dates = this.props.data.map(milestone => { return ( {milestone.date} @@ -47,7 +36,7 @@ class Timeline extends Component { ) }); - const schedule = this.state.schedule.map(milestone => { + const schedule = this.props.data.map(milestone => { return ( {milestone.summary}{' '}