Merge pull request #64 from fabmob/imaginaires-tag

Imaginaires tag
fabmob · Apr 8, 2021 · cce9a8d · cce9a8d
2 parents 1cf511c + 271b1e2
commit cce9a8d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/code/Articles.js b/code/Articles.js
@@ -54,13 +54,14 @@ const Header = () => (
 )
 export default ({ year }) => {
 	let year2 = year || useParams().year
+	let tag = useParams().tag
 	return (
 		<div>
 			<Header />
 			<section>
 				<YearMenu year2={year2} />
 				<Link
-					to="/tag/imaginaires"
+					to="/blog/tag/imaginaires"
 					css={`
 						background: ${couleurImaginaires};
 						color: white;
@@ -96,7 +97,16 @@ export default ({ year }) => {
 								? -1
 								: 1
 						)
-						.filter((a) => new Date(a.attributes.date).getFullYear() == year2)
+						.filter((a) => {
+							const date = a.attributes.date,
+								goodDate = new Date(date).getFullYear() == year2
+
+							const tags = a.attributes.tags || [],
+								goodTag = tags.includes(tag)
+
+							return tag ? goodTag : !tags.includes('imaginaires') && goodDate
+						})
+
 						.map((a) => (
 							<li key={a.id}>
 								<ArticleVignette {...a} />

diff --git a/code/Blog.js b/code/Blog.js
@@ -19,6 +19,9 @@ export default ({}) => (
 				<Route path="/blog/année/:year">
 					<Articles />
 				</Route>
+				<Route path="/blog/tag/:tag">
+					<Articles />
+				</Route>
 				<Route path="/blog/">
 					<Articles year="2021" />
 				</Route>