Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
xpub-faraday
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
xpub
xpub-faraday
Commits
93ca0818
Commit
93ca0818
authored
7 years ago
by
Tamlyn Rhodes
Committed by
john
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Use Root component from pubsweet-client.
parent
c84c254e
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
packages/xpub-collabra/app/app.js
+11
-11
11 additions, 11 deletions
packages/xpub-collabra/app/app.js
packages/xpub-collabra/app/routes.js
+3
-3
3 additions, 3 deletions
packages/xpub-collabra/app/routes.js
packages/xpub-collabra/package.json
+0
-1
0 additions, 1 deletion
packages/xpub-collabra/package.json
with
14 additions
and
15 deletions
packages/xpub-collabra/app/app.js
+
11
−
11
View file @
93ca0818
import
React
from
'
react
'
import
ReactDOM
from
'
react-dom
'
import
{
AppContainer
}
from
'
react-hot-loader
'
import
{
Provider
as
StoreProvider
}
from
'
react-redux
'
import
{
Router
}
from
'
react-router-dom
'
import
createHistory
from
'
history/createBrowserHistory
'
import
{
configureStore
}
from
'
pubsweet-client
'
import
{
configureStore
,
Root
}
from
'
pubsweet-client
'
import
{
JournalProvider
}
from
'
xpub-journal
'
import
'
xpub-theme
'
import
*
as
journal
from
'
./config/journal
'
import
Ro
ot
from
'
./routes
'
import
Ro
utes
from
'
./routes
'
const
history
=
createHistory
()
const
store
=
configureStore
(
history
,
{})
const
theme
=
{}
const
render
=
()
=>
{
ReactDOM
.
render
(
<
AppContainer
>
<
StoreProvider
store
=
{
store
}
>
<
JournalProvider
journal
=
{
journal
}
>
<
Router
history
=
{
history
}
>
<
Root
/>
<
/Router
>
<
/JournalProvider
>
<
/StoreProvider
>
<
JournalProvider
journal
=
{
journal
}
>
<
Root
history
=
{
history
}
routes
=
{
<
Routes
/>
}
store
=
{
store
}
theme
=
{
theme
}
/
>
<
/JournalProvider
>
<
/AppContainer>
,
document
.
getElementById
(
'
root
'
),
)
...
...
This diff is collapsed.
Click to expand it.
packages/xpub-collabra/app/routes.js
+
3
−
3
View file @
93ca0818
import
React
from
'
react
'
import
{
Route
,
withRouter
}
from
'
react-router-dom
'
import
{
Route
}
from
'
react-router-dom
'
import
App
from
'
pubsweet-component-xpub-app/src/components
'
...
...
@@ -19,7 +19,7 @@ import DecisionPage from 'pubsweet-component-xpub-review/src/components/Decision
// TODO: use componentDidMount to fetch the current user before rendering?
const
Ro
ot
=
()
=>
(
const
Ro
utes
=
()
=>
(
<
App
>
<
PrivateRoute
component
=
{
DashboardPage
}
exact
path
=
"
/
"
/>
<
PrivateRoute
...
...
@@ -57,4 +57,4 @@ const Root = () => (
<
/App
>
)
export
default
with
Route
r
(
Root
)
export
default
Route
s
This diff is collapsed.
Click to expand it.
packages/xpub-collabra/package.json
+
0
−
1
View file @
93ca0818
...
...
@@ -30,7 +30,6 @@
"pubsweet-server"
:
"^1.0.0-beta.2"
,
"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"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment