diff --git a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx index a3006fcd6..60eac4882 100644 --- a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx +++ b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx @@ -1,10 +1,10 @@ import { Box, HStack, VStack } from './../../elements/LayoutPrimitives' -import { useGetLibraryItemsQuery } from '../../../lib/networking/queries/useGetLibraryItemsQuery' -import { useGetViewerQuery } from '../../../lib/networking/queries/useGetViewerQuery' import type { LibraryItem, LibraryItemsQueryInput, } from '../../../lib/networking/queries/useGetLibraryItemsQuery' +import { useGetLibraryItemsQuery } from '../../../lib/networking/queries/useGetLibraryItemsQuery' +import { useGetViewerQuery } from '../../../lib/networking/queries/useGetViewerQuery' import { LinkedItemCardAction } from '../../patterns/LibraryCards/CardTypes' import { LinkedItemCard } from '../../patterns/LibraryCards/LinkedItemCard' import { useRouter } from 'next/router' @@ -41,19 +41,24 @@ import { isVipUser } from '../../../lib/featureFlag' import { EmptyLibrary } from './EmptyLibrary' import TopBarProgress from 'react-topbar-progress-indicator' - export type LayoutType = 'LIST_LAYOUT' | 'GRID_LAYOUT' export type HomeFeedContainerProps = { scrollElementRef: React.RefObject } -const SAVED_SEARCHES: Record = { - 'Inbox': '', +const timeZoneHourDiff = -new Date().getTimezoneOffset() / 60 + +const SAVED_SEARCHES: Record = { + Inbox: `in:inbox`, 'Read Later': `in:inbox -label:Newsletter`, - 'Highlighted': `in:inbox has:highlights`, - 'Today': `in:inbox saved:${new Date(new Date().getTime() - (24 * 3600000)).toISOString().split('T')[0]}..*`, - 'Newsletters': `in:inbox label:Newsletter`, + Highlighted: `in:inbox has:highlights`, + Today: `in:inbox saved:${ + new Date(new Date().getTime() - 24 * 3600000).toISOString().split('T')[0] + }Z${timeZoneHourDiff.toLocaleString('en-US', { + signDisplay: 'always', + })}..*`, + Newsletters: `in:inbox label:Newsletter`, } export function HomeFeedContainer(props: HomeFeedContainerProps): JSX.Element { @@ -535,7 +540,7 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element { }} > - {(props.isValidating && props.items.length == 0 && )} + {props.isValidating && props.items.length == 0 && } {viewerData?.me && isVipUser(viewerData?.me) && ( - - {Object.keys(SAVED_SEARCHES).map(key => { + + {Object.keys(SAVED_SEARCHES).map((key) => { const searchQuery = SAVED_SEARCHES[key] - const style = searchQuery === props.searchTerm || (!props.searchTerm && !searchQuery) ? 'ctaDarkYellow' : 'ctaLightGray' + const style = + searchQuery === props.searchTerm || + (!props.searchTerm && !searchQuery) + ? 'ctaDarkYellow' + : 'ctaLightGray' return ( - ) - }) - } + })} )} - {!props.isValidating && props.items.length == 0 ? { props.setShowAddLinkModal(true) }} /> : ( + {!props.isValidating && props.items.length == 0 ? ( + { + props.setShowAddLinkModal(true) + }} + /> + ) : ( ))} + )} + + {props.hasMore ? ( + + ) : ( + )} - - {props.hasMore ? ( - - ) : ( - - )} - + {props.showAddLinkModal && ( props.setShowAddLinkModal(false)} /> @@ -771,10 +808,10 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element { linkId={props.labelsTarget.node.id} labels={props.labelsTarget.node.labels} articleActionHandler={(action, value) => { - switch(action) { + switch (action) { case 'refreshLabels': if (props.labelsTarget) { - props.labelsTarget.node.labels = value as (Label[] | undefined) + props.labelsTarget.node.labels = value as Label[] | undefined updateState({}) } break