Skip to content

Commit c8fd8a9

Browse files
buzzbuzz
committed
Reformat all source files using Prettier
1 parent fc5abf3 commit c8fd8a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+534
-625
lines changed

‎packages/client/src/components/ConfirmButton/index.js‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,17 @@ const ConfirmButton = ({ children, icon, onClick }) => {
1111
setActivated(false)
1212
onClick()
1313
}
14-
return activated
15-
? (
16-
<button
17-
className={css.confirm}
18-
onClick={onConfirmed}
19-
type="button"
20-
>
21-
{faIcon}
22-
Really?
23-
</button>
24-
)
25-
: (
26-
<button
27-
onClick={() => setActivated(true)}
28-
type="button"
29-
>
30-
{faIcon}
31-
{children}
32-
</button>
33-
)
14+
return activated ? (
15+
<button className={css.confirm} onClick={onConfirmed} type="button">
16+
{faIcon}
17+
Really?
18+
</button>
19+
) : (
20+
<button onClick={() => setActivated(true)} type="button">
21+
{faIcon}
22+
{children}
23+
</button>
24+
)
3425
}
3526

3627
ConfirmButton.defaultProps = {

‎packages/client/src/components/Feed/Date/index.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ import { format } from 'timeago.js'
55

66
import css from './Date.sss'
77

8-
const dateFormat = (date) => (
8+
const dateFormat = (date) =>
99
format(date)
1010
.replace(/minutes?/, 'min')
1111
.replace(/hours?/, 'h')
1212
.replace(' ago', '')
13-
)
1413

1514
const ItemDate = ({ className, date }) => {
1615
const [redrawTimer, setRedrawTimer] = useState(0)
@@ -23,9 +22,7 @@ const ItemDate = ({ className, date }) => {
2322
}, [redrawTimer])
2423

2524
return (
26-
<span className={classNames(className, css.date)}>
27-
{dateFormat(date)}
28-
</span>
25+
<span className={classNames(className, css.date)}>{dateFormat(date)}</span>
2926
)
3027
}
3128

