From 3e9c0cfb134eeabcb12b99ed4d5291a763523d98 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 24 Jan 2019 17:04:07 -0800 Subject: [PATCH 1/5] Init --- backend/package-lock.json | 28 +++++++++++++++++++++------- frontend/package-lock.json | 28 +++++++++++++++++++++------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index fb6b854..c015043 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1526,11 +1526,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1543,15 +1545,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1654,7 +1659,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1664,6 +1670,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1676,17 +1683,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -1703,6 +1713,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1775,7 +1786,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1785,6 +1797,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1890,6 +1903,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 88a7768..8952f80 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -4520,11 +4520,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4537,15 +4539,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4648,7 +4653,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4658,6 +4664,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4670,17 +4677,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4697,6 +4707,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4769,7 +4780,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4779,6 +4791,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4884,6 +4897,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", From 03822fb27eb8fdd6b2bfa2ed284b43aaf6173e8d Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 26 Jan 2019 03:15:15 -0800 Subject: [PATCH 2/5] Remove search, add categories. --- frontend/components/Categories.js | 159 +++++++++++++++++++++ frontend/components/Header.js | 2 +- frontend/components/Home.js | 23 +-- frontend/components/InnerHeader.js | 2 +- frontend/components/MoreCategories.js | 78 ++++++++++ frontend/styles/abstracts/_mixins.scss | 26 ++++ frontend/styles/abstracts/_variables.scss | 5 +- frontend/styles/components/categories.scss | 14 ++ frontend/styles/components/posts.scss | 3 + frontend/styles/main.scss | 2 +- 10 files changed, 299 insertions(+), 15 deletions(-) create mode 100644 frontend/components/Categories.js create mode 100644 frontend/components/MoreCategories.js create mode 100644 frontend/styles/components/categories.scss diff --git a/frontend/components/Categories.js b/frontend/components/Categories.js new file mode 100644 index 0000000..06cbca7 --- /dev/null +++ b/frontend/components/Categories.js @@ -0,0 +1,159 @@ +import React from 'react' +import MoreCategories from './MoreCategories' + +class Categories extends React.Component { + state = { + open: false, + } + + handleClick = () => { + this.setState({ open: !this.state.open }) + } + + render() { + return ( + <> +
+ + + + + + + + +
+ + + ) + } +} + +export default Categories diff --git a/frontend/components/Header.js b/frontend/components/Header.js index 1c47a52..caeebc3 100644 --- a/frontend/components/Header.js +++ b/frontend/components/Header.js @@ -25,7 +25,7 @@ const Header = props => } -