diff --git a/.dockerignore b/.dockerignore index 97d77e55652dbf33cbbf09cb7c586478dcf5a24f..21bbccd4cfd9cafb1f89b7d06d8a72cc22b4d1b7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ packages/*/node_modules/**/* packages/*/node_modules +packages/**/*.env +packages/**/.env +packages/**/config/local*.* diff --git a/Dockerfile b/Dockerfile index de2d2216f76a138be61ea166db16cb2594b19b68..330fc3766970db8c47273fdb0e210bea235f39fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ RUN [ "yarn", "install", "--frozen-lockfile" ] RUN [ "yarn", "cache", "clean"] RUN [ "rm", "-rf", "/npm-packages-offline-cache"] -ENV NODE_ENV "production" +# ENV NODE_ENV "production" # We are temporarily going to use the same image with different commands to deploy different apps in the monorepo. This is bad :(. -WORKDIR ${HOME}/packages/xpub-collabra -RUN [ "npx", "pubsweet", "build"] +# WORKDIR ${HOME}/packages/xpub-collabra +# RUN [ "npx", "pubsweet", "build"] ## No xpub-ui to deploy yet # WORKDIR ${HOME}/packages/xpub-ui @@ -26,7 +26,11 @@ RUN [ "npx", "pubsweet", "build"] ## Create file for kubernetes health checks # RUN touch ./styleguide/health +ENV NODE_ENV "development" +WORKDIR ${HOME}/packages/xpub-faraday +RUN [ "npm", "run", "reset", "--username", "admin", "--email", "admin@mailinator.com", "--password", "admin123"] + EXPOSE 3000 -WORKDIR ${HOME} -CMD [] +# WORKDIR ${HOME} +CMD ["npm", "run", "start-now"] diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js index 97b4952b465204b5231b5f3af52f1fb3911b5c96..e0e31e49ee212dea98f30329d2e4fe8909e20ff5 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js @@ -1,7 +1,9 @@ import React from 'react' +import PropTypes from 'prop-types' import { get, isEmpty } from 'lodash' import styled from 'styled-components' import { Button, Icon } from '@pubsweet/ui' +import { compose, getContext } from 'recompose' import { parseVersion, getFilesURL, downloadAll } from './utils' @@ -11,6 +13,8 @@ const DashboardCard = ({ project, version, showAbstractModal, + journal, + ...rest }) => { const { submitted, title, type, version: vers } = parseVersion(version) const files = getFilesURL(get(version, 'files')) @@ -18,7 +22,6 @@ const DashboardCard = ({ const hasFiles = !isEmpty(files) const abstract = get(version, 'metadata.abstract') const metadata = get(version, 'metadata') - return ( <Card> <ListView> @@ -65,8 +68,10 @@ const DashboardCard = ({ </ListView> <DetailsView> <LeftDetails> - <JournalTitle>{metadata.journal}</JournalTitle> - <Issue>{metadata.issue}</Issue> + <JournalTitle>{journal.metadata.nameText}</JournalTitle> + <Issue> + {journal.issueTypes.find(t => t.value === metadata.issue).label} + </Issue> {get(version, 'authors') && ( <Authors> <span>Authors:</span> @@ -109,7 +114,7 @@ const DashboardCard = ({ ) } -export default DashboardCard +export default compose(getContext({ journal: PropTypes.object }))(DashboardCard) // #region styled-components const PreviewContainer = styled.div` @@ -160,7 +165,7 @@ const ActionButtons = styled(Button)` const LeftDetails = styled.div` display: flex; - flex: 1; + flex: 3; flex-direction: column; justify-content: flex-start; padding: 10px 20px; @@ -168,7 +173,7 @@ const LeftDetails = styled.div` const RightDetails = styled.div` display: flex; - flex: 1; + flex: 2; flex-direction: column; div { @@ -340,8 +345,9 @@ const ClickableIconContainer = styled.div` align-items: center; cursor: pointer; display: flex; + margin-right: 8px; - & > span { + span:last-child { color: #667080; font-family: Helvetica; font-size: 14px; diff --git a/packages/components-faraday/src/components/Dashboard/DashboardPage.js b/packages/components-faraday/src/components/Dashboard/DashboardPage.js index a1a4176b6a2b3bd9c33d3de3da325e77001822fe..f183c434e5ebc1f5bc323565b7b3b6480634c1f5 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardPage.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardPage.js @@ -1,9 +1,11 @@ import { get } from 'lodash' -import { compose } from 'recompose' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import { actions } from 'pubsweet-client' +import { withJournal } from 'xpub-journal' import { ConnectPage } from 'xpub-connect' import { withRouter } from 'react-router-dom' +import { compose, withContext } from 'recompose' import { newestFirst, selectCurrentUser } from 'xpub-selectors' import { createDraftSubmission } from 'pubsweet-component-wizard/src/redux/conversion' @@ -48,6 +50,7 @@ export default compose( }), ), withRouter, + withJournal, withFilters({ status: { options: [ @@ -82,4 +85,10 @@ export default compose( }, }, }), + withContext( + { + journal: PropTypes.object, + }, + ({ journal }) => ({ journal }), + ), )(Dashboard) diff --git a/packages/xpub-faraday/Dockerfile b/packages/xpub-faraday/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..d2f06537103fbb7d1ad09b9c2fc7cfe947ba77fd --- /dev/null +++ b/packages/xpub-faraday/Dockerfile @@ -0,0 +1 @@ +FROM bogdandev/xpub-faraday:21.02 \ No newline at end of file diff --git a/packages/xpub-faraday/package.json b/packages/xpub-faraday/package.json index 9e306a496ad153f449454a2d6e7177d4ccf64fe3..aaad5df8542891550bf62506ad94fba46d39be98 100644 --- a/packages/xpub-faraday/package.json +++ b/packages/xpub-faraday/package.json @@ -73,6 +73,7 @@ "setupdb": "pubsweet setupdb ./", "reset": "pubsweet setupdb --clobber ./", "start": "pubsweet start", + "start-now": "echo $secret > config/local-development.json && npm run start", "build": "NODE_ENV=production pubsweet build" } }