diff --git a/Dockerfile b/Dockerfile index 14d606c0a..dc7e64e31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:7 +FROM node:7.6 # Install yarn RUN npm install -g yarn diff --git a/circle.yml b/circle.yml index b29dfcc4c..2357ecf4c 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: node: - version: 7 + version: 7.6 services: - docker - redis diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js index c2f3a8056..6762bd70a 100644 --- a/client/coral-admin/src/actions/auth.js +++ b/client/coral-admin/src/actions/auth.js @@ -28,7 +28,7 @@ const logOutFailure = () => ({type: actions.LOGOUT_FAILURE}); export const logout = () => dispatch => { dispatch(logOutRequest()); - coralApi('/auth', {method: 'DELETE'}) + return coralApi('/auth', {method: 'DELETE'}) .then(() => dispatch(logOutSuccess())) .catch(error => dispatch(logOutFailure(error))); }; diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index 537b89b8f..da71ac04a 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -15,28 +15,36 @@ const FlagWidget = (props) => {
| {/* empty on purpose */} | {lang.t('streams.article')} | -{lang.t('modqueue.flagged')} | +{lang.t('dashboard.flags')} |
|---|---|---|---|
| {index + 1}. | +|||
|
- {asset.title}
- {asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()} + +{asset.title} +{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()} + + |
+
+
+ {flagSummary ? flagSummary.actionCount : 0} + |
- {flagSummary ? flagSummary.actionCount : 0} | |
| {lang.t('dashboard.no_flags')} | |||
| {lang.t('dashboard.no_flags')} | |||
| {/* empty on purpose */} | {lang.t('streams.article')} | {lang.t('modqueue.likes')} |
|---|---|---|
| {index + 1}. | +||
|
- {asset.title}
- {asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()} + +{asset.title} +{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()} + + |
+
+
+ {likeSummary ? likeSummary.actionCount : 0} + |
- {likeSummary ? likeSummary.actionCount : 0} |
| {lang.t('dashboard.no_likes')} | ||
| {lang.t('dashboard.no_likes')} | ||
{asset.settings.closedMessage}
} - {!loggedIn &&