diff --git a/legacy-js/api.js b/legacy-js/api.js index 7277a28..81a8f84 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/'; -module.exports = function(path) { +export default function(path) { return host + path; -} +}; diff --git a/legacy-js/components/email.js b/legacy-js/components/email.js index 0281eb6..4c0ba4a 100644 --- a/legacy-js/components/email.js +++ b/legacy-js/components/email.js @@ -1,8 +1,8 @@ 'use strict'; -var React = require('react'); +import React from 'react'; -module.exports = class extends React.Component { +export default class extends React.Component { render() { return info@koodiklinikka.fi; } diff --git a/legacy-js/components/fader.js b/legacy-js/components/fader.js index 080acf4..a4e6116 100644 --- a/legacy-js/components/fader.js +++ b/legacy-js/components/fader.js @@ -1,12 +1,12 @@ 'use strict'; -var React = require('react'); +import React from 'react'; function clamp(min, max, value) { return Math.min(Math.max(value, min), max); } -module.exports = class extends React.Component { +export default class extends React.Component { static defaultProps = { threshold: 100 }; diff --git a/legacy-js/components/feed.js b/legacy-js/components/feed.js index d6aa4e7..b9fb2b0 100644 --- a/legacy-js/components/feed.js +++ b/legacy-js/components/feed.js @@ -1,11 +1,10 @@ 'use strict'; -var React = require('react'); -var request = require('axios'); -var _ = require('lodash'); - -var transformers = require('../util'); -var api = require('../api'); +import React from 'react'; +import request from 'axios'; +import _ from 'lodash'; +import transformers from '../util'; +import api from '../api'; function throwError(err) { setTimeout(() => { @@ -14,7 +13,7 @@ function throwError(err) { }); } -module.exports = class extends React.Component { +export default class extends React.Component { state = { messages: [] }; diff --git a/legacy-js/components/inviteForm.js b/legacy-js/components/inviteForm.js index 218b863..f7a2277 100644 --- a/legacy-js/components/inviteForm.js +++ b/legacy-js/components/inviteForm.js @@ -1,12 +1,12 @@ 'use strict'; -var request = require('axios'); -var React = require('react'); -var classSet = require('classnames'); +import request from 'axios'; +import React from 'react'; +import classSet from 'classnames'; +import api from '../api'; +import Loader from './loader'; -var api = require('../api'); -var Loader = require('./loader'); -module.exports = class extends React.Component { +export default class extends React.Component { state = { email: '', submitted: false, diff --git a/legacy-js/components/loader.js b/legacy-js/components/loader.js index 80f58c2..6909701 100644 --- a/legacy-js/components/loader.js +++ b/legacy-js/components/loader.js @@ -1,6 +1,6 @@ -const React = require('react'); +import React from 'react'; -module.exports = function Loader() { +export default function Loader() { return (
diff --git a/legacy-js/components/members.js b/legacy-js/components/members.js index 76abe36..2a850c9 100644 --- a/legacy-js/components/members.js +++ b/legacy-js/components/members.js @@ -1,12 +1,11 @@ 'use strict'; -var React = require('react'); -var request = require('axios'); -var _ = require('lodash'); +import React from 'react'; +import request from 'axios'; +import _ from 'lodash'; +import api from '../api'; -var api = require('../api'); - -module.exports = class extends React.Component { +export default class extends React.Component { state = { members: [] }; diff --git a/legacy-js/components/membershipForm.js b/legacy-js/components/membershipForm.js index 4962048..b61d46e 100644 --- a/legacy-js/components/membershipForm.js +++ b/legacy-js/components/membershipForm.js @@ -1,7 +1,7 @@ import React from 'react'; import MembershipInfoForm from './membershipInfoForm'; -module.exports = class extends React.Component { +export default class extends React.Component { state = { signupSuccess: false }; diff --git a/legacy-js/components/membershipInfoForm.js b/legacy-js/components/membershipInfoForm.js index 365ef80..f0862fe 100644 --- a/legacy-js/components/membershipInfoForm.js +++ b/legacy-js/components/membershipInfoForm.js @@ -1,13 +1,13 @@ "use strict"; -var _ = require("lodash"); -var request = require("axios"); -var React = require("react"); -var classSet = require("classnames"); - -var api = require("../api"); -var Loader = require("./loader"); -var config = require("../../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 = { address: { fi: "Osoite" }, @@ -29,7 +29,7 @@ function getUserInfo(state) { return _.pick(state, fieldNames); } -module.exports = class extends React.Component { +export default class extends React.Component { state = { address: "", city: "", diff --git a/legacy-js/config.js b/legacy-js/config.js index 84d5d3b..95b8eff 100644 --- a/legacy-js/config.js +++ b/legacy-js/config.js @@ -11,6 +11,6 @@ var production = { } } -module.exports = function () { +export default function () { return process.env.ENV == 'development' ? development : production; -} +}; diff --git a/legacy-js/main.js b/legacy-js/main.js index ba585f8..38169fa 100644 --- a/legacy-js/main.js +++ b/legacy-js/main.js @@ -1,7 +1,7 @@ 'use strict'; -require('./ga'); -let ReactDOM = require('react-dom'); -var React = require('react'); +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')); diff --git a/legacy-js/util.js b/legacy-js/util.js index e121eb5..c0b7a18 100644 --- a/legacy-js/util.js +++ b/legacy-js/util.js @@ -1,12 +1,12 @@ 'use strict'; -var _ = require('lodash'); -var githubEvent = require('parse-github-event'); -var twitterText = require('twitter-text'); +import _ from 'lodash'; +import githubEvent from 'parse-github-event'; +import twitterText from 'twitter-text'; const isVisibleGithubEvent = ({type}) => type !== 'PushEvent' && type !== 'DeleteEvent'; -module.exports = { +export default { github(items) { return items.filter(isVisibleGithubEvent).map((item) => {