Skip to content

Commit 11d9b22

Browse files
committed
date formatting
1 parent beecab8 commit 11d9b22

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

client/modules/IDE/components/CollectionList/CollectionListRow.jsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ import dates from '../../../../utils/formatDate';
1212

1313
import DownFilledTriangleIcon from '../../../../images/down-filled-triangle.svg';
1414

15+
const formatDateCell = (date, mobile = false) =>
16+
dates.format(date, { showTime: !mobile });
17+
1518
class CollectionListRowBase extends React.Component {
1619
static projectInCollection(project, collection) {
1720
return (
@@ -228,14 +231,8 @@ class CollectionListRowBase extends React.Component {
228231
{this.renderCollectionName()}
229232
</span>
230233
</th>
231-
<td>
232-
{mobile && 'Created: '}
233-
{dates.format(collection.createdAt)}
234-
</td>
235-
<td>
236-
{mobile && 'Updated: '}
237-
{dates.format(collection.updatedAt)}
238-
</td>
234+
<td>{formatDateCell(collection.createdAt, mobile)}</td>
235+
<td>{formatDateCell(collection.updatedAt, mobile)}</td>
239236
<td>
240237
{mobile && '# sketches: '}
241238
{(collection.items || []).length}

client/modules/IDE/components/SketchList.jsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,14 +311,8 @@ class SketchListRowBase extends React.Component {
311311
onClick={this.handleRowClick}
312312
>
313313
<th scope="row">{name}</th>
314-
<td>
315-
{mobile && 'Created: '}
316-
{formatDateCell(sketch.createdAt, mobile)}
317-
</td>
318-
<td>
319-
{mobile && 'Updated: '}
320-
{formatDateCell(sketch.updatedAt, mobile)}
321-
</td>
314+
<td>{formatDateCell(sketch.createdAt, mobile)}</td>
315+
<td>{formatDateCell(sketch.updatedAt, mobile)}</td>
322316
{this.renderDropdown()}
323317
</tr>
324318
</React.Fragment>

client/modules/User/pages/DashboardView.jsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import PropTypes from 'prop-types';
22
import React from 'react';
33
import { connect } from 'react-redux';
4+
import MediaQuery from 'react-responsive';
45
import { withTranslation } from 'react-i18next';
56

67
import browserHistory from '../../../browserHistory';
@@ -111,15 +112,19 @@ class DashboardView extends React.Component {
111112
}
112113
}
113114

114-
renderContent(tabKey, username) {
115+
renderContent(tabKey, username, mobile) {
115116
switch (tabKey) {
116117
case TabKey.assets:
117-
return <AssetList key={username} username={username} />;
118+
return <AssetList key={username} mobile={mobile} username={username} />;
118119
case TabKey.collections:
119-
return <CollectionList key={username} username={username} />;
120+
return (
121+
<CollectionList key={username} mobile={mobile} username={username} />
122+
);
120123
case TabKey.sketches:
121124
default:
122-
return <SketchList key={username} username={username} />;
125+
return (
126+
<SketchList key={username} mobile={mobile} username={username} />
127+
);
123128
}
124129
}
125130

@@ -151,7 +156,9 @@ class DashboardView extends React.Component {
151156
</div>
152157

153158
<div className="dashboard-content">
154-
{this.renderContent(currentTab, username)}
159+
<MediaQuery maxWidth={770}>
160+
{(mobile) => this.renderContent(currentTab, username, mobile)}
161+
</MediaQuery>
155162
</div>
156163
</main>
157164
{this.state.collectionCreateVisible && (

0 commit comments

Comments
 (0)