revert grouping by day on YearPage

Author: pwfisher

explorer/__fixtures__/index.ts

@@ -0,0 +1 @@
+export * from './drawings'

explorer/components/DayPage.tsx

@@ -6,7 +6,7 @@ import styled from 'styled-components'
 import { getPreviousDay, getNextDay } from '../lib/drawings'
 import { useRouter } from 'next/router'
 import Div100vh from 'react-div-100vh'
-import { dayDrawingSets } from '../__fixtures__/drawings'
+import { dayDrawingSets } from '../__fixtures__'
 
 export const DayPage: React.FC<{ day: string }> = ({ day }) => {
   const drawings = dayDrawingSets[day]

explorer/components/HomePage.tsx

@@ -1,6 +1,6 @@
 import Link from 'next/link'
 import { PageLayout } from './PageLayout'
-import { drawingYears } from '../__fixtures__/drawings'
+import { drawingYears } from '../__fixtures__'
 import styled from 'styled-components'
 
 export const HomePage = () => (

explorer/components/YearBar.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { drawingYears } from '../__fixtures__/drawings'
+import { drawingYears } from '../__fixtures__'
 import styled from 'styled-components'
 import Link from 'next/link'
 

explorer/components/YearPage.tsx

@@ -1,27 +1,18 @@
-import React from 'react'
 import { PageLayout } from './PageLayout'
 import { DrawingTile } from './DrawingTile'
 import styled from 'styled-components'
 import { YearBar } from './YearBar'
-import { dayDrawingSetsByYear } from '../__fixtures__/drawings'
+import { yearDrawingSets } from '../__fixtures__'
 
 export const YearPage: React.FC<{ year: number }> = ({ year }) => {
-  const dayDrawingSets = dayDrawingSetsByYear[year]
-  const dates = Object.keys(dayDrawingSets)
+  const drawings = yearDrawingSets[year]
   return (
     <PageLayout title={`explodingdog ${year}`}>
       <YearBar activeYear={year} />
       <YearHeading>{year}</YearHeading>
       <DrawingSection>
-        {dates.map(date => (
-          <DrawingDate>
-            <DrawingDateHeading>{date}</DrawingDateHeading>
-            <DrawingDateTiles>
-              {dayDrawingSets[date].map(drawing => (
-                <DrawingTile key={`${drawing.date} ${drawing.slug}`} {...drawing} />
-              ))}
-            </DrawingDateTiles>
-          </DrawingDate>
+        {drawings && drawings.map(drawing => (
+          <DrawingTile key={`${drawing.date} ${drawing.slug}`} {...drawing} />
         ))}
       </DrawingSection>
     </PageLayout>
@@ -36,18 +27,3 @@ const YearHeading = styled.h1.attrs({ className: 'Explorer__YearPage__YearHeadin
 const DrawingSection = styled.section.attrs({ className: 'Explorer__YearPage__DrawingSection'})`
   text-align: center;
 `
-
-const DrawingDate = styled.div.attrs({ className: 'Explorer__YearPage__DrawingDate'})`
-  margin: 24px 0 48px;
-`
-
-const DrawingDateHeading = styled.h3.attrs({ className: 'Explorer__YearPage__DrawingDateHeading'})`
-  align-items: center;
-  color: #BBB;
-  display: flex;
-  height: 48px;
-  justify-content: center;
-  margin: 0;
-`
-
-const DrawingDateTiles = styled.div.attrs({ className: 'Explorer__YearPage__DrawingDateTiles'})``

explorer/lib/drawings.ts

@@ -1,5 +1,5 @@
 import { Drawing } from '../types'
-import { drawings, drawingDays } from '../__fixtures__/drawings'
+import { drawings, drawingDays } from '../__fixtures__'
 
 export const getDrawingBySlug = (slug: string): Drawing | undefined => {
   return drawings.find(o => o.slug === slug)

explorer/pages/day/[id].tsx

@@ -1,6 +1,6 @@
 import { DayPage } from '../../components/DayPage'
 import { GetStaticProps, GetStaticPaths } from 'next'
-import { drawingDays } from '../../__fixtures__/drawings'
+import { drawingDays } from '../../__fixtures__'
 import { singleQueryParamValue } from '../../lib/next'
 
 export default DayPage

explorer/pages/drawing/[id].tsx

@@ -1,6 +1,6 @@
 import { DrawingPage } from '../../components/DrawingPage'
 import { GetStaticProps, GetStaticPaths } from 'next'
-import { drawings } from '../../__fixtures__/drawings'
+import { drawings } from '../../__fixtures__'
 import { getDrawingBySlug } from '../../lib/drawings'
 import { singleQueryParamValue } from '../../lib/next'
 

explorer/pages/year/[id].tsx

@@ -1,6 +1,6 @@
 import { YearPage } from '../../components/YearPage'
 import { GetStaticProps, GetStaticPaths } from 'next'
-import { drawingYears } from '../../__fixtures__/drawings'
+import { drawingYears } from '../../__fixtures__'
 
 export default YearPage