@@ -3,30 +3,53 @@ import { CSSTransitionGroup } from "react-transition-group";
3
3
4
4
export default (
5
5
{ 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 (
14
13
< article >
15
14
< 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 > }
25
48
</ div >
26
- </ a >
49
+ </ div >
27
50
{ user &&
28
51
< 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 " >
30
53
< svg
31
54
className = "fr pr2"
32
55
xmlns = "http://www.w3.org/2000/svg"
@@ -51,5 +74,5 @@ export default (
51
74
</ Link > }
52
75
</ div >
53
76
</ article >
54
- </ CSSTransitionGroup >
55
- ) ;
77
+ ) ;
78
+ } ;
0 commit comments