From 9511da373cd125b05f18ef182b10dd007416e847 Mon Sep 17 00:00:00 2001 From: Kyle Gill Date: Fri, 31 May 2019 19:52:00 -0600 Subject: [PATCH] feat: add day of week to calendar menu --- src/routes/Month.js | 47 +++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/src/routes/Month.js b/src/routes/Month.js index 0d18322..10b192f 100644 --- a/src/routes/Month.js +++ b/src/routes/Month.js @@ -11,23 +11,24 @@ import { startOfMonth, } from "date-fns" +import { SIZES } from "styles/constants" + import { AppLink as Link } from "components/elements" import Seek from "components/Seek" -const YearCardGrid = styled.div` +const DayCardGrid = styled.div` display: grid; - grid-template-columns: repeat(auto-fit, minmax(75px, 1fr)); + grid-template-columns: repeat(auto-fit, minmax(100px, 1fr)); grid-gap: 20px; margin-top: 20px; ` -const YearCard = styled.div` +const DayCard = styled.div` color: ${props => props.disabled ? props.theme.colors.quarternary : props.theme.colors.secondary}; border: 1px solid; border-color: ${props => props.theme.colors.quarternary}; - padding: 25px; border-radius: 5px; text-align: center; user-select: none; @@ -35,6 +36,20 @@ const YearCard = styled.div` border-color: ${props => !props.disabled && props.theme.colors.tertiary}; } ` +const DayCardBanner = styled.div` + font-size: ${SIZES.tiny}; + position: relative; + top: -0px; + background-color: ${props => props.theme.colors.headerBackground}; + border-bottom: 1px solid; + border-bottom-color: ${props => props.theme.colors.quarternary}; + border-top-left-radius: 5px; + border-top-right-radius: 5px; + padding: 5px 0px; +` +const DayCardContent = styled.div` + padding: 20px 25px; +` class Month extends Component { render() { @@ -47,23 +62,31 @@ class Month extends Component { dayIndexesToInclude = new Date().getDate() } - let yearCards = [] + let dayCards = [] for (let i = 0; i < getDaysInMonth(currentDay); i++) { const isDisabled = dayIndexesToInclude <= i && isThisMonth(currentDay) if (isDisabled) { - yearCards.push( - - {i + 1} - + dayCards.push( + + + {format(new Date(year, month - 1, i + 1), "dddd")} + + {i + 1} + ) } else { - yearCards.push( + dayCards.push( - {i + 1} + + + {format(new Date(year, month - 1, i + 1), "dddd")} + + {i + 1} + ) } @@ -80,7 +103,7 @@ class Month extends Component { startOfMonth(subMonths(new Date(), 1)) )} /> - {yearCards} + {dayCards} ) }