From e3c256d61c46f0e24e9780fb75fdc26778d32c88 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 23 Sep 2019 16:05:11 +0300 Subject: [PATCH] Get rid of legacy JS --- TODO.md | 7 ++++ .../email.js => components/EmailComponent.jsx | 0 .../fader.js => components/Fader.jsx | 0 .../components/feed.js => components/Feed.jsx | 4 +- components/Footer.jsx | 26 ++++++++++--- .../InviteForm.jsx | 4 +- .../loader.js => components/Loader.jsx | 0 .../members.js => components/Members.jsx | 2 +- {legacy-js => components}/api.js | 0 .../feed-transformers.js | 0 .../membership/MembershipForm.jsx | 2 +- .../membership/MembershipInfoForm.jsx | 6 +-- legacy-js/config.js | 15 -------- legacy-js/ga.js | 16 -------- legacy-js/main.js | 38 ------------------- pages/_document.jsx | 3 +- pages/index.jsx | 13 +++++-- 17 files changed, 49 insertions(+), 87 deletions(-) create mode 100644 TODO.md rename legacy-js/components/email.js => components/EmailComponent.jsx (100%) rename legacy-js/components/fader.js => components/Fader.jsx (100%) rename legacy-js/components/feed.js => components/Feed.jsx (96%) rename legacy-js/components/inviteForm.js => components/InviteForm.jsx (97%) rename legacy-js/components/loader.js => components/Loader.jsx (100%) rename legacy-js/components/members.js => components/Members.jsx (96%) rename {legacy-js => components}/api.js (100%) rename legacy-js/util.js => components/feed-transformers.js (100%) rename legacy-js/components/membershipForm.js => components/membership/MembershipForm.jsx (95%) rename legacy-js/components/membershipInfoForm.js => components/membership/MembershipInfoForm.jsx (97%) delete mode 100644 legacy-js/config.js delete mode 100644 legacy-js/ga.js delete mode 100644 legacy-js/main.js diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..297acd0 --- /dev/null +++ b/TODO.md @@ -0,0 +1,7 @@ +* Google Analytics (ID `UA-58806132-1`) +* Stripe + * Test ID `pk_test_OmNve9H1OuORlmD4rblpjgzh` + * Prod ID `pk_live_xrnwdLNXbt20LMxpIDffJnnC` +* API integration (test backend `https://lit-plateau-4689.herokuapp.com/`) +* Hero video +* Twitter icons diff --git a/legacy-js/components/email.js b/components/EmailComponent.jsx similarity index 100% rename from legacy-js/components/email.js rename to components/EmailComponent.jsx diff --git a/legacy-js/components/fader.js b/components/Fader.jsx similarity index 100% rename from legacy-js/components/fader.js rename to components/Fader.jsx diff --git a/legacy-js/components/feed.js b/components/Feed.jsx similarity index 96% rename from legacy-js/components/feed.js rename to components/Feed.jsx index 187ef77..5b91de4 100644 --- a/legacy-js/components/feed.js +++ b/components/Feed.jsx @@ -3,8 +3,8 @@ import React from "react"; import request from "axios"; import _ from "lodash"; -import transformers from "../util"; -import api from "../api"; +import transformers from "./feed-transformers"; +import api from "./api"; function throwError(err) { setTimeout(() => { diff --git a/components/Footer.jsx b/components/Footer.jsx index 908e640..8fc7f45 100644 --- a/components/Footer.jsx +++ b/components/Footer.jsx @@ -1,22 +1,36 @@ +import EmailComponent from "./EmailComponent"; + export function Footer() { return ( diff --git a/legacy-js/components/inviteForm.js b/components/InviteForm.jsx similarity index 97% rename from legacy-js/components/inviteForm.js rename to components/InviteForm.jsx index 06de86f..653fe43 100644 --- a/legacy-js/components/inviteForm.js +++ b/components/InviteForm.jsx @@ -3,8 +3,8 @@ import request from "axios"; import React from "react"; import classSet from "classnames"; -import api from "../api"; -import Loader from "./loader"; +import api from "./api"; +import Loader from "./Loader"; export default class InviteForm extends React.Component { state = { diff --git a/legacy-js/components/loader.js b/components/Loader.jsx similarity index 100% rename from legacy-js/components/loader.js rename to components/Loader.jsx diff --git a/legacy-js/components/members.js b/components/Members.jsx similarity index 96% rename from legacy-js/components/members.js rename to components/Members.jsx index de856ab..4b9d081 100644 --- a/legacy-js/components/members.js +++ b/components/Members.jsx @@ -3,7 +3,7 @@ import React from "react"; import request from "axios"; import _ from "lodash"; -import api from "../api"; +import api from "./api"; export default class Members extends React.Component { state = { diff --git a/legacy-js/api.js b/components/api.js similarity index 100% rename from legacy-js/api.js rename to components/api.js diff --git a/legacy-js/util.js b/components/feed-transformers.js similarity index 100% rename from legacy-js/util.js rename to components/feed-transformers.js diff --git a/legacy-js/components/membershipForm.js b/components/membership/MembershipForm.jsx similarity index 95% rename from legacy-js/components/membershipForm.js rename to components/membership/MembershipForm.jsx index d0170d8..cdbe6a9 100644 --- a/legacy-js/components/membershipForm.js +++ b/components/membership/MembershipForm.jsx @@ -1,5 +1,5 @@ import React from "react"; -import MembershipInfoForm from "./membershipInfoForm"; +import MembershipInfoForm from "./MembershipInfoForm"; export default class MembershipForm extends React.Component { state = { diff --git a/legacy-js/components/membershipInfoForm.js b/components/membership/MembershipInfoForm.jsx similarity index 97% rename from legacy-js/components/membershipInfoForm.js rename to components/membership/MembershipInfoForm.jsx index dd3ed74..0d77ba2 100644 --- a/legacy-js/components/membershipInfoForm.js +++ b/components/membership/MembershipInfoForm.jsx @@ -5,9 +5,9 @@ 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(); +import Loader from "../Loader"; +//import configFactory from "../../config.js"; +//const config = configFactory(); var fieldNameTranslations = { address: { fi: "Osoite" }, diff --git a/legacy-js/config.js b/legacy-js/config.js deleted file mode 100644 index 3ba2a75..0000000 --- a/legacy-js/config.js +++ /dev/null @@ -1,15 +0,0 @@ -var development = { - stripe: { - publicKey: "pk_test_OmNve9H1OuORlmD4rblpjgzh" - } -}; - -var production = { - stripe: { - publicKey: "pk_live_xrnwdLNXbt20LMxpIDffJnnC" - } -}; - -export default function() { - return process.env.ENV == "development" ? development : production; -} diff --git a/legacy-js/ga.js b/legacy-js/ga.js deleted file mode 100644 index 5d12bde..0000000 --- a/legacy-js/ga.js +++ /dev/null @@ -1,16 +0,0 @@ -(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"); diff --git a/legacy-js/main.js b/legacy-js/main.js deleted file mode 100644 index b806e59..0000000 --- a/legacy-js/main.js +++ /dev/null @@ -1,38 +0,0 @@ -"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") -); - -const pathName = window.location.pathname; - -document - .querySelectorAll(".email") - .forEach(element => ReactDOM.render(email(), element)); - -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( - React.createElement("div", {}, [members({ key: 0 }), members({ key: 1 })]), - document.getElementById("members") - ); -} diff --git a/pages/_document.jsx b/pages/_document.jsx index d334cee..ef683d7 100644 --- a/pages/_document.jsx +++ b/pages/_document.jsx @@ -1,5 +1,6 @@ import Document, { Html, Head, Main, NextScript } from "next/document"; import { Footer } from "../components/Footer"; +import Fader from '../components/Fader'; class MyDocument extends Document { static async getInitialProps(ctx) { @@ -53,7 +54,7 @@ class MyDocument extends Document {