From cf673470f889b0e36f24ce58391dcf93a0695695 Mon Sep 17 00:00:00 2001
From: developomp <developomp@gmail.com>
Date: Sun, 30 May 2021 17:27:30 +0900
Subject: [PATCH] chagned Home component name to PostList, organized import
 statements to be more readable, separated langauge context so there's one
 export in App.tsx, removed component={<Component>} format from Route Switch
 in App.tsx

---
 source/src/App.tsx                            | 92 ++++++++-----------
 source/src/LangaugeContext.ts                 |  7 ++
 .../src/components/LanguageToggleButton.tsx   |  3 +-
 source/src/components/Navbar.tsx              | 19 ++--
 source/src/components/SearchBox.tsx           |  1 +
 source/src/components/Sidebar.tsx             |  4 +-
 source/src/components/ThemeToggleButton.tsx   |  1 -
 source/src/index.tsx                          |  5 +-
 source/src/pages/notfound.tsx                 |  3 +-
 source/src/pages/page.tsx                     |  5 +-
 source/src/pages/portfolio.tsx                |  1 -
 source/src/pages/{home.tsx => postList.tsx}   | 34 ++++---
 12 files changed, 89 insertions(+), 86 deletions(-)
 create mode 100644 source/src/LangaugeContext.ts
 rename source/src/pages/{home.tsx => postList.tsx} (81%)

diff --git a/source/src/App.tsx b/source/src/App.tsx
index d37c158..2da95c1 100644
--- a/source/src/App.tsx
+++ b/source/src/App.tsx
@@ -1,16 +1,17 @@
-import React, { createContext } from "react"
-import { BrowserRouter as Router, Switch, Route } from "react-router-dom"
+import React from "react"
+import { Switch, Route } from "react-router-dom"
 import { ThemeProvider, createGlobalStyle } from "styled-components"
 import { HelmetProvider } from "react-helmet-async"
 import storage from "local-storage-fallback"
 
 import theming from "./theming"
+import { LanguageContext } from "./LangaugeContext"
 
 import Spinner from "./components/Spinner"
 import Navbar from "./components/Navbar"
 import Footer from "./components/Footer"
 
-import Home from "./pages/home"
+import PostList from "./pages/postList"
 import Page from "./pages/page"
 import NotFound from "./pages/notfound"
 import Portfolio from "./pages/portfolio"
@@ -134,12 +135,6 @@ interface AppState {
 	currentLanguage: string
 }
 
