From a07cc664c91e9c9b2d9d3d259134d9e45f99fbbe Mon Sep 17 00:00:00 2001
From: developomp <developomp@gmail.com>
Date: Wed, 4 Aug 2021 17:05:32 +0900
Subject: [PATCH] moved meta tags and implemented date range feature

---
 source/public/index.html    |  4 ++-
 source/src/App.tsx          | 12 ++------
 source/src/pages/Search.tsx | 59 +++++++++++++++++++++++++++++--------
 3 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/source/public/index.html b/source/public/index.html
index 76e9f78..b57802c 100644
--- a/source/public/index.html
+++ b/source/public/index.html
@@ -4,8 +4,10 @@
 		<meta charset="utf-8" />
 		<link rel="icon" href="%PUBLIC_URL%/icon/icon_circle.svg" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
+
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="developomp's website" />
+		<meta property="og:image" content="%PUBLIC_URL%/img/icon.png" />
+		<meta property="og:type" content="website" />
 
 		<link rel="preconnect" href="https://fonts.gstatic.com" />
 		<link
diff --git a/source/src/App.tsx b/source/src/App.tsx
index c363121..602b852 100644
--- a/source/src/App.tsx
+++ b/source/src/App.tsx
@@ -301,15 +301,12 @@ export default class App extends React.Component<AppProps, AppState> {
 						}}
 					>
 						<Helmet>
-							<meta property="og:type" content="website" />
-							<meta name="theme-color" content="#000000" />
-
 							<meta
 								property="og:site_name"
 								content="developomp"
 							/>
 
-							<meta property="og:title" content="developomp" />
+							<meta property="og:title" content="Home" />
 
 							<meta
 								property="og:description"
@@ -318,12 +315,7 @@ export default class App extends React.Component<AppProps, AppState> {
 
 							<meta
 								property="og:url"
-								content="https://developomp.com"
-							/>
-
-							<meta
-								property="og:image"
-								content="https://developomp.com/img/icon.png"
+								content={process.env.PUBLIC_URL}
 							/>
 						</Helmet>
 
diff --git a/source/src/pages/Search.tsx b/source/src/pages/Search.tsx
index 293e72e..899718e 100644
--- a/source/src/pages/Search.tsx
+++ b/source/src/pages/Search.tsx
@@ -44,6 +44,24 @@ const StyledSearchControlContainer = styled.div`
 	}
 `
 
+function isDateInRange(
+	dateToCompare: string,
+	from: string,
+	to: string
+): boolean {
+	if (!dateToCompare) throw Error("No date to compare")
+
+	const isFrom = !!from
+	const isTo = !!to
+
+	if (!isFrom && !isTo) return true
+	if (!isFrom && isTo) return Date.parse(dateToCompare) < Date.parse(to)
+	if (!isTo && isFrom) return Date.parse(dateToCompare) > Date.parse(from)
+
+	const compareDate = Date.parse(dateToCompare)
+	return Date.parse(from) < compareDate && compareDate < Date.parse(to)
+}
+
 // todo: find ways to get rid of wrapper component
 export default function Search() {
 	return <_Search />
@@ -70,7 +88,7 @@ function _Search() {
 
 	const [dateRange, setDateRange] = useState([
 		{
-			startDate: new Date(),
+			startDate: new Date(0),
 			endDate: null,
 			key: "selection",
 		},
@@ -84,15 +102,6 @@ function _Search() {
 		<>
 			<Helmet>
 				<title>pomp | Search</title>
-
-				<meta property="og:title" content="Search" />
-				<meta property="og:type" content="website" />
-				<meta property="og:url" content={process.env.PUBLIC_URL} />
-				<meta
-					property="og:image"
-					content={process.env.PUBLIC_URL + "/icon/icon.svg"}
-				/>
-				<meta property="og:description" content="search" />
 			</Helmet>
 
 			<StyledSearch className="card main-content">
@@ -182,6 +191,20 @@ function _Search() {
 							Search test 2
 						</button>
 						<br />
+						<button
+							onClick={() => {
+								setDateRange([
+									{
+										startDate: new Date(0),
+										endDate: null,
+										key: "selection",
+									},
+								])
+							}}
+						>
+							clear date
+						</button>
+						<br />
 						<button
 							onClick={() => {
 								try {
@@ -189,17 +212,29 @@ function _Search() {
 									for (const res of index.search(
 										searchInput
 									)) {
-										if (map.posts[res.ref]) {
+										const postData = map.posts[res.ref]
+										if (
+											// check if post data exists
+											postData &&
+											// check if date is within the range
+											isDateInRange(
+												postData.date,
+												query.from,
+												query.to
+											)
+										) {
 											_postCards.push(
 												<PostCard
 													key={res.ref}
 													postData={{
 														url: res.ref,
-														...map.posts[res.ref],
+														...postData,
 													}}
 												/>
 											)
 										}
+
+										// apply search result
 										setPostCards(_postCards)
 									}