‎packages/client/src/components/Feed/Icon/index.js‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,24 @@ const getFaviconUrl = (url) => {
1414

1515
const Icon = ({ className, feed, noLink }) => {
1616
const faviconUrl = feed && feed.link ? getFaviconUrl(feed.link) : null
17-
const icon = faviconUrl
18-
? <img alt={feed.title} src={faviconUrl} title={feed.title} />
19-
: <FontAwesomeIcon icon={faRss} />
17+
const icon = faviconUrl ? (
18+
<img alt={feed.title} src={faviconUrl} title={feed.title} />
19+
) : (
20+
<FontAwesomeIcon icon={faRss} />
21+
)
2022

21-
return feed && feed.link && !noLink
22-
? (
23-
<a
24-
className={classNames('nondraggable', className, css.feedIcon)}
25-
href={feed.link}
26-
rel="noopener noreferrer"
27-
target="_blank"
28-
>
29-
{icon}
30-
</a>
31-
)
32-
: (
33-
<span className={classNames(className, css.feedIcon)}>
34-
{icon}
35-
</span>
36-
)
23+
return feed && feed.link && !noLink ? (
24+
<a
25+
className={classNames('nondraggable', className, css.feedIcon)}
26+
href={feed.link}
27+
rel="noopener noreferrer"
28+
target="_blank"
29+
>
30+
{icon}
31+
</a>
32+
) : (
33+
<span className={classNames(className, css.feedIcon)}>{icon}</span>
34+
)
3735
}
3836

3937
Icon.defaultProps = {

‎packages/client/src/components/Feed/Image/index.js‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@ import classNames from 'classnames'
44

55
import css from './Image.sss'
66

7-
const Image = ({ alt, className, src }) => (
8-
src
9-
? (
10-
<img
11-
alt={alt}
12-
className={classNames('lazyload', css.feedImage, className)}
13-
data-src={src}
14-
loading="lazy"
15-
/>
16-
)
17-
: null
18-
)
7+
const Image = ({ alt, className, src }) =>
8+
src ? (
9+
<img
10+
alt={alt}
11+
className={classNames('lazyload', css.feedImage, className)}
12+
data-src={src}
13+
loading="lazy"
14+
/>
15+
) : null
1916

2017
Image.defaultProps = {
2118
className: null,

‎packages/client/src/components/Feed/List/Item/index.js‎

Lines changed: 33 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -12,86 +12,61 @@ import TooltipContent from './TooltipContent'
1212
import css from './Item.sss'
1313

1414
const Item = ({ item, type }) => {
15-
const tooltipContent = item.content
16-
? (
17-
<TooltipContent
18-
imageUrl={type !== FEED_DISPLAY.DETAILED ? item.imageUrl : null}
19-
text={item.content}
20-
title={item.title}
21-
/>
22-
)
23-
: null
15+
const tooltipContent = item.content ? (
16+
<TooltipContent
17+
imageUrl={type !== FEED_DISPLAY.DETAILED ? item.imageUrl : null}
18+
text={item.content}
19+
title={item.title}
20+
/>
21+
) : null
2422

25-
const date = item.date
26-
? <Date className={css.date} date={item.date} />
27-
: null
23+
const date = item.date ? <Date className={css.date} date={item.date} /> : null
2824

29-
const itemDisplay = type === FEED_DISPLAY.DETAILED
30-
? (
25+
const itemDisplay =
26+
type === FEED_DISPLAY.DETAILED ? (
3127
<>
32-
<Image
33-
alt={item.title}
34-
className={css.itemImage}
35-
src={item.imageUrl}
36-
/>
28+
<Image alt={item.title} className={css.itemImage} src={item.imageUrl} />
3729
<span className={css.itemText}>
3830
<span className={css.titleLine}>
39-
<span className={css.itemTitle}>
40-
{item.title}
41-
</span>
31+
<span className={css.itemTitle}>{item.title}</span>
4232
{date}
4333
</span>
44-
<span className={css.itemContent}>
45-
{item.content}
46-
</span>
34+
<span className={css.itemContent}>{item.content}</span>
4735
</span>
4836
</>
49-
)
50-
: (
37+
) : (
5138
<>
52-
<span className={css.itemTitle}>
53-
{item.title}
54-
</span>
39+
<span className={css.itemTitle}>{item.title}</span>
5540
{date}
5641
</>
5742
)
5843

5944
const itemLink = (
60-
<a
61-
href={item.link}
62-
rel="noopener noreferrer"
63-
target="_blank"
64-
>
45+
<a href={item.link} rel="noopener noreferrer" target="_blank">
6546
{itemDisplay}
6647
</a>
6748
)
6849

69-
const feedItemClassNames = classNames(
70-
'nondraggable',
71-
css.feedItem,
72-
{
73-
[css.detailed]: type === FEED_DISPLAY.DETAILED,
74-
[css.condensed]: type === FEED_DISPLAY.CONDENSED_LIST,
75-
[css.new]: item.new,
76-
}
77-
)
50+
const feedItemClassNames = classNames('nondraggable', css.feedItem, {
51+
[css.detailed]: type === FEED_DISPLAY.DETAILED,
52+
[css.condensed]: type === FEED_DISPLAY.CONDENSED_LIST,
53+
[css.new]: item.new,
54+
})
7855

7956
return (
8057
<li className={feedItemClassNames}>
81-
{
82-
item.content
83-
? (
84-
<Tooltip
85-
mouseLeaveDelay={0}
86-
overlay={tooltipContent}
87-
overlayClassName={css.tooltip}
88-
placement="bottom"
89-
>
90-
{itemLink}
91-
</Tooltip>
92-
)
93-
: itemLink
94-
}
58+
{item.content ? (
59+
<Tooltip
60+
mouseLeaveDelay={0}
61+
overlay={tooltipContent}
62+
overlayClassName={css.tooltip}
63+
placement="bottom"
64+
>
65+
{itemLink}
66+
</Tooltip>
67+
) : (
68+
itemLink
69+
)}
9570
</li>
9671
)
9772
}

‎packages/client/src/components/Feed/List/index.js‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,17 @@ const onEntering = (node) => {
2020

2121
const List = ({ items, type }) => (
2222
<TransitionGroup className={css.feedList} component="ul">
23-
{
24-
items.map(
25-
(item) => (
26-
<CSSTransition
27-
classNames={{ ...transitionClassNames }}
28-
key={item.id}
29-
timeout={parseInt(transitionSpeed.slice(0, -2), 10)}
30-
onEnter={onEnter}
31-
onEntering={onEntering}
32-
>
33-
<Item type={type} item={item} />
34-
</CSSTransition>
35-
)
36-
)
37-
}
23+
{items.map((item) => (
24+
<CSSTransition
25+
classNames={{ ...transitionClassNames }}
26+
key={item.id}
27+
timeout={parseInt(transitionSpeed.slice(0, -2), 10)}
28+
onEnter={onEnter}
29+
onEntering={onEntering}
30+
>
31+
<Item type={type} item={item} />
32+
</CSSTransition>
33+
))}
3834
</TransitionGroup>
3935
)
4036

‎packages/client/src/components/Feed/Tiles/Tile/Overlay/index.js‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,10 @@ import Date from 'newsdash/components/Feed/Date'
66
import css from './Overlay.sss'
77

88
const Overlay = ({ className, item }) => {
9-
const date = item.date
10-
? <Date className={css.date} date={item.date} />
11-
: null
12-
const content = item.content
13-
? (
14-
<p className={css.content}>
15-
{item.content}
16-
</p>
17-
)
18-
: null
9+
const date = item.date ? <Date className={css.date} date={item.date} /> : null
10+
const content = item.content ? (
11+
<p className={css.content}>{item.content}</p>
12+
) : null
1913

2014
return (
2115
<div className={className}>

‎packages/client/src/components/Feed/Tiles/Tile/index.js‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,19 @@ import TextTile from './TextTile'
88
import css from './Tile.sss'
99

1010
const Tile = ({ color, item }) => {
11-
const image = item.imageUrl
12-
? (
13-
<Image
14-
alt={item.title}
15-
className={css.tileImage}
16-
src={item.imageUrl}
17-
/>
18-
)
19-
: null
11+
const image = item.imageUrl ? (
12+
<Image alt={item.title} className={css.tileImage} src={item.imageUrl} />
13+
) : null
2014

21-
const tileInner = item.content
22-
? <TextTile color={color} image={image} item={item} />
23-
: <NoTextTile color={color} image={image} item={item} />
15+
const tileInner = item.content ? (
16+
<TextTile color={color} image={image} item={item} />
17+
) : (
18+
<NoTextTile color={color} image={image} item={item} />
19+
)
2420

2521
return (
2622
<div className={css.tile}>
27-
<div className={css.tileWrapper}>
28-
{tileInner}
29-
</div>
23+
<div className={css.tileWrapper}>{tileInner}</div>
3024
</div>
3125
)
3226
}

‎packages/client/src/components/Feed/Tiles/index.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const getTileColors = (items, prevTileColors) => {
1515
for (let i = 0; i < items.length; i += 1) {
1616
if (!tileColors[i]) {
1717
tileColors[i] = tinycolor({
18-
h: Math.round((Math.random() * 360)),
18+
h: Math.round(Math.random() * 360),
1919
s: 0.2,
2020
l: 0.85,
2121
}).toHexString()
@@ -50,7 +50,9 @@ const Tiles = ({ items }) => {
5050
columnClassName={css.gridColumn}
5151
ref={masonryRef}
5252
>
53-
{items.map((item, i) => <Tile color={tileColors[i]} item={item} key={item.id} />)}
53+
{items.map((item, i) => (
54+
<Tile color={tileColors[i]} item={item} key={item.id} />
55+
))}
5456
</Masonry>
5557
</div>
5658
)

‎packages/client/src/components/Feed/index.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ import Tiles from './Tiles'
1010

1111
const Feed = ({ feed }) => {
1212
const getFeedItems = useMemo(feedItemSelectors.makeGetFeedItems, [])
13-
const feedItems = useSelector((state) => getFeedItems(state, feed ? feed.id : null))
13+
const feedItems = useSelector((state) =>
14+
getFeedItems(state, feed ? feed.id : null)
15+
)
1416

1517
if (feed.status === FEED_STATUS.ERROR && !feedItems.length) {
1618
return (
@@ -19,8 +21,7 @@ const Feed = ({ feed }) => {
1921
<strong>Sorry, unable to retrieve the feed!</strong>
2022
</p>
2123
<p>
22-
URL:
23-
{' '}
24+
URL:{' '}
2425
<a
2526
className="nondraggable"
2627
href={feed.url}
@@ -30,9 +31,7 @@ const Feed = ({ feed }) => {
3031
<code>{feed.url}</code>
3132
</a>
3233
<br />
33-
Error message:
34-
{' '}
35-
<code>{feed.error}</code>
34+
Error message: <code>{feed.error}</code>
3635
</p>
3736
</div>
3837
)

0 commit comments

Comments
 (0)