From f52919fc497b20d8d39dfbc0b6e34c5a092c1be4 Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Mon, 12 Mar 2018 14:53:51 +0200
Subject: [PATCH] refactor(faraday): remove temporary failing AbstractEditor
---
.../src/components/Admin/AdminUsers.js | 1 -
packages/xpub-faraday/app/FaradayApp.js | 2 +-
.../app/config/journal/submit-wizard.js | 4 +--
packages/xpub-faraday/package.json | 2 +-
yarn.lock | 26 +------------------
5 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js
index a955c4e43..01fcf26ab 100644
--- a/packages/components-faraday/src/components/Admin/AdminUsers.js
+++ b/packages/components-faraday/src/components/Admin/AdminUsers.js
@@ -257,7 +257,6 @@ const SubHeader = styled.div`
const Table = styled.table`
border-spacing: 0;
border-collapse: collapse;
- margin-top: calc(${th('subGridUnit')}*2);
width: 100%;
& thead tr {
diff --git a/packages/xpub-faraday/app/FaradayApp.js b/packages/xpub-faraday/app/FaradayApp.js
index 37c4f8bfa..8938b7556 100644
--- a/packages/xpub-faraday/app/FaradayApp.js
+++ b/packages/xpub-faraday/app/FaradayApp.js
@@ -36,6 +36,6 @@ const Root = styled.div`
const MainContainer = styled.div`
padding: 90px 10px 40px;
- min-height: calc(100vh - 130px);
+ min-height: 100vh;
background-color: ${props => props.theme.backgroundColor || '#fff'};
`
diff --git a/packages/xpub-faraday/app/config/journal/submit-wizard.js b/packages/xpub-faraday/app/config/journal/submit-wizard.js
index 2387b5adc..bfde80961 100644
--- a/packages/xpub-faraday/app/config/journal/submit-wizard.js
+++ b/packages/xpub-faraday/app/config/journal/submit-wizard.js
@@ -1,7 +1,7 @@
import React from 'react'
import styled from 'styled-components'
import uploadFileFn from 'xpub-upload'
-import { AbstractEditor, TitleEditor } from 'xpub-edit'
+import { TitleEditor } from 'xpub-edit'
import { Menu, YesOrNo, TextField } from '@pubsweet/ui'
import { required, minChars, minSize } from 'xpub-validators'
import {
@@ -146,7 +146,7 @@ export default {
},
{
fieldId: 'metadata.abstract',
- renderComponent: AbstractEditor,
+ renderComponent: TitleEditor,
title: 'Abstract',
placeholder: 'Write an abstract',
validate: [requiredBasedOnType],
diff --git a/packages/xpub-faraday/package.json b/packages/xpub-faraday/package.json
index 13f45358e..fdeed11e7 100644
--- a/packages/xpub-faraday/package.json
+++ b/packages/xpub-faraday/package.json
@@ -25,7 +25,7 @@
"nodemailer-ses-transport": "^1.5.1",
"prop-types": "^15.5.10",
"pubsweet": "^1.1.1",
- "pubsweet-client": "^2.1.0",
+ "pubsweet-client": "^2.2.2",
"pubsweet-component-invite": "^0.0.1",
"pubsweet-component-login": "^1.0.1",
"pubsweet-component-signup": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 14d79176b..eabd52e5f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8076,30 +8076,6 @@ public-encrypt@^4.0.0:
parse-asn1 "^5.0.0"
randombytes "^2.0.1"
-pubsweet-client@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/pubsweet-client/-/pubsweet-client-2.1.1.tgz#2294224b244f6090740173f36ed49d61a2f40356"
- dependencies:
- authsome "0.0.9"
- config "^1.21.0"
- event-source-polyfill "^0.0.10"
- global "^4.3.1"
- isomorphic-fetch "^2.1.1"
- lint-staged "^6.0.0"
- lodash "^4.0.0"
- prop-types "^15.5.8"
- react "^16.2.0"
- react-css-themr "^2.1.2"
- react-redux "^5.0.2"
- react-router-dom "^4.2.2"
- react-router-redux next
- redux "^3.6.0"
- redux-form "^7.0.3"
- redux-logger "^3.0.1"
- redux-thunk "^2.2.0"
- reselect "^3.0.1"
- styled-components "^3.1.4"
-
pubsweet-client@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/pubsweet-client/-/pubsweet-client-2.2.2.tgz#3cc12f5c0c341b714704f4827d12d64e2251c2a8"
@@ -9634,7 +9610,7 @@ styled-components@^2.4.0:
stylis "^3.4.0"
supports-color "^3.2.3"
-styled-components@^3.1.4, styled-components@^3.1.6:
+styled-components@^3.1.6:
version "3.1.6"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.1.6.tgz#9c443146fa82c6659a9f64dd493bf2202480342e"
dependencies:
--
GitLab