Skip to content

Commit 1938c38

Browse files
add relevant links to item meta
1 parent 96f7371 commit 1938c38

File tree

4 files changed

+48
-25
lines changed

4 files changed

+48
-25
lines changed

components/comment-thread.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ function commentThread(comments) {
1111
className="bb b--black-10 mb3"
1212
>
1313
<li>
14-
<span className="mt3 f6 fw4 mb0 black-60">
14+
<span className="mt3 f6 fw3 mb0 black-60">
1515
<Link route="user" params={{ name: user || "pg" }}>
16-
<a className="link dim pv1 pr1 black-60">{user}</a>
16+
<a className="link grow black-60">{user}</a>
1717
</Link>
1818
{" "}
1919
{time_ago}

components/item-meta.js

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,53 @@ import { CSSTransitionGroup } from "react-transition-group";
33

44
export default (
55
{ domain, url, title, user, points, time_ago, id, comments_count }
6-
) => (
7-
<CSSTransitionGroup
8-
transitionName="page-transition"
9-
transitionAppear={true}
10-
transitionAppearTimeout={500}
11-
transitionEnter={false}
12-
transitionLeave={false}
13-
>
6+
) => {
7+
let internalUrl;
8+
if (url.substring(0, 8) === "item?id=") {
9+
internalUrl = url.split("=").pop();
10+
}
11+
12+
return (
1413
<article>
1514
<div className="dt w-100 bb b--black-10">
16-
<a
17-
className="link dtc dim pt2 pl2 pl3-ns w-50 w-65-m w-90-l"
18-
href={url}
19-
>
20-
<h2 className="f4 f3-ns f2-l fw4 lh-title mv0 black baskerville">
21-
{title}
22-
</h2>
23-
<div className="mt2 mb3 f7 f6-ns fw4 mb0 black-60">
24-
{time_ago} {user && <span>by {user} ({points} points)</span>}
15+
<div className="dtc pt2 pl2 pl3-ns w-50 w-65-m w-90-l">
16+
{internalUrl &&
17+
<Link prefetch route="comments" params={{ id: internalUrl }}>
18+
<a
19+
className="link dim f4 f3-ns f2-l fw3 lh-solid mv0 black baskerville"
20+
>
21+
{title}
22+
{" "}
23+
{domain &&
24+
<span className="f7 f6-ns f5-l fw3 black-60 sans-serif">
25+
({domain})
26+
</span>}
27+
</a>
28+
</Link>}
29+
{!internalUrl &&
30+
<a
31+
className="link dim f4 f3-ns f2-l fw3 lh-solid mv0 black baskerville"
32+
href={url}
33+
>
34+
{title}
35+
{" "}
36+
{domain &&
37+
<span className="fw2 f7 f6-ns f3-l black-60 sans-serif">
38+
({domain})
39+
</span>}
40+
</a>}
41+
<div className="mt2 mb3 f7 f6-ns fw3 mb0 black-60">
42+
{time_ago} {user &&
43+
<span>
44+
by <Link route="user" params={{ name: user || "pg" }}>
45+
<a className="link grow black-60">{user}</a>
46+
</Link> ({points} points)
47+
</span>}
2548
</div>
26-
</a>
49+
</div>
2750
{user &&
2851
<Link prefetch route="comments" params={{ id }}>
29-
<a className="dtc center link grow v-mid pr1 pr3-ns w-10">
52+
<a className="dtc center link v-mid pr1 pr3-ns w-10 grow">
3053
<svg
3154
className="fr pr2"
3255
xmlns="http://www.w3.org/2000/svg"
@@ -51,5 +74,5 @@ export default (
5174
</Link>}
5275
</div>
5376
</article>
54-
</CSSTransitionGroup>
55-
);
77+
);
78+
};

components/navigation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default ({ current }) => {
3030
>
3131
<a
3232
className={
33-
`${current === item ? "pink" : "near-white dim"} link f7 f5-ns dib ph1 ph2-ns pv4 fw3`
33+
`${current === item ? "pink" : "near-white grow"} link f7 f5-ns dib ph1 ph2-ns pv4 fw3`
3434
}
3535
>
3636
{item.charAt(0).toUpperCase() + item.slice(1)}

components/user-details.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Link from "next/link";
22

33
export default ({ about, created, id, karma }) => (
4-
<section className="center mw7 mh4 pa2 pa3-ns lh-title">
4+
<section className="center mw7 mh4 pa2 pa3-ns lh-solid">
55
<div className="dt w-100 pv1">
66
<span className="dtc w-30 w-20-ns black-60">Username: </span>
77
<span className="dtc w-70 w-80-ns">{id}</span>

0 commit comments

Comments
 (0)