From f352be308b4d09a7c2b7b6188893f1317b321754 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 24 Sep 2018 14:55:14 -0400 Subject: [PATCH 1/2] refactor attempt --- app/components/feature-links.js | 29 +---------------------------- app/views/redirect.js | 2 +- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/app/components/feature-links.js b/app/components/feature-links.js index b406f4a..c1b565a 100644 --- a/app/components/feature-links.js +++ b/app/components/feature-links.js @@ -1,11 +1,5 @@ "use strict"; - - -// P A C K A G E - -import Component from "choo/component"; - // V A R I A B L E const links = [ // TODO: Update images @@ -45,13 +39,7 @@ const links = [ // TODO: Update images } ]; - - -// P R O G R A M - -FeaturedLinks.prototype = Object.create(Component.prototype); - -FeaturedLinks.prototype.createElement = () => { +export default function () { const renderedLinks = []; let imageLink = ""; @@ -65,21 +53,6 @@ FeaturedLinks.prototype.createElement = () => { `; }; - - -// E X P O R T - -module.exports = exports = FeaturedLinks; - - - -// H E L P E R S - -function FeaturedLinks() { - if (!(this instanceof FeaturedLinks)) return new FeaturedLinks(); - Component.call(this); -} - function returnLinkTemplate(url, title, image) { return `
  • diff --git a/app/views/redirect.js b/app/views/redirect.js index 67b164b..598dc57 100644 --- a/app/views/redirect.js +++ b/app/views/redirect.js @@ -146,7 +146,7 @@ function partialFinder(markdownBody) { if (fileExistsTest) { const partialFunction = require(path.join(__dirname, "..", `./components/${filename}.js`)); - if (filename === "ecosystem" || filename === "feature-links") { + if (filename === "ecosystem") { const neatPartial = new partialFunction; markdownBody = markdownBody.replace(partial, neatPartial.render()); } From 849d6d3597c1d7b4c53f6f1e27b2ce4078054d5b Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 24 Sep 2018 14:58:49 -0400 Subject: [PATCH 2/2] eliminate another partial special case --- app/components/ecosystem.js | 29 +---------------------------- app/views/redirect.js | 9 ++------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/app/components/ecosystem.js b/app/components/ecosystem.js index 3b83a2f..3dd2b52 100644 --- a/app/components/ecosystem.js +++ b/app/components/ecosystem.js @@ -1,11 +1,5 @@ "use strict"; - - -// P A C K A G E - -import Component from "choo/component"; - // V A R I A B L E S const APPLICATIONS = require("./ecosystem/module-applications"); @@ -16,13 +10,7 @@ const LIGHTHOUSE = require("./ecosystem/submodule-lighthouse"); const REFLECTOR = require("./ecosystem/submodule-reflector"); const WALLET = require("./ecosystem/submodule-wallet"); - - -// P R O G R A M - -Ecosystem.prototype = Object.create(Component.prototype); - -Ecosystem.prototype.createElement = () => { +export default function () { return `
    `; }; - - - -// E X P O R T - -module.exports = exports = Ecosystem; - - - -// H E L P E R S - -function Ecosystem() { - if (!(this instanceof Ecosystem)) return new Ecosystem(); - Component.call(this); -} diff --git a/app/views/redirect.js b/app/views/redirect.js index 598dc57..4244f13 100644 --- a/app/views/redirect.js +++ b/app/views/redirect.js @@ -145,13 +145,8 @@ function partialFinder(markdownBody) { if (fileExistsTest) { const partialFunction = require(path.join(__dirname, "..", `./components/${filename}.js`)); - - if (filename === "ecosystem") { - const neatPartial = new partialFunction; - markdownBody = markdownBody.replace(partial, neatPartial.render()); - } - - else if (filename === "glossary-toc") markdownBody = markdownBody.replace(partial, partialFunction); + + if (filename === "glossary-toc") markdownBody = markdownBody.replace(partial, partialFunction); else markdownBody = markdownBody.replace(partial, partialFunction.default()); }