-export const LanguageContext = createContext({
-	language: "",
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
-	toggleLanguage: () => {},
-})
-
 export default class App extends React.Component<AppProps, AppState> {
 	constructor(props) {
 		super(props)
@@ -183,7 +178,6 @@ export default class App extends React.Component<AppProps, AppState> {
 				<ThemeProvider
 					theme={{
 						currentTheme: this.state.currentTheme,
-						// eslint-disable-next-line @typescript-eslint/no-unused-vars
 						setTheme: (setThemeTo) =>
 							this.setState({ currentTheme: setThemeTo }), // make setTheme function available in other components
 					}}
@@ -203,50 +197,44 @@ export default class App extends React.Component<AppProps, AppState> {
 						}}
 					>
 						<GlobalStyle />
-						<Router>
-							<Navbar />
-							<div id="content">
-								{this.state.isLoading ? (
-									<Spinner size={200} />
-								) : (
-									<Switch>
-										<Route
-											exact
-											path="/"
-											component={() => (
-												<Home
-													howMany={4}
-													title="Home"
-												/>
-											)}
+						<Navbar />
+						<div id="content">
+							{this.state.isLoading ? (
+								<Spinner size={200} />
+							) : (
+								<Switch>
+									<Route exact path="/">
+										<PostList
+											key="home"
+											howMany={4}
+											title="Home"
 										/>
-										<Route
-											exact
-											path="/archives"
-											component={() => (
-												<Home title="Archives" />
-											)}
+									</Route>
+
+									<Route exact path="/archives">
+										<PostList
+											key="archives"
+											title="Archives"
 										/>
-										<Route
-											exact
-											path="/portfolio"
-											component={Portfolio}
-										/>
-										<Route
-											exact
-											path="/404"
-											component={NotFound}
-										/>
-										<Route
-											exact
-											path="/:path*"
-											component={Page}
-										/>
-									</Switch>
-								)}
-							</div>
-							<Footer />
-						</Router>
+									</Route>
+
+									<Route exact path="/portfolio">
+										<Portfolio />
+									</Route>
+
+									<Route exact path="/404">
+										<NotFound />
+									</Route>
+
+									<Route exact path="/:path">
+										{({ match }) => (
+											<Page key={match.params.path} />
+										)}
+									</Route>
+								</Switch>
+							)}
+						</div>
+						<Footer />
 					</LanguageContext.Provider>
 				</ThemeProvider>
 			</HelmetProvider>
diff --git a/source/src/LangaugeContext.ts b/source/src/LangaugeContext.ts
new file mode 100644
index 0000000..8498595
--- /dev/null
+++ b/source/src/LangaugeContext.ts
@@ -0,0 +1,7 @@
+import { createContext } from "react"
+
+export const LanguageContext = createContext({
+	language: "",
+	// eslint-disable-next-line @typescript-eslint/no-empty-function
+	toggleLanguage: () => {},
+})
diff --git a/source/src/components/LanguageToggleButton.tsx b/source/src/components/LanguageToggleButton.tsx
index 16ea10b..ebf2fce 100644
--- a/source/src/components/LanguageToggleButton.tsx
+++ b/source/src/components/LanguageToggleButton.tsx
@@ -4,9 +4,10 @@ import { faLanguage } from "@fortawesome/free-solid-svg-icons"
 import styled from "styled-components"
 import ReactTooltip from "react-tooltip"
 
-import { LanguageContext } from "../App"
 import theming from "../theming"
 
+import { LanguageContext } from "../LangaugeContext"
+
 interface StyledThemeButtonProps {
 	language: string
 }
diff --git a/source/src/components/Navbar.tsx b/source/src/components/Navbar.tsx
index e353daf..fa07b14 100644
--- a/source/src/components/Navbar.tsx
+++ b/source/src/components/Navbar.tsx
@@ -3,10 +3,11 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import { faGithub } from "@fortawesome/free-brands-svg-icons"
 import styled from "styled-components"
 import ReactTooltip from "react-tooltip"
-import NavbarData from "../data/NavbarData"
-import theming from "../theming"
-
 import { Link } from "react-router-dom"
+
+import theming from "../theming"
+import NavbarData from "../data/NavbarData"
+
 import SearchBox from "./SearchBox"
 import Sidebar from "./Sidebar"
 import ThemeToggleButton from "./ThemeToggleButton"
@@ -63,13 +64,11 @@ export default class Navbar extends React.Component {
 					/>
 				</Link>
 				<this.StyledNavLinks>
-					{NavbarData.map((item, index) => {
-						return (
-							<this.StyledLink key={index} to={item.path}>
-								{item.title}
-							</this.StyledLink>
-						)
-					})}
+					{NavbarData.map((item, index) => (
+						<this.StyledLink key={index} to={item.path}>
+							{item.title}
+						</this.StyledLink>
+					))}
 				</this.StyledNavLinks>
 
 				<ThemeToggleButton />
diff --git a/source/src/components/SearchBox.tsx b/source/src/components/SearchBox.tsx
index 9e2ddce..51227fd 100644
--- a/source/src/components/SearchBox.tsx
+++ b/source/src/components/SearchBox.tsx
@@ -2,6 +2,7 @@ import React from "react"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import { faSearch } from "@fortawesome/free-solid-svg-icons"
 import styled from "styled-components"
+
 import theming from "../theming"
 
 export default class Navbar extends React.Component {
diff --git a/source/src/components/Sidebar.tsx b/source/src/components/Sidebar.tsx
index fd9229b..ec9fefd 100644
--- a/source/src/components/Sidebar.tsx
+++ b/source/src/components/Sidebar.tsx
@@ -1,12 +1,12 @@
 import React from "react"
 import styled, { css } from "styled-components"
-import NavbarData, { Item } from "../data/NavbarData"
 import ReactTooltip from "react-tooltip"
-
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import { faEllipsisV, faTimes } from "@fortawesome/free-solid-svg-icons"
 
 import theming from "../theming"
+import NavbarData, { Item } from "../data/NavbarData"
+
 import SubMenu from "./SubMenu"
 
 interface SidebarProps {}
diff --git a/source/src/components/ThemeToggleButton.tsx b/source/src/components/ThemeToggleButton.tsx
index cf04240..03e2069 100644
--- a/source/src/components/ThemeToggleButton.tsx
+++ b/source/src/components/ThemeToggleButton.tsx
@@ -2,7 +2,6 @@ import React from "react"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import { faMoon, faSun } from "@fortawesome/free-solid-svg-icons"
 import styled, { ThemeConsumer } from "styled-components"
-
 import ReactTooltip from "react-tooltip"
 
 import theming from "../theming"
diff --git a/source/src/index.tsx b/source/src/index.tsx
index 23d2bd3..16c1265 100644
--- a/source/src/index.tsx
+++ b/source/src/index.tsx
@@ -1,12 +1,15 @@
 import React from "react"
 import ReactDOM from "react-dom"
+import { BrowserRouter } from "react-router-dom"
 
 import App from "./App"
 import reportWebVitals from "./reportWebVitals"
 
 ReactDOM.render(
 	<React.StrictMode>
-		<App />
+		<BrowserRouter>
+			<App />
+		</BrowserRouter>
 	</React.StrictMode>,
 	document.getElementById("root")
 )
diff --git a/source/src/pages/notfound.tsx b/source/src/pages/notfound.tsx
index 4eca24e..a0911f3 100644
--- a/source/src/pages/notfound.tsx
+++ b/source/src/pages/notfound.tsx
@@ -1,8 +1,9 @@
 import React from "react"
 import styled from "styled-components"
-import theming from "../theming"
 import { Helmet } from "react-helmet-async"
 
+import theming from "../theming"
+
 export default class NotFound extends React.Component {
 	StyledNotFound = styled.div`
 		margin: auto;
diff --git a/source/src/pages/page.tsx b/source/src/pages/page.tsx
index 2217415..1117b08 100644
--- a/source/src/pages/page.tsx
+++ b/source/src/pages/page.tsx
@@ -1,10 +1,11 @@
 import React from "react"
 import marked from "marked"
-import NotFound from "./notfound"
 import { Helmet } from "react-helmet-async"
 
 import pages from "../pages.json"
 
+import NotFound from "./notfound"
+
 export default class Page extends React.Component {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	fetched: any
@@ -12,7 +13,7 @@ export default class Page extends React.Component {
 	constructor(props) {
 		super(props)
 
-		const fetched = pages[props.location.pathname]
+		const fetched = pages[location.pathname]
 		if (!fetched) return
 
 		fetched.content = fetched?.content ? fetched.content : "No content"
diff --git a/source/src/pages/portfolio.tsx b/source/src/pages/portfolio.tsx
index 79b1d45..cb13919 100644
--- a/source/src/pages/portfolio.tsx
+++ b/source/src/pages/portfolio.tsx
@@ -1,5 +1,4 @@
 import React from "react"
-
 import styled from "styled-components"
 import { Helmet } from "react-helmet-async"
 
diff --git a/source/src/pages/home.tsx b/source/src/pages/postList.tsx
similarity index 81%
rename from source/src/pages/home.tsx
rename to source/src/pages/postList.tsx
index 7a530ce..7a37740 100644
--- a/source/src/pages/home.tsx
+++ b/source/src/pages/postList.tsx
@@ -1,18 +1,18 @@
 import React from "react"
 import { Link } from "react-router-dom"
 import styled from "styled-components"
-import theming from "../theming"
 import marked from "marked"
 import { Helmet } from "react-helmet-async"
 
+import theming from "../theming"
 import pages from "../pages.json"
 
 interface HomeProps {
-	title?: string
+	title: string
 	howMany?: number
 }
 
-export default class Home extends React.Component<HomeProps, { lol: boolean }> {
+export default class PostList extends React.Component<HomeProps> {
 	h1Text: string
 	PostCards: Array<unknown> = []
 
@@ -20,11 +20,12 @@ export default class Home extends React.Component<HomeProps, { lol: boolean }> {
 		padding-top: 2rem;
 		margin: auto;
 		text-align: center;
-		color: ${(props) =>
+		color: white;
+		/* color: ${(props) =>
 			theming.theme(props.theme.currentTheme, {
 				light: "#111111",
 				dark: "#EEEEEE",
-			})};
+			})}; */
 	`
 
 	StyledH1 = styled.h1`
@@ -61,20 +62,17 @@ export default class Home extends React.Component<HomeProps, { lol: boolean }> {
 
 	constructor(props) {
 		super(props)
-		let howMany = props.howMany
-		const isLimited = Boolean(howMany)
 
-		this.h1Text = isLimited ? "All posts" : `${howMany} recent posts`
+		let howMany = props.howMany | 0
+
+		const isLimited = howMany ? true : false
+
+		this.h1Text = isLimited ? `${howMany} recent posts` : "All posts"
 
 		for (const pagePath in pages) {
 			if (isLimited && howMany <= 0) continue
 
 			const post = pages[pagePath]
-			post.title = post.meta?.title ? post.meta.title : "Unknown title"
-			post.date = post.meta?.date ? post.meta.date : "Unknown date"
-			post.author = post.meta?.author
-				? post.meta.author
-				: "Unknown author"
 
 			this.PostCards.push(
 				<this.StyledPostCard
@@ -83,11 +81,17 @@ export default class Home extends React.Component<HomeProps, { lol: boolean }> {
 				>
 					<this.StyledTitle>
 						<this.StyledLink to={pagePath}>
-							{post.title}
+							{post.meta?.title
+								? post.meta.title
+								: "Unknown title"}
 						</this.StyledLink>
 					</this.StyledTitle>
 					<small>
-						Published on {post.date} by {post.author}
+						Published on{" "}
+						{post.meta?.date ? post.meta.date : "Unknown date"} by{" "}
+						{post.meta?.author
+							? post.meta.author
+							: "Unknown author"}
 					</small>
 					<hr />
 					<div