diff --git a/packages/component-wizard/src/components/Progress.local.scss b/packages/component-wizard/src/components/Progress.local.scss index 3ac86ec244c9d2842e93f3b85ccf3ce48f28e8e7..8d2f115d95660c1d8b312e97a0f3cf470ece60da 100644 --- a/packages/component-wizard/src/components/Progress.local.scss +++ b/packages/component-wizard/src/components/Progress.local.scss @@ -4,7 +4,7 @@ flex-direction: row; justify-content: space-between; margin: 0 40px 70px 40px; - min-width: 400px; + min-width: 500px; } .separator { diff --git a/packages/component-wizard/src/index.js b/packages/component-wizard/src/index.js index abfc03ce45939f61cd39ff3ba9ec9ca37011bb01..cb79e54391e79c2f4dbba4a5cf6710d9c4f3e79d 100644 --- a/packages/component-wizard/src/index.js +++ b/packages/component-wizard/src/index.js @@ -2,7 +2,7 @@ module.exports = { client: { components: [() => require('./components')], reducers: { - conversion: () => require('./redux/conversion').default, + wizardConversion: () => require('./redux/conversion').default, authors: () => require('./redux/authors').default, }, }, diff --git a/packages/xpub-faraday/app/config/Logo.js b/packages/xpub-faraday/app/config/Logo.js new file mode 100644 index 0000000000000000000000000000000000000000..3f1557e5409e81d88ee5390e59679a898dd290e5 --- /dev/null +++ b/packages/xpub-faraday/app/config/Logo.js @@ -0,0 +1,7 @@ +import React from 'react' + +const Logo = ({ srcUrl }) => ( + <img alt="Hindawi" height="36" src={srcUrl} title="Hindawi" /> +) + +export default Logo diff --git a/packages/xpub-faraday/app/config/journal/metadata.js b/packages/xpub-faraday/app/config/journal/metadata.js index 7d662e97b2b267abc000756cf3b2056e80d1f562..a0dbaa538b1525826b7c0259d497302ef43e9516 100644 --- a/packages/xpub-faraday/app/config/journal/metadata.js +++ b/packages/xpub-faraday/app/config/journal/metadata.js @@ -1,5 +1,8 @@ +import React from 'react' +import Logo from '../Logo' + export default { issn: '2474-7394', - name: 'Hindawi Faraday', + name: <Logo srcUrl="/assets/hindawi-logo.png" />, logo: '/assets/hindawi-logo.png', } diff --git a/packages/xpub-faraday/app/config/journal/submit-wizard.js b/packages/xpub-faraday/app/config/journal/submit-wizard.js index 24a8d827eae759efb1531c8fd41ade8bc093c209..3d48e222ae0930ec5ad9ccde050eac098d21b7b3 100644 --- a/packages/xpub-faraday/app/config/journal/submit-wizard.js +++ b/packages/xpub-faraday/app/config/journal/submit-wizard.js @@ -15,7 +15,7 @@ import { declarations } from './' import issueTypes from './issues-types' import manuscriptTypes from './manuscript-types' -import { requiredBasedOnType } from './wizard-validators' +import { requiredBasedOnType, parseAbstract } from './wizard-validators' const min3Chars = minChars(3) const declarationsMinSize = minSize(declarations.options.length) @@ -128,7 +128,7 @@ export default { renderComponent: AbstractEditor, title: 'Abstract', placeholder: 'Write an abstract', - validate: [requiredBasedOnType], + validate: [requiredBasedOnType, parseAbstract], }, { fieldId: 'spacing-abstract', @@ -165,16 +165,31 @@ export default { label: 'Files upload', title: 'Manuscript Files Upload', children: [ + { + fieldId: 'label-manuscript', + renderComponent: Label, + label: 'Main Manuscript', + }, { fieldId: 'files.manuscripts', label: 'Main Manuscript', renderComponent: Supplementary, }, + { + fieldId: 'label-supplementary', + renderComponent: Label, + label: 'Supplemental Files', + }, { fieldId: 'files.supplementary', label: 'Supplemental Files', renderComponent: Supplementary, }, + { + fieldId: 'label-cover', + renderComponent: Label, + label: 'Cover Letter', + }, { fieldId: 'files.coverLetter', label: 'Cover Letter', diff --git a/packages/xpub-faraday/app/config/journal/wizard-validators.js b/packages/xpub-faraday/app/config/journal/wizard-validators.js index 4f11c7640ccd08799e6a1b10aef91901552ad6f4..743578994b1629b7d5a34c6427f877e582a8b13b 100644 --- a/packages/xpub-faraday/app/config/journal/wizard-validators.js +++ b/packages/xpub-faraday/app/config/journal/wizard-validators.js @@ -15,3 +15,10 @@ export const requiredBasedOnType = (value, formValues) => { } return undefined } + +export const parseAbstract = value => { + if (value && value.replace('<p></p>', '').replace('<h1></h1>', '')) { + return undefined + } + return 'Required' +} diff --git a/packages/xpub-faraday/app/index.html b/packages/xpub-faraday/app/index.html index 4210e6fed4fc2a8b610b816d684fc47fb77b3421..ea72df9a2e41b3adb3ef07b67a3400e4bdff7e21 100644 --- a/packages/xpub-faraday/app/index.html +++ b/packages/xpub-faraday/app/index.html @@ -2,6 +2,7 @@ <html> <head> <meta charset="utf-8"> + <title> Faraday </title> </head> <body> <div id="root"></div> diff --git a/packages/xpub-faraday/app/routes.js b/packages/xpub-faraday/app/routes.js index 525a7266e9c5701231d10709272c330c07ef3fed..0faa342e6fd6458e78f2a08d27cc5da1ab52da68 100644 --- a/packages/xpub-faraday/app/routes.js +++ b/packages/xpub-faraday/app/routes.js @@ -13,10 +13,7 @@ import { } from 'pubsweet-component-xpub-authentication/src/components' import DashboardPage from 'pubsweet-component-xpub-dashboard/src/components/DashboardPage' - -import { WizardPage } from 'pubsweet-component-wizard/src/components' - -// import { Wizard } from './component-wizard' +import WizardPage from 'pubsweet-component-wizard/src/components/WizardPage' const Routes = () => ( <App>