Commit f10c1748 authored by Alexandros Georgantas's avatar Alexandros Georgantas
Browse files

refactor: rebase

parent c5a69410
......@@ -3,7 +3,7 @@ import { Redirect, Route, Switch } from 'react-router-dom'
// Users and Teams
import UsersManager from 'pubsweet-component-users-manager/UsersManagerContainer'
import GlobalTeamsManager from 'pubsweet-component-editoria-global-teams/src/ConnectedGlobalTeams'
// import GlobalTeamsManager from 'pubsweet-component-editoria-global-teams/src/ConnectedGlobalTeams'
// Authentication
import Login from 'editoria-component-login/src/LoginContainer'
......@@ -83,7 +83,7 @@ export default (
path="/books/:bookId/bookComponents/:bookComponentId/preview"
/>
<PrivateRoute component={UsersManager} path="/users" />
<PrivateRoute component={GlobalTeamsManager} path="/globalTeams" />
{/* <PrivateRoute component={GlobalTeamsManager} path="/globalTeams" /> */}
</Manage>
</Switch>
)
......@@ -425,16 +425,19 @@
mkdirp "^0.5.1"
rimraf "^2.5.2"
 
"@pubsweet/coko-theme@^5.0.7":
version "5.0.7"
resolved "https://registry.yarnpkg.com/@pubsweet/coko-theme/-/coko-theme-5.0.7.tgz#b799ca745ccd634e957140f65b987b7193ef5e2f"
integrity sha512-SHIn8NTvoQ9H12jF0W2DY8vA3O4EnJyI+g8IueP1+UpXVTCp+YnsldIycuH7RYdaCsCHSKWCJh5PR5Zb6Nup7g==
"@pubsweet/base-model@^2.0.2":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@pubsweet/base-model/-/base-model-2.0.2.tgz#2dd794004556211083a596fed173306a8f03c58c"
integrity sha512-FrWaz5YzutVh5Hoc0124UKjIunMD/mwQPsG5vu9qijh4Ky3UtZib0Z6PmUxSllnDEiR0BeNChDjuofQX8BVUgw==
dependencies:
"@pubsweet/ui-toolkit" "^2.0.7"
cokourier-prime-sans "git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git"
styled-components "^4.1.1"
typeface-fira-sans-condensed "^0.0.54"
typeface-vollkorn "^0.0.54"
"@pubsweet/db-manager" "^2.2.3"
"@pubsweet/errors" "^2.0.2"
"@pubsweet/logger" "^0.2.12"
http-status-codes "^1.3.0"
knex "^0.16.3"
lodash "^4.17.11"
objection "^1.2.3"
uuid "^3.3.2"
 
"@pubsweet/base-model@^3.0.0":
version "3.0.0"
......@@ -450,6 +453,17 @@
objection "^1.5.3"
uuid "^3.3.2"
 
"@pubsweet/coko-theme@^5.0.7":
version "5.0.7"
resolved "https://registry.yarnpkg.com/@pubsweet/coko-theme/-/coko-theme-5.0.7.tgz#b799ca745ccd634e957140f65b987b7193ef5e2f"
integrity sha512-SHIn8NTvoQ9H12jF0W2DY8vA3O4EnJyI+g8IueP1+UpXVTCp+YnsldIycuH7RYdaCsCHSKWCJh5PR5Zb6Nup7g==
dependencies:
"@pubsweet/ui-toolkit" "^2.0.7"
cokourier-prime-sans "git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git"
styled-components "^4.1.1"
typeface-fira-sans-condensed "^0.0.54"
typeface-vollkorn "^0.0.54"
"@pubsweet/component-polling-client@^0.0.3":
version "0.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/component-polling-client/-/component-polling-client-0.0.3.tgz#c59f2066c476587376980932e542c152629b6a32"
......@@ -479,6 +493,23 @@
tmp "^0.0.33"
umzug "^2.1.0"
 
"@pubsweet/db-manager@^2.2.3":
version "2.2.3"
resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-2.2.3.tgz#e6ae1a7eceb8c7a7f4f5946c3cf6b4a8e54dcca3"
integrity sha512-+ZmcWBHnm9hxFnO1htHiOJQuG31qsU1W+xxSqxh2CijUAMoGPe0Cz7WWLaVvKsveqDms+206NuYokKReqWuqGg==
dependencies:
"@pubsweet/logger" "^0.2.12"
"@pubsweet/models" "^0.1.3"
fs-extra "^4.0.2"
isomorphic-fetch "^2.2.1"
joi "^14.3.0"
knex "^0.16.3"
lodash "^4.17.11"
objection "^1.3.0"
pg "^7.4.1"
tmp "^0.0.33"
umzug "^2.1.0"
"@pubsweet/db-manager@^2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-2.3.0.tgz#718ebe7438de3b2578e75b9c1aef517d213854be"
......@@ -496,15 +527,12 @@
tmp-promise "^1.0.5"
umzug "^2.1.0"
 
"@pubsweet/default-theme@^4.0.3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/default-theme/-/default-theme-4.0.3.tgz#13a97d5a446d38ed9d2cfee09f34e2a6e12d687f"
integrity sha512-11OQKa4JLExiv60ImVzXWV6HP0Dim+lNoZ3ncQ7ahwPbljjXskkZY1g9pOsCEds0jL66tBY/tLcKOgmgZd/Gnw==
"@pubsweet/errors@^2.0.2":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.2.tgz#ef9789a03eed40504889ab8da06985fabea84290"
integrity sha512-D8emW9RsKzPU407IWPD4ZURSvGunesJwB0GeaSx3580ipPps8ieIYPEJAg4bg8GYJ0GHKr9ZK3quP78++zrpPA==
dependencies:
styled-components "^4.1.1"
typeface-noto-sans "^0.0.54"
typeface-noto-serif "^0.0.54"
typeface-ubuntu-mono "^0.0.54"
http-status-codes "^1.3.0"
 
"@pubsweet/errors@^2.0.3":
version "2.0.3"
......@@ -619,15 +647,6 @@
objection "^1.5.3"
pubsweet-server "^13.0.0"
 
"@pubsweet/ui-toolkit@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.0.3.tgz#673be0f68bfe3fb8c0a43401a3a032a6cfde75f7"
integrity sha512-zINDKK+A6kXllcYr8+hBdBij8pxF3uOWFGmQjctLBVHzgE6DTV0mPj2iv2WKezO1nE1EbJD5EyXqF4/72gQqQg==
dependencies:
color "^3.0.0"
lodash "^4.17.4"
styled-components "^4.1.1"
"@pubsweet/ui-toolkit@^2.0.7":
version "2.0.7"
resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.0.7.tgz#27cdf66ce44d2d52097a227cfa621fa5482b7bf7"
......@@ -660,31 +679,6 @@
redux-form "^7.0.3"
styled-components "^3.2.5"
 
"@pubsweet/ui@^9.0.3":
version "9.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-9.0.3.tgz#aac4746d6febecd88935e9b2ab1c9d0581baab29"
integrity sha512-8mfvxzNwTZIM0lgzHniJEn/fiyW7W5LyJh2pAYpc+Su8AuCDAKOCpQjeJlgtYzpJuZMoYJrRxfTbuLIz3c7q1g==
dependencies:
"@pubsweet/ui-toolkit" "^2.0.3"
babel-jest "^21.2.0"
classnames "^2.2.5"
enzyme "^3.7.0"
enzyme-adapter-react-16 "^1.1.1"
invariant "^2.2.3"
lodash "^4.17.4"
moment "^2.22.1"
prop-types "^15.5.10"
react "^16.2.0"
react-dom "^16.2.0"
react-feather "^1.0.8"
react-redux "^5.0.2"
react-router-dom "^4.2.2"
react-tag-autocomplete "^5.5.0"
recompose "^0.26.0"
redux "^3.6.0"
redux-form "^7.0.3"
styled-components "^4.1.1"
"@pubsweet/ui@^9.1.3":
version "9.1.3"
resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-9.1.3.tgz#1572aa5f1caed2adbe38de440b1c216b0864a47a"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment