diff --git a/docker-compose.yml b/docker-compose.yml
index caba33d4e29f1b2ee7f6a6a878c64774fd0c3c96..247639c98371d676678e4935e765a0c9ecfc0b5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
- CLIENT_PORT=${CLIENT_PORT:-4000}
- SERVER_PROTOCOL=http
- SERVER_HOST=server
- - SERVER_PORT=${SERVER_PORT:-3000}
+ - SERVER_PORT=3000
- PUBLIC_CLIENT_HOST=${PUBLIC_CLIENT_HOST:-0.0.0.0}
- INSTANCE_NAME=${INSTANCE_NAME:-elife}
volumes:
@@ -61,7 +61,7 @@ services:
- NODE_ENV=development
- POSTGRES_USER=${POSTGRES_USER:-dev}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
- - POSTGRES_DB=${POSTGRES_DB:-ncbi_dev}
+ - POSTGRES_DB=${POSTGRES_DB:-kotahi_dev}
- POSTGRES_HOST=db
- POSTGRES_PORT=5432
- PUBSWEET_SECRET=${PUBSWEET_SECRET:-dev_secret}
diff --git a/package.json b/package.json
index 40e847e4776eba265b1673accd79b3180f421091..de5ed4f466995909e0d224f1b5bb767ffb3bd239 100644
--- a/package.json
+++ b/package.json
@@ -77,16 +77,17 @@
},
"resolutions": {
"@pubsweet/ui": "12.6.0",
- "react": "16.14.0",
- "pubsweet-server": "13.12.3",
"babel-plugin-styled-components": "1.11.1",
"bcrypt": "^3.0.6",
"formik": "2.2.6",
+ "graphql": "15.5.0",
+ "pg": "8.4.0",
"prettier": "2.2.1",
"prosemirror-gapcursor": "^1.1.3",
"prosemirror-model": "1.11.2",
- "pg": "8.4.0",
- "graphql": "15.5.0"
+ "pubsweet-server": "13.12.3",
+ "react": "16.14.0",
+ "styled-components": "5.2.1"
},
"dependencies": {
"@apollo/client": "3.2.2",
@@ -156,7 +157,7 @@
"react-select": "^4.2.1",
"react-visibility-sensor": "5.1.1",
"regenerator-runtime": "^0.13.7",
- "styled-components": "4.4.1",
+ "styled-components": "^5.2.1",
"superagent": "^3.8.3",
"supertest": "3.4.2",
"waait": "^1.0.5",
diff --git a/stories/MenuItem.stories.js b/stories/MenuItem.stories.js
index 847a2dcdc7fc2e22bb161f5295aedd1fd7a73e01..ac0c8e8fc14d3a6b5cd55172ed0a1e1a844ac48c 100644
--- a/stories/MenuItem.stories.js
+++ b/stories/MenuItem.stories.js
@@ -1,6 +1,4 @@
import React from 'react'
-import { ThemeProvider } from 'styled-components'
-import theme from '../app/theme'
import { Item } from '../app/components/Menu'
export const Base = args => <Item {...args} />
@@ -29,13 +27,6 @@ export default {
name: { control: { type: 'text' } },
icon: { control: { type: 'text' } },
},
- decorators: [
- Story => (
- <ThemeProvider theme={theme}>
- <Story />
- </ThemeProvider>
- ),
- ],
parameters: {
backgrounds: {
default: 'dark',
diff --git a/yarn.lock b/yarn.lock
index d3b0ed28fbf49a9918b3218d83895c2150a19d50..6fd96954d889859dd005f2e41cc0372946f283d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1350,7 +1350,7 @@
"@babel/parser" "^7.12.13"
"@babel/types" "^7.12.13"
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3":
+"@babel/traverse@^7.11.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3":
version "7.13.0"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
@@ -1724,7 +1724,7 @@
resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44"
integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==
-"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.1", "@emotion/is-prop-valid@^0.8.6", "@emotion/is-prop-valid@^0.8.8":
+"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.6", "@emotion/is-prop-valid@^0.8.8":
version "0.8.8"
resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
@@ -1836,7 +1836,7 @@
resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5"
integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==
-"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.0", "@emotion/unitless@^0.7.4", "@emotion/unitless@^0.7.5":
+"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4", "@emotion/unitless@^0.7.5":
version "0.7.5"
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
@@ -7207,15 +7207,6 @@ css-selector-tokenizer@^0.7.0:
cssesc "^3.0.0"
fastparse "^1.1.2"
-css-to-react-native@^2.2.2:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.3.2.tgz#e75e2f8f7aa385b4c3611c52b074b70a002f2e7d"
- integrity sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw==
- dependencies:
- camelize "^1.0.0"
- css-color-keywords "^1.0.0"
- postcss-value-parser "^3.3.0"
-
css-to-react-native@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
@@ -11801,11 +11792,6 @@ is-weakset@^2.0.1:
resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
-is-what@^3.3.1:
- version "3.14.1"
- resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
- integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
-
is-whitespace-character@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
@@ -13566,13 +13552,6 @@ meow@^9.0.0:
type-fest "^0.18.0"
yargs-parser "^20.2.3"
-merge-anything@^2.2.4:
- version "2.4.4"
- resolved "https://registry.yarnpkg.com/merge-anything/-/merge-anything-2.4.4.tgz#6226b2ac3d3d3fc5fb9e8d23aa400df25f98fdf0"
- integrity sha512-l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ==
- dependencies:
- is-what "^3.3.1"
-
merge-descriptors@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -16031,7 +16010,7 @@ prop-types-exact@^1.2.0:
object.assign "^4.1.0"
reflect.ownkeys "^0.2.0"
-prop-types@15.7.2, "prop-types@15.x.x - 16.x.x", prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@15.7.2, "prop-types@15.x.x - 16.x.x", prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -18862,26 +18841,7 @@ style-to-object@0.3.0, style-to-object@^0.3.0:
dependencies:
inline-style-parser "0.1.1"
-styled-components@4.4.1, styled-components@^4.1.1, styled-components@^4.2.0:
- version "4.4.1"
- resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-4.4.1.tgz#e0631e889f01db67df4de576fedaca463f05c2f2"
- integrity sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g==
- dependencies:
- "@babel/helper-module-imports" "^7.0.0"
- "@babel/traverse" "^7.0.0"
- "@emotion/is-prop-valid" "^0.8.1"
- "@emotion/unitless" "^0.7.0"
- babel-plugin-styled-components ">= 1"
- css-to-react-native "^2.2.2"
- memoize-one "^5.0.0"
- merge-anything "^2.2.4"
- prop-types "^15.5.4"
- react-is "^16.6.0"
- stylis "^3.5.0"
- stylis-rule-sheet "^0.0.10"
- supports-color "^5.5.0"
-
-styled-components@^5.2.1:
+styled-components@5.2.1, styled-components@^4.1.1, styled-components@^4.2.0, styled-components@^5.2.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.1.tgz#6ed7fad2dc233825f64c719ffbdedd84ad79101a"
integrity sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ==