diff --git a/react-app/src/components/FeedItem/FeedItem.scss b/react-app/src/components/FeedItem/FeedItem.scss new file mode 100644 index 000000000..0acbb0398 --- /dev/null +++ b/react-app/src/components/FeedItem/FeedItem.scss @@ -0,0 +1,69 @@ +@use "../../styles/media" as *; + +.item-block { +p { + margin: 2px 0; + + @media #{$mobile-only} { + margin-bottom: 5px; + margin-top: 0; + } + } + + a { + cursor: pointer; + text-decoration: none; + } + + .title { + font-size: 16px; + font-family: Verdana, Geneva, sans-serif; + } + + .subtext-laptop { + font-size: 12px; + font-weight: bold; + letter-spacing: 0.5px; + + a { + &:hover { + text-decoration: underline; + }; + } + @media #{$mobile-only} { + display: none; + } + } + + .subtext-palm { + font-size: 13px; + font-weight: bold; + letter-spacing: 0.5px; + + a { + &:hover { + text-decoration: underline; + }; + } + + .details { + margin-top: 5px; + + .right { + float: right; + } + } + @media #{$laptop-only} { + display: none; + } + } + + .domain { + color: #696969; + letter-spacing: 0.5px; + } + + .item-details { + padding: 10px; + } +} diff --git a/react-app/src/components/FeedItem/FeedItem.tsx b/react-app/src/components/FeedItem/FeedItem.tsx new file mode 100644 index 000000000..54f66cb4b --- /dev/null +++ b/react-app/src/components/FeedItem/FeedItem.tsx @@ -0,0 +1,73 @@ +import { Link } from 'react-router-dom'; +import type { Story } from '../../models'; +import { useSettings } from '../../settings'; +import { formatCommentCount } from '../../utils/commentCount'; +import './FeedItem.scss'; + +export function FeedItem({ item }: { item: Story }) { + const { settings } = useSettings(); + const hasUrl = item.url.indexOf('http') === 0; + const isJob = item.type === 'job'; + const titleStyle = { fontSize: `${settings.titleFontSize}px` }; + const comments = formatCommentCount(item.comments_count); + + return ( +
+ {hasUrl ? ( +

+ + {item.title} + + {item.domain && ({item.domain})} +

+ ) : ( +

+ + {item.title} + +

+ )} +
+ {!isJob && ( +
+ + {item.user} + + {item.points} ★ +
+ )} +
+ {item.time_ago} + {!isJob && ( + + {' '} + • {comments} + + )} +
+
+
+ {!isJob && ( + + {item.points} points by {item.user} + + )} + + {item.time_ago} + {!isJob && ( + + {' '} + | {comments} + + )} + +
+
+ ); +} diff --git a/react-app/src/pages/FeedPage.scss b/react-app/src/pages/FeedPage.scss new file mode 100644 index 000000000..b059d5bc9 --- /dev/null +++ b/react-app/src/pages/FeedPage.scss @@ -0,0 +1,100 @@ +@use "../styles/media" as *; + +.feed { +.job-header a, +.nav a { + text-decoration: none; + font-weight: bold; + + &:hover { + text-decoration: underline; + }; +} + +ol { + padding: 0 40px; + margin: 0; + + @media #{$mobile-only} { + box-sizing: border-box; + list-style: none; + padding: 0 10px; + } + + li { + position: relative; + -webkit-transition: background-color .2s ease; + transition: background-color .2s ease; + } +} + +.list-margin { + @media #{$mobile-only} { + margin-top: 55px; + } +} + + +.post { + padding: 10px 0 10px 5px; + transition: background-color 0.2s ease; + border-bottom: 1px solid #CECECB; + + .itemNum { + color: #696969; + position: absolute; + width: 30px; + text-align: right; + left: 0; + top: 4px; + } +} + +.item-block { + display: block; +} + + +.nav { + padding: 10px 40px; + margin-top: 10px; + font-size: 17px; + + a { + @media #{$mobile-only} { + text-decoration: none; + } + } + + @media #{$mobile-only} { + margin: 20px 0; + text-align: center; + padding: 10px 80px; + height: 20px; + } + + .prev { + padding-right: 20px; + + @media #{$mobile-only} { + float: left; + padding-right: 0; + } + } + + .more { + @media #{$mobile-only} { + float: right; + } + } +} + +.job-header { + font-size: 15px; + padding: 0 40px 10px; + + @media #{$mobile-only} { + padding: 60px 15px 25px 15px; + } +} +} diff --git a/react-app/src/pages/FeedPage.test.tsx b/react-app/src/pages/FeedPage.test.tsx new file mode 100644 index 000000000..af0928ba8 --- /dev/null +++ b/react-app/src/pages/FeedPage.test.tsx @@ -0,0 +1,128 @@ +import { render, screen, waitFor } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import { createMemoryRouter, RouterProvider } from 'react-router-dom'; +import { afterEach, describe, expect, it, vi } from 'vitest'; +import type { Story } from '../models'; +import { routes } from '../routes'; +import { SettingsProvider } from '../settings'; + +function story(id: number, overrides: Partial = {}): Story { + return { + id, + title: `Story ${id}`, + points: 10, + user: 'pg', + time: 0, + time_ago: '1 hour ago', + type: 'link', + url: `https://example.com/${id}`, + domain: 'example.com', + comments: [], + comments_count: id % 2, + ...overrides, + }; +} + +function stubFeed(handler: (url: string) => Response | Promise) { + const fn = vi.fn(async (url: string) => handler(url)); + vi.stubGlobal('fetch', fn); + return fn; +} + +function renderAt(path: string) { + const router = createMemoryRouter(routes, { initialEntries: [path] }); + render( + + + + ); + return router; +} + +const fullPage = (start: number) => Array.from({ length: 30 }, (_, i) => story(start + i)); + +afterEach(() => vi.unstubAllGlobals()); + +describe('FeedPage', () => { + it('renders stories with numbering, metadata and a More link', async () => { + stubFeed(() => new Response(JSON.stringify(fullPage(1)))); + renderAt('/news/1'); + const first = await screen.findByRole('link', { name: 'Story 1' }); + expect(first).toHaveAttribute('href', 'https://example.com/1'); + expect(first).not.toHaveAttribute('target'); + expect(screen.getByRole('list')).toHaveAttribute('start', '1'); + expect(screen.getAllByText('1 comment').length).toBeGreaterThan(0); + expect(screen.getAllByText('discuss').length).toBeGreaterThan(0); + expect(screen.queryByText('‹ Prev')).not.toBeInTheDocument(); + expect(screen.getByRole('link', { name: 'More ›' })).toHaveAttribute('href', '/news/2'); + }); + + it('pages forward and back', async () => { + const fetchMock = stubFeed((url) => { + const page = Number(new URL(url).searchParams.get('page')); + return new Response(JSON.stringify(page === 2 ? [story(31)] : fullPage(1))); + }); + const router = renderAt('/newest/1'); + await userEvent.click(await screen.findByRole('link', { name: 'More ›' })); + expect(await screen.findByRole('link', { name: 'Story 31' })).toBeInTheDocument(); + expect(router.state.location.pathname).toBe('/newest/2'); + expect(screen.getByRole('list')).toHaveAttribute('start', '31'); + expect(screen.queryByText('More ›')).not.toBeInTheDocument(); + expect(screen.getByRole('link', { name: '‹ Prev' })).toHaveAttribute('href', '/newest/1'); + expect(fetchMock).toHaveBeenCalledWith('https://node-hnapi.herokuapp.com/newest?page=2', expect.anything()); + + await userEvent.click(screen.getByRole('link', { name: '‹ Prev' })); + expect(await screen.findByRole('link', { name: 'Story 1' })).toBeInTheDocument(); + expect(router.state.location.pathname).toBe('/newest/1'); + expect(screen.getByRole('list')).toHaveAttribute('start', '1'); + expect(screen.queryByText('‹ Prev')).not.toBeInTheDocument(); + }); + + it('ignores a slower response for a page the user already left', async () => { + let releasePage1!: () => void; + const page1 = new Promise((resolve) => (releasePage1 = resolve)); + const fetchMock = stubFeed(async (url) => { + if (url.endsWith('page=1')) { + await page1; + return new Response(JSON.stringify(fullPage(1))); + } + return new Response(JSON.stringify([story(31)])); + }); + const router = renderAt('/newest/1'); + await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1)); + await router.navigate('/newest/2'); + expect(await screen.findByRole('link', { name: 'Story 31' })).toBeInTheDocument(); + releasePage1(); + await page1; + await new Promise((resolve) => setTimeout(resolve, 0)); + expect(screen.getByRole('link', { name: 'Story 31' })).toBeInTheDocument(); + expect(screen.queryByRole('link', { name: 'Story 1' })).not.toBeInTheDocument(); + }); + + it('links internal posts to item details and honours open-in-new-tab', async () => { + localStorage.setItem('openLinkInNewTab', 'true'); + stubFeed( + () => + new Response(JSON.stringify([story(1), story(2, { url: 'item?id=2', domain: undefined, type: 'ask' })])) + ); + renderAt('/ask/1'); + expect(await screen.findByRole('link', { name: 'Story 1' })).toHaveAttribute('target', '_blank'); + expect(screen.getByRole('link', { name: 'Story 2' })).toHaveAttribute('href', '/item/2'); + }); + + it('shows the jobs header and hides points and comments for jobs', async () => { + stubFeed(() => new Response(JSON.stringify([story(1, { type: 'job' })]))); + renderAt('/jobs/1'); + expect(await screen.findByText(/jobs at startups that were funded by Y Combinator/)).toBeInTheDocument(); + expect(screen.queryByText(/points by/)).not.toBeInTheDocument(); + expect(screen.queryByText('discuss')).not.toBeInTheDocument(); + expect(screen.queryByText(/comment/)).not.toBeInTheDocument(); + expect(screen.queryByText(/★/)).not.toBeInTheDocument(); + }); + + it('shows an error message when the feed fails to load', async () => { + stubFeed(() => new Response('boom', { status: 500 })); + renderAt('/show/1'); + expect(await screen.findByText(/Could not load show stories\./)).toBeInTheDocument(); + }); +}); diff --git a/react-app/src/pages/FeedPage.tsx b/react-app/src/pages/FeedPage.tsx index dc90e8038..7fb993fa2 100644 --- a/react-app/src/pages/FeedPage.tsx +++ b/react-app/src/pages/FeedPage.tsx @@ -1,12 +1,75 @@ -import { useParams } from 'react-router-dom'; -import type { FeedType } from '../models'; +import { useEffect, useState } from 'react'; +import { Link, useParams } from 'react-router-dom'; +import { fetchFeed } from '../api/hackerNewsApi'; +import { ErrorMessage } from '../components/ErrorMessage/ErrorMessage'; +import { FeedItem } from '../components/FeedItem/FeedItem'; +import { Loader } from '../components/Loader/Loader'; +import type { FeedType, Story } from '../models'; +import './FeedPage.scss'; + +const PAGE_SIZE = 30; + +type FeedState = { key: string; items?: Story[]; error?: string }; -// Placeholder: ported from feeds/feed + feeds/item in the feeds PR. export default function FeedPage({ feedType }: { feedType: FeedType }) { - const { page = '1' } = useParams(); + const { page } = useParams(); + const pageNum = Number(page) || 1; + const key = `${feedType}/${pageNum}`; + const [state, setState] = useState({ key }); + + useEffect(() => { + const controller = new AbortController(); + fetchFeed(feedType, pageNum, controller.signal).then( + (items) => { + if (controller.signal.aborted) return; + setState({ key, items }); + window.scrollTo(0, 0); + }, + () => { + if (!controller.signal.aborted) { + setState({ key, error: `Could not load ${feedType} stories.` }); + } + } + ); + return () => controller.abort(); + }, [feedType, pageNum, key]); + + const current = state.key === key ? state : { key }; + const listStart = (pageNum - 1) * PAGE_SIZE + 1; + return ( -
- {feedType} page {page} +
+ {!current.items && !current.error && } + {!current.items && current.error && } + {current.items && ( +
+ {feedType === 'jobs' && ( +

+ These are jobs at startups that were funded by Y Combinator. You can also get a job at a YC + startup through Triplebyte. +

+ )} +
    + {current.items.map((item) => ( +
  1. + +
  2. + ))} +
+
+ {listStart !== 1 && ( + + ‹ Prev + + )} + {current.items.length === PAGE_SIZE && ( + + More › + + )} +
+
+ )}
); } diff --git a/react-app/src/routes.test.tsx b/react-app/src/routes.test.tsx index b0b057770..3b8a70493 100644 --- a/react-app/src/routes.test.tsx +++ b/react-app/src/routes.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react'; import { createMemoryRouter, RouterProvider } from 'react-router-dom'; -import { describe, expect, it } from 'vitest'; +import { afterEach, describe, expect, it, vi } from 'vitest'; import { routes } from './routes'; import { SettingsProvider } from './settings'; @@ -14,16 +14,24 @@ function renderAt(path: string) { return router; } +afterEach(() => vi.unstubAllGlobals()); + describe('routes', () => { it('redirects / to /news/1', async () => { const router = renderAt('/'); - expect(await screen.findByTestId('feed-page')).toHaveTextContent('news page 1'); + await screen.findByTestId('feed-page'); + expect(vi.mocked(fetch).mock.calls.map(([url]) => url)).toContain( + 'https://node-hnapi.herokuapp.com/news?page=1' + ); expect(router.state.location.pathname).toBe('/news/1'); }); it.each(['news', 'newest', 'show', 'ask', 'jobs'])('serves the %s feed', async (feed) => { renderAt(`/${feed}/3`); - expect(await screen.findByTestId('feed-page')).toHaveTextContent(`${feed} page 3`); + await screen.findByTestId('feed-page'); + expect(vi.mocked(fetch).mock.calls.map(([url]) => url)).toContain( + `https://node-hnapi.herokuapp.com/${feed}?page=3` + ); }); it('lazy-loads the item and user pages', async () => { diff --git a/react-app/src/test/setup.ts b/react-app/src/test/setup.ts index cb45fb4b5..2c80350e9 100644 --- a/react-app/src/test/setup.ts +++ b/react-app/src/test/setup.ts @@ -1,8 +1,17 @@ import '@testing-library/jest-dom/vitest'; import { cleanup } from '@testing-library/react'; -import { afterEach } from 'vitest'; +import { afterEach, beforeEach, vi } from 'vitest'; + +// Default to empty API responses so pages that fetch on mount never hit the network. +beforeEach(() => { + vi.stubGlobal( + 'fetch', + vi.fn(async () => new Response('[]')) + ); +}); afterEach(() => { cleanup(); localStorage.clear(); + vi.unstubAllGlobals(); });