diff --git a/legacy-js/api.js b/legacy-js/api.js index 81a8f84..ad31be5 100644 --- a/legacy-js/api.js +++ b/legacy-js/api.js @@ -1,5 +1,5 @@ -var host = process.env.SERVER || 'https://lit-plateau-4689.herokuapp.com/'; +var host = process.env.SERVER || "https://lit-plateau-4689.herokuapp.com/"; -export default function(path) { +export default function(path) { return host + path; -}; +} diff --git a/legacy-js/components/email.js b/legacy-js/components/email.js index a473459..6cdd7aa 100644 --- a/legacy-js/components/email.js +++ b/legacy-js/components/email.js @@ -1,7 +1,7 @@ -'use strict'; +"use strict"; -import React from 'react'; +import React from "react"; export default function EmailComponent() { return info@koodiklinikka.fi; -}; +} diff --git a/legacy-js/components/fader.js b/legacy-js/components/fader.js index 6f51a52..ab56191 100644 --- a/legacy-js/components/fader.js +++ b/legacy-js/components/fader.js @@ -1,6 +1,6 @@ -'use strict'; +"use strict"; -import React from 'react'; +import React from "react"; function clamp(min, max, value) { return Math.min(Math.max(value, min), max); @@ -17,8 +17,8 @@ export default class Fader extends React.Component { onScroll = () => { var scrollableDistance = document.body.scrollHeight - window.innerHeight, - scrollTop = window.pageYOffset || document.documentElement.scrollTop, - distanceToBottom = scrollableDistance - scrollTop; + scrollTop = window.pageYOffset || document.documentElement.scrollTop, + distanceToBottom = scrollableDistance - scrollTop; this.setState({ opacity: clamp(0, 1, distanceToBottom / this.props.threshold) @@ -26,12 +26,12 @@ export default class Fader extends React.Component { }; componentDidMount() { - window.addEventListener('scroll', this.onScroll); + window.addEventListener("scroll", this.onScroll); this.onScroll(); } componentWillUnmount() { - window.removeEventListener('scroll', this.onScroll); + window.removeEventListener("scroll", this.onScroll); } render() { @@ -39,8 +39,6 @@ export default class Fader extends React.Component { opacity: this.state.opacity }; - return ( -
- ) + return ; } -}; +} diff --git a/legacy-js/components/feed.js b/legacy-js/components/feed.js index bc2e697..187ef77 100644 --- a/legacy-js/components/feed.js +++ b/legacy-js/components/feed.js @@ -1,10 +1,10 @@ -'use strict'; +"use strict"; -import React from 'react'; -import request from 'axios'; -import _ from 'lodash'; -import transformers from '../util'; -import api from '../api'; +import React from "react"; +import request from "axios"; +import _ from "lodash"; +import transformers from "../util"; +import api from "../api"; function throwError(err) { setTimeout(() => { @@ -19,28 +19,36 @@ export default class Feed extends React.Component { }; componentDidMount() { - request.get(api('feeds')) + request + .get(api("feeds")) - .then((res) => { + .then(res => { + const messages = _(res.data) + .map((messages, type) => transformers[type](messages)) + .flatten() + .value(); - const messages = _(res.data) - .map((messages, type) => transformers[type](messages)) - .flatten() - .value(); - - this.setState({ - messages: _(messages).sortBy('timestamp').reverse().value().slice(0, 40) - }); - }).catch(throwError); + this.setState({ + messages: _(messages) + .sortBy("timestamp") + .reverse() + .value() + .slice(0, 40) + }); + }) + .catch(throwError); } render() { var messages = this.state.messages.map((message, i) => { - var image =