From e3c8a8ab0e317ddb53714d25a97c17bb21fc91da Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 23 Sep 2019 15:54:16 +0300 Subject: [PATCH] Prettier legacy JS --- legacy-js/api.js | 6 +- legacy-js/components/email.js | 6 +- legacy-js/components/fader.js | 18 ++-- legacy-js/components/feed.js | 63 +++++++------ legacy-js/components/inviteForm.js | 103 +++++++++++---------- legacy-js/components/loader.js | 14 +-- legacy-js/components/members.js | 35 ++++--- legacy-js/components/membershipForm.js | 27 +++--- legacy-js/components/membershipInfoForm.js | 22 ++--- legacy-js/config.js | 11 +-- legacy-js/ga.js | 21 +++-- legacy-js/main.js | 73 ++++++--------- legacy-js/util.js | 26 +++--- 13 files changed, 217 insertions(+), 208 deletions(-) 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 = ; - if(message.imageLink) { - image = {image}; + if (message.imageLink) { + image = ( + + {image} + + ); } return ( @@ -50,23 +58,24 @@ export default class Feed extends React.Component {
{message.user}
-
+
- {require('timeago')(message.timestamp)} + {require("timeago")(message.timestamp)} {message.meta}
- ) + ); }); - return ( -
{messages}
- ) + return
{messages}
; } -}; +} diff --git a/legacy-js/components/inviteForm.js b/legacy-js/components/inviteForm.js index cfc0b66..06de86f 100644 --- a/legacy-js/components/inviteForm.js +++ b/legacy-js/components/inviteForm.js @@ -1,20 +1,20 @@ -'use strict'; +"use strict"; -import request from 'axios'; -import React from 'react'; -import classSet from 'classnames'; -import api from '../api'; -import Loader from './loader'; +import request from "axios"; +import React from "react"; +import classSet from "classnames"; +import api from "../api"; +import Loader from "./loader"; export default class InviteForm extends React.Component { state = { - email: '', + email: "", submitted: false, sending: false, error: null }; - onSubmit = (e) => { + onSubmit = e => { e.preventDefault(); this.setState({ @@ -23,23 +23,24 @@ export default class InviteForm extends React.Component { error: null }); - request.post(api('invites'), { - email: this.state.email.trim() - }) - .then(this.handleSuccess) - .catch(this.handleError); + request + .post(api("invites"), { + email: this.state.email.trim() + }) + .then(this.handleSuccess) + .catch(this.handleError); }; handleSuccess = () => { - this.setState({submitted: true, sending: false}); + this.setState({ submitted: true, sending: false }); }; - handleError = (err) => { - this.setState({error: err, sending: false}); + handleError = err => { + this.setState({ error: err, sending: false }); }; - onChange = (e) => { - if(e.target.value === this.state.email) { + onChange = e => { + if (e.target.value === this.state.email) { return; } this.setState({ @@ -51,62 +52,66 @@ export default class InviteForm extends React.Component { render() { var formClasses = classSet({ - 'form': true, - 'invite-form': true, - 'has-success': this.state.submitted, - 'has-error': this.state.error, - 'sending': this.state.sending + form: true, + "invite-form": true, + "has-success": this.state.submitted, + "has-error": this.state.error, + sending: this.state.sending }); var inputClasses = classSet({ - 'input': true, - 'has-success': this.state.submitted, - 'has-error': this.state.error + input: true, + "has-success": this.state.submitted, + "has-error": this.state.error }); var feedbackMessage; - if(this.state.error || this.state.submitted) { + if (this.state.error || this.state.submitted) { let messageText; - if(this.state.submitted) { - messageText = 'Kutsu lähetetty antamaasi sähköpostiosoitteeseen.'; - } else if(this.state.error.status === 400 && this.state.error.data === 'invalid_email') { - messageText = 'Tarkasta syöttämäsi sähköpostiosoite'; - } else if(this.state.error.status === 400 && this.state.error.data === 'already_invited') { - messageText = 'Sähköpostiosoitteeseen on jo lähetetty kutsu'; + if (this.state.submitted) { + messageText = "Kutsu lähetetty antamaasi sähköpostiosoitteeseen."; + } else if ( + this.state.error.status === 400 && + this.state.error.data === "invalid_email" + ) { + messageText = "Tarkasta syöttämäsi sähköpostiosoite"; + } else if ( + this.state.error.status === 400 && + this.state.error.data === "already_invited" + ) { + messageText = "Sähköpostiosoitteeseen on jo lähetetty kutsu"; } else { - messageText = 'Jotain meni pieleen. Yritä hetken päästä uudelleen.'; + messageText = "Jotain meni pieleen. Yritä hetken päästä uudelleen."; } - feedbackMessage = ( -
- {messageText} -
- ); + feedbackMessage =
{messageText}
; } return (
+ onChange={this.onChange} + /> -
+
{feedbackMessage} ); } -}; +} diff --git a/legacy-js/components/loader.js b/legacy-js/components/loader.js index 696633a..01aa4a0 100644 --- a/legacy-js/components/loader.js +++ b/legacy-js/components/loader.js @@ -1,12 +1,12 @@ -import React from 'react'; +import React from "react"; export default function Loader() { return ( -
-
-
-
-
+
+
+
+
+
); -}; +} diff --git a/legacy-js/components/members.js b/legacy-js/components/members.js index edfc35d..de856ab 100644 --- a/legacy-js/components/members.js +++ b/legacy-js/components/members.js @@ -1,9 +1,9 @@ -'use strict'; +"use strict"; -import React from 'react'; -import request from 'axios'; -import _ from 'lodash'; -import api from '../api'; +import React from "react"; +import request from "axios"; +import _ from "lodash"; +import api from "../api"; export default class Members extends React.Component { state = { @@ -11,28 +11,27 @@ export default class Members extends React.Component { }; componentDidMount() { - request.get(api('members')).then(function(res) { - this.setState({ - members: _.shuffle(res.data) - }); - }.bind(this)); + request.get(api("members")).then( + function(res) { + this.setState({ + members: _.shuffle(res.data) + }); + }.bind(this) + ); } render() { - var members = this.state.members.map(function(member, i) { var src = `${member.avatar_url}&s=120`; - return ( - - ); + return ; }); return ( -
- + - ) + ); } -}; +} diff --git a/legacy-js/components/membershipForm.js b/legacy-js/components/membershipForm.js index 50fbfd7..d0170d8 100644 --- a/legacy-js/components/membershipForm.js +++ b/legacy-js/components/membershipForm.js @@ -1,5 +1,5 @@ -import React from 'react'; -import MembershipInfoForm from './membershipInfoForm'; +import React from "react"; +import MembershipInfoForm from "./membershipInfoForm"; export default class MembershipForm extends React.Component { state = { @@ -12,23 +12,28 @@ export default class MembershipForm extends React.Component { render() { if (!this.state.signupSuccess) { - return ( - - ); + return ; } return (
- + + fill="#349c4a" + d="M256 6.998c-137.533 0-249 111.467-249 249 0 137.534 111.467 249 249 249s249-111.467 249-249c0-137.534-111.467-249-249-249zm0 478.08c-126.31 0-229.08-102.77-229.08-229.08 0-126.31 102.77-229.08 229.08-229.08 126.31 0 229.08 102.77 229.08 229.08 0 126.31-102.77 229.08-229.08 229.08z" + /> + fill="#349c4a" + d="M384.235 158.192L216.92 325.518 127.86 236.48l-14.142 14.144 103.2 103.18 181.36-181.47" + />

Rekisteröityminen onnistui. Tervetuloa jäseneksi!

Tervetuloa Koodiklinikka ry:n jäseneksi!

); } -}; +} diff --git a/legacy-js/components/membershipInfoForm.js b/legacy-js/components/membershipInfoForm.js index 268c81f..dd3ed74 100644 --- a/legacy-js/components/membershipInfoForm.js +++ b/legacy-js/components/membershipInfoForm.js @@ -1,12 +1,12 @@ "use strict"; -import _ from 'lodash'; -import request from 'axios'; -import React from 'react'; -import classSet from 'classnames'; -import api from '../api'; -import Loader from './loader'; -import configFactory from '../../config.js'; +import _ from "lodash"; +import request from "axios"; +import React from "react"; +import classSet from "classnames"; +import api from "../api"; +import Loader from "./loader"; +import configFactory from "../../config.js"; const config = configFactory(); var fieldNameTranslations = { @@ -60,7 +60,7 @@ export default class MembershipInfoForm extends React.Component { }); }; - onChange = (e) => { + onChange = e => { var name = e.target.name; if (e.target.value === this.state[name]) { return; @@ -107,9 +107,7 @@ export default class MembershipInfoForm extends React.Component { if (err.type === "missing") { feedbackText = `${fieldNameTranslations[err.field].fi} on pakollinen.`; } else if (err.type === "invalid") { - feedbackText = `${ - fieldNameTranslations[err.field].fi - } on virheellinen.`; + feedbackText = `${fieldNameTranslations[err.field].fi} on virheellinen.`; } return ( @@ -190,4 +188,4 @@ export default class MembershipInfoForm extends React.Component {
); } -}; +} diff --git a/legacy-js/config.js b/legacy-js/config.js index 95b8eff..3ba2a75 100644 --- a/legacy-js/config.js +++ b/legacy-js/config.js @@ -1,16 +1,15 @@ - var development = { stripe: { publicKey: "pk_test_OmNve9H1OuORlmD4rblpjgzh" } -} +}; var production = { stripe: { publicKey: "pk_live_xrnwdLNXbt20LMxpIDffJnnC" } -} - -export default function () { - return process.env.ENV == 'development' ? development : production; }; + +export default function() { + return process.env.ENV == "development" ? development : production; +} diff --git a/legacy-js/ga.js b/legacy-js/ga.js index 5dc5ab1..5d12bde 100644 --- a/legacy-js/ga.js +++ b/legacy-js/ga.js @@ -1,7 +1,16 @@ - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); +(function(i, s, o, g, r, a, m) { + i["GoogleAnalyticsObject"] = r; + (i[r] = + i[r] || + function() { + (i[r].q = i[r].q || []).push(arguments); + }), + (i[r].l = 1 * new Date()); + (a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]); + a.async = 1; + a.src = g; + m.parentNode.insertBefore(a, m); +})(window, document, "script", "//www.google-analytics.com/analytics.js", "ga"); - ga('create', 'UA-58806132-1', 'auto'); - ga('send', 'pageview'); +ga("create", "UA-58806132-1", "auto"); +ga("send", "pageview"); diff --git a/legacy-js/main.js b/legacy-js/main.js index 38169fa..b806e59 100644 --- a/legacy-js/main.js +++ b/legacy-js/main.js @@ -1,51 +1,38 @@ -'use strict'; -import './ga'; -import ReactDOM from 'react-dom'; -import React from 'react'; +"use strict"; +import "./ga"; +import ReactDOM from "react-dom"; +import React from "react"; -var inviteForm = React.createFactory(require('./components/inviteForm')); -var fader = React.createFactory(require('./components/fader')); -var members = React.createFactory(require('./components/members')); -var feed = React.createFactory(require('./components/feed')); -var email = React.createFactory(require('./components/email')); -var membershipForm = React.createFactory(require('./components/membershipForm')); +var inviteForm = React.createFactory(require("./components/inviteForm")); +var fader = React.createFactory(require("./components/fader")); +var members = React.createFactory(require("./components/members")); +var feed = React.createFactory(require("./components/feed")); +var email = React.createFactory(require("./components/email")); +var membershipForm = React.createFactory( + require("./components/membershipForm") +); const pathName = window.location.pathname; -document.querySelectorAll('.email').forEach((element) => - ReactDOM.render(email(), element) -); +document + .querySelectorAll(".email") + .forEach(element => ReactDOM.render(email(), element)); -if (pathName == '/') { - ReactDOM.render( - inviteForm(), - document.getElementById('invite-form')); +if (pathName == "/") { + ReactDOM.render(inviteForm(), document.getElementById("invite-form")); + + ReactDOM.render(fader(), document.getElementById("fader")); + + ReactDOM.render(members(), document.getElementById("members")); + + ReactDOM.render(feed(), document.getElementById("feed")); +} else if (pathName == "/yhdistys.html") { + ReactDOM.render(membershipForm(), document.getElementById("membership-form")); + + ReactDOM.render(fader(), document.getElementById("fader")); ReactDOM.render( - fader(), - document.getElementById('fader')); - - ReactDOM.render( - members(), - document.getElementById('members')); - - ReactDOM.render( - feed(), - document.getElementById('feed')); - -} else if (pathName == '/yhdistys.html') { - ReactDOM.render( - membershipForm(), - document.getElementById('membership-form')); - - ReactDOM.render( - fader(), - document.getElementById('fader')); - - ReactDOM.render( - React.createElement('div', {}, [ - members({ key: 0 }), - members({ key: 1 }) - ]), - document.getElementById('members')); + React.createElement("div", {}, [members({ key: 0 }), members({ key: 1 })]), + document.getElementById("members") + ); } diff --git a/legacy-js/util.js b/legacy-js/util.js index c0b7a18..d357025 100644 --- a/legacy-js/util.js +++ b/legacy-js/util.js @@ -1,23 +1,23 @@ -'use strict'; +"use strict"; -import _ from 'lodash'; -import githubEvent from 'parse-github-event'; -import twitterText from 'twitter-text'; +import _ from "lodash"; +import githubEvent from "parse-github-event"; +import twitterText from "twitter-text"; -const isVisibleGithubEvent = ({type}) => type !== 'PushEvent' && type !== 'DeleteEvent'; +const isVisibleGithubEvent = ({ type }) => + type !== "PushEvent" && type !== "DeleteEvent"; export default { github(items) { - return items.filter(isVisibleGithubEvent).map((item) => { - + return items.filter(isVisibleGithubEvent).map(item => { _.templateSettings.interpolate = /{{([\s\S]+?)}}/g; var template = _.template(githubEvent.parse(item).text); var repository = `https://github.com/${item.repo.name}`; var branch; - if(item.payload.ref) { - branch = item.payload.ref.replace('refs/heads/', ''); + if (item.payload.ref) { + branch = item.payload.ref.replace("refs/heads/", ""); } var message = template({ @@ -38,13 +38,13 @@ export default { body: message, timestamp: new Date(item.created_at), url: message.url, - type: 'github' + type: "github" }; }); }, twitter(items) { - return items.map((item) => { - if(item.retweeted) { + return items.map(item => { + if (item.retweeted) { item = item.retweeted_status; } @@ -57,7 +57,7 @@ export default { imageLink: url, body: twitterText.autoLink(item.text), timestamp: new Date(item.created_at), - type: 'twitter' + type: "twitter" }; }); }