Tidying up after merge

.gitignore

+node_modules
+*.log
 
 # Created by https://www.gitignore.io/api/osx,linux
 

package.json

 {
+	"name": "pubsweet-monorepo",
+	"private": true,
 	"devDependencies": {
 		"lerna": "^2.5.1"
-	}
+	},
+	"workspaces": [
+		"packages/*",
+		"packages/pubsweet-components/packages/*"
+	]
 }

packages/pubsweet-styleguide/src/config/journal/article-sections.js

-export default [
-  {
-    value: 'cognitive-psychology',
-    label: 'Cognitive Psychology',
-  },
-  {
-    value: 'social-psychology',
-    label: 'Social Psychology',
-  },
-  {
-    value: 'personality-psychology',
-    label: 'Personality Psychology',
-  },
-  {
-    value: 'developmental-psychology',
-    label: 'Developmental Psychology',
-  },
-  {
-    value: 'clinical-psychology',
-    label: 'Clinical Psychology',
-  },
-  {
-    value: 'organizational-behavior',
-    label: 'Organizational Behavior',
-  },
-  {
-    value: 'methodology',
-    label: 'Methodology and Research Practice',
-  },
-]

packages/pubsweet-styleguide/src/config/journal/article-types.js

-export default [
-  {
-    value: 'original-research',
-    label: 'Original Research Report',
-  },
-  {
-    value: 'review',
-    label: 'Review',
-  },
-  {
-    value: 'opinion',
-    label: 'Opinion/Commentary',
-  },
-  {
-    value: 'registered-report',
-    label: 'Registered Report',
-  },
-]

packages/pubsweet-styleguide/src/config/journal/decisions.js

-export default {
-  accept: {
-    label: 'Accept',
-    color: 'green',
-    message: 'The submission has been accepted for publication',
-  },
-  minor: {
-    label: 'Minor revisions',
-    color: 'orange',
-    message:
-      'The submission will be accepted for publication after minor changes',
-  },
-  major: {
-    label: 'Major revisions',
-    color: 'yellow',
-    message: 'The requested changes must be made before submission for review',
-  },
-  reject: {
-    label: 'Reject',
-    color: 'red',
-    message: 'The submission is not acceptable for publication',
-  },
-}

packages/pubsweet-styleguide/src/config/journal/declarations.js

-export default {
-  questions: [
-    {
-      id: 'openData',
-      legend: 'Data is open',
-    },
-    {
-      id: 'previouslySubmitted',
-      legend: 'Previously submitted',
-    },
-    {
-      id: 'openPeerReview',
-      legend: 'Open peer review',
-    },
-    {
-      id: 'streamlinedReview',
-      legend: 'Streamlined review',
-    },
-    {
-      id: 'researchNexus',
-      legend: 'Submitted as part of the research nexus?',
-    },
-    {
-      id: 'preregistered',
-      legend: 'Pre-registered?',
-    },
-  ],
-}

packages/pubsweet-styleguide/src/config/journal/editors.js

-export default {
-  managingEditor: [
-    {
-      user: 1,
-      name: 'Managing Editor One',
-    },
-    {
-      user: 2,
-      name: 'Managing Editor Two',
-    },
-  ],
-  seniorEditor: [
-    {
-      user: 3,
-      name: 'Senior Editor One',
-    },
-    {
-      user: 4,
-      name: 'Senior Editor Two',
-    },
-  ],
-  handlingEditor: [
-    {
-      user: 5,
-      name: 'Handling Editor One',
-    },
-    {
-      user: 6,
-      name: 'Handling Editor Two',
-    },
-  ],
-}

packages/pubsweet-styleguide/src/config/journal/index.js

-export { default as metadata } from './metadata'
-export { default as declarations } from './declarations'
-export { default as decisions } from './decisions'
-export { default as recommendations } from './recommendations'
-export { default as sections } from './sections'
-export { default as articleSections } from './article-sections'
-export { default as articleTypes } from './article-types'
-export { default as editors } from './editors'
-export { default as roles } from './roles'

packages/pubsweet-styleguide/src/config/journal/metadata.js

-export default {
-  name: 'Example Journal',
-  issn: '1234-1234',
-}

packages/pubsweet-styleguide/src/config/journal/recommendations.js

-export default [
-  {
-    value: 'accept',
-    label: 'Accept',
-    color: 'green',
-  },
-  {
-    value: 'revise',
-    label: 'Revise',
-    color: 'orange',
-  },
-  {
-    value: 'reject',
-    label: 'Reject',
-    color: 'red',
-  },
-]

packages/pubsweet-styleguide/src/config/journal/roles.js

-export default {
-  author: 'Author',
-  handlingEditor: 'Handling Editor',
-  managingEditor: 'Managing Editor',
-  seniorEditor: 'Senior Editor',
-}

packages/pubsweet-styleguide/src/config/journal/sections.js

-export default [
-  {
-    id: 'submissions',
-    label: 'My Submissions',
-  },
-]

packages/pubsweet-styleguide/package.json → packages/styleguide/package.json

 {
-  "name": "@pubweet/styleguide",
+  "name": "@pubsweet/styleguide",
   "version": "0.1.0",
   "files": [
     "src",
@@ -7,15 +7,14 @@
   ],
   "main": "src",
   "dependencies": {
+    "@pubsweet/theme": "^0.1.0",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
     "react-redux": "^5.0.2",
     "react-router-dom": "^4.2.2",
     "recompose": "^0.26.0",
     "redux": "^3.6.0",
-    "redux-form": "^7.0.3",
-    "xpub-journal": "^0.0.2",
-    "xpub-theme": "^0.0.2"
+    "redux-form": "^7.0.3"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",

packages/pubsweet-styleguide/src/components/Wrapper.js → packages/styleguide/src/components/Wrapper.js

@@ -3,11 +3,8 @@ import { Provider } from 'react-redux'
 import { BrowserRouter as Router } from 'react-router-dom'
 import { reducer as formReducer } from 'redux-form'
 import { createStore, combineReducers } from 'redux'
-import { JournalProvider } from 'xpub-journal'
 
-import 'xpub-theme'
-
-import * as journal from '../config/journal'
+import "@pubsweet/theme"
 
 import classes from './Wrapper.local.scss'
 
@@ -23,9 +20,7 @@ const store = createStore(
 const Wrapper = ({ children }) => (
   <Provider store={store}>
     <Router>
-      <JournalProvider journal={journal}>
-        <div className={classes.root}>{children}</div>
-      </JournalProvider>
+      <div className={classes.root}>{children}</div>
     </Router>
   </Provider>
 )

packages/pubsweet-styleguide/src/webpack-config.js → packages/styleguide/src/webpack-config.js

@@ -12,6 +12,8 @@ module.exports = dir => {
     /xpub-[^/]+\/src/,
     /wax-[^/]+\/src/,
     /@pubsweet\/[^/]+\/src/,
+    /styleguide\/src/,
+    /ui\/src/
   ]
 
   return {