From 8ba9ca999d42cbb83469bac9e0b9da75b076d526 Mon Sep 17 00:00:00 2001
From: Jure Triglav <juretriglav@gmail.com>
Date: Mon, 27 Jul 2020 15:41:38 +0200
Subject: [PATCH] fix: adjust require paths due to no package.jsons
---
app/app.js | 4 ++--
app/components/AdminPage.js | 4 ++--
.../component-dashboard/src/components/Reviews.js | 2 +-
.../src/components/decision/DecisionForm.js | 4 ++--
.../src/components/decision/DecisionReview.js | 2 +-
.../component-review/src/components/review/ReviewForm.js | 2 +-
.../component-submit/src/components/UploadManuscript.js | 2 +-
.../src/components/molecules/Accordion.js | 2 +-
app/routes.js | 2 +-
config/components.json | 8 ++++----
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/app/app.js b/app/app.js
index 03597a2684..1074fd9470 100644
--- a/app/app.js
+++ b/app/app.js
@@ -6,8 +6,8 @@ import { createBrowserHistory } from 'history'
import Root from './Root'
import theme from './theme'
-import { JournalProvider } from './components/xpub-journal'
-import { XpubProvider } from './components/xpub-with-context'
+import { JournalProvider } from './components/xpub-journal/src'
+import { XpubProvider } from './components/xpub-with-context/src'
import * as journal from '../config/journal'
import routes from './routes'
diff --git a/app/components/AdminPage.js b/app/components/AdminPage.js
index e5b275977e..870c4be6d8 100644
--- a/app/components/AdminPage.js
+++ b/app/components/AdminPage.js
@@ -13,8 +13,8 @@ import {
import { JournalContext } from './xpub-journal/src'
import { XpubContext } from './xpub-with-context/src'
-import UsersManager from '../components/component-users-manager'
-import Manuscripts from '../components/component-manuscripts'
+import UsersManager from '../components/component-users-manager/src/UsersManager'
+import Manuscripts from '../components/component-manuscripts/src/Manuscripts'
import Dashboard from '../components/component-dashboard/src/components/Dashboard'
import SubmitPage from '../components/component-submit/src/components/SubmitPage'
import ManuscriptPage from '../components/component-manuscript/src/components/ManuscriptPage'
diff --git a/app/components/component-dashboard/src/components/Reviews.js b/app/components/component-dashboard/src/components/Reviews.js
index ea24946941..c53d7a1f05 100644
--- a/app/components/component-dashboard/src/components/Reviews.js
+++ b/app/components/component-dashboard/src/components/Reviews.js
@@ -3,7 +3,7 @@ import styled from 'styled-components'
import { sumBy } from 'lodash'
import { Badge } from '@pubsweet/ui'
import { th } from '@pubsweet/ui-toolkit'
-import { JournalContext } from '../../../xpub-journal'
+import { JournalContext } from '../../../xpub-journal/src'
const Root = styled.div`
display: inline-flex;
diff --git a/app/components/component-review/src/components/decision/DecisionForm.js b/app/components/component-review/src/components/decision/DecisionForm.js
index b70b7f3682..727250a78b 100644
--- a/app/components/component-review/src/components/decision/DecisionForm.js
+++ b/app/components/component-review/src/components/decision/DecisionForm.js
@@ -2,8 +2,6 @@ import React, { useContext } from 'react'
import { NoteEditor } from 'xpub-edit'
import { cloneDeep, omit } from 'lodash'
import { FieldArray, Field } from 'formik'
-import { JournalContext } from 'xpub-journal'
-import { required } from 'xpub-validators'
import {
Button,
Flexbox,
@@ -11,6 +9,8 @@ import {
UploadButton,
UploadingFile,
} from '@pubsweet/ui'
+import { JournalContext } from '../../../../xpub-journal/src'
+import { required } from '../../../../xpub-validators/src'
import {
getCommentFiles,
diff --git a/app/components/component-review/src/components/decision/DecisionReview.js b/app/components/component-review/src/components/decision/DecisionReview.js
index d87a3d62c7..994e989f6f 100644
--- a/app/components/component-review/src/components/decision/DecisionReview.js
+++ b/app/components/component-review/src/components/decision/DecisionReview.js
@@ -1,9 +1,9 @@
import React, { useContext } from 'react'
import styled from 'styled-components'
import { compose, withState, withHandlers } from 'recompose'
-import { JournalContext } from 'xpub-journal'
import { Button } from '@pubsweet/ui'
import { th } from '@pubsweet/ui-toolkit'
+import { JournalContext } from '../../../../xpub-journal/src'
import Review from '../review/Review'
const ToggleReview = ({ open, toggle }) => (
diff --git a/app/components/component-review/src/components/review/ReviewForm.js b/app/components/component-review/src/components/review/ReviewForm.js
index 9febfa9b58..006bf2dbef 100644
--- a/app/components/component-review/src/components/review/ReviewForm.js
+++ b/app/components/component-review/src/components/review/ReviewForm.js
@@ -10,7 +10,7 @@ import {
UploadingFile,
} from '@pubsweet/ui'
-import { JournalContext } from 'xpub-journal'
+import { JournalContext } from '../../../../xpub-journal/src'
import { getCommentFiles, stripHtml, createComments } from './util'
import {
AdminSection,
diff --git a/app/components/component-submit/src/components/UploadManuscript.js b/app/components/component-submit/src/components/UploadManuscript.js
index d4cd667924..cdb5e7e0be 100644
--- a/app/components/component-submit/src/components/UploadManuscript.js
+++ b/app/components/component-submit/src/components/UploadManuscript.js
@@ -3,7 +3,7 @@ import styled, { keyframes, withTheme } from 'styled-components'
import { Icon, Action } from '@pubsweet/ui'
import { th } from '@pubsweet/ui-toolkit'
import Dropzone from 'react-dropzone'
-import { XpubContext } from '../../../xpub-with-context'
+import { XpubContext } from '../../../xpub-with-context/src'
import upload from '../upload'
const StyledDropzone = styled(({ disableUpload, ...props }) => (
diff --git a/app/components/component-submit/src/components/molecules/Accordion.js b/app/components/component-submit/src/components/molecules/Accordion.js
index fbb85ac930..3206bfc51d 100644
--- a/app/components/component-submit/src/components/molecules/Accordion.js
+++ b/app/components/component-submit/src/components/molecules/Accordion.js
@@ -1,9 +1,9 @@
import React from 'react'
import styled from 'styled-components'
import { compose, withState, withHandlers } from 'recompose'
-import { JournalContext } from 'xpub-journal'
import { Button } from '@pubsweet/ui'
import { th } from '@pubsweet/ui-toolkit'
+import { JournalContext } from '../../../../xpub-journal/src'
const Root = styled.div``
diff --git a/app/routes.js b/app/routes.js
index ac455bdf69..0cc488d3d4 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -1,7 +1,7 @@
import React from 'react'
import { Route, Switch } from 'react-router-dom'
-import Login from './components/component-login'
+import Login from './components/component-login/src'
import AdminPage from './components/AdminPage'
diff --git a/config/components.json b/config/components.json
index 3ae8758075..0d4c1e745a 100644
--- a/config/components.json
+++ b/config/components.json
@@ -1,14 +1,14 @@
[
- "./server/model-team",
- "./server/model-user",
+ "./server/model-team/src",
+ "./server/model-user/src",
"./server/model-manuscript/src/",
"./server/model-file/src/",
"./server/component-xpub-review-backend/src/",
"./server/model-review/src/",
"./server/formbuilder/src/",
"@pubsweet/job-xsweet",
- "./server/model-channel",
- "./server/model-message",
+ "./server/model-channel/src",
+ "./server/model-message/src",
"./server/profile-upload",
"./server/auth-orcid"
]
--
GitLab