Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • hdrury1/xpub-elife
1 result
Show changes
Commits on Source (8)
import React from 'react'
import { Link } from 'react-router-dom'
import { AppBar } from '@pubsweet/ui'
const App = ({ children }) => (
<div>
<AppBar
brand="eLife"
navLinkComponents={[<Link to="/">Dashboard</Link>]}
onLogoutClick={() => {
/* empty function for now */
}}
user={{ username: 'Dummy User', admin: true }}
/>
<div>{children}</div>
</div>
)
export default App
## App Component
The aim of this component is to group things that are shared by apps (like the navbar). This is similar to [xpub app] (https://gitlab.coko.foundation/pubsweet/pubsweet/tree/master/packages/components/packages/xpub-app).
import React from 'react'
import { Link } from 'react-router-dom'
const Dashboard = () => (
<div>
<h1>Dashboard Dummy Page</h1>
<Link to="/submit">Submit a manuscript</Link>
</div>
)
export default Dashboard
## Dashboard Component
TODO this needs to be implemented
This should provide a list of manuscripts.
export { default as App } from './app/App'
export { default as Dashboard } from './dashboard/Dashboard'
export { default as Login } from './login/Login'
export { default as Submission } from './submission/Submission'
import React from 'react'
const Login = () => <div>Login Dummy Page</div>
export default Login
## Login Component
TODO this needs to be implemented/replaced with pubsweet login
This should provide a login component. It will probably end being just an ORCID button.
import React from 'react'
const Submission = () => <div>Submission Dummy Page</div>
export default Submission
## Submission component
This should provide a submission form for manuscripts.
import React from 'react'
import { Route, Switch } from 'react-router-dom'
const Routes = () => <div>TODO</div>
import { App, Dashboard, Submission, Login } from './components'
/*
* TODO: implement login/signup and wrap Component in AuthenticatedComponent:
* <AuthenticatedComponent>
* <Component {...props}>
* </AuthenticatedComponent>
*/
const PrivateRoute = ({ component: Component, ...rest }) => (
<Route {...rest} render={props => <Component {...props} />} />
)
const Routes = () => (
<App>
<Switch>
<Route component={Login} exact path="/login" />
<PrivateRoute component={Submission} exact path="/submit" />
<PrivateRoute component={Dashboard} path="/" />
</Switch>
</App>
)
export default Routes
......@@ -29,7 +29,8 @@
"react-router-dom": "^4.2.2",
"recompose": "^0.26.0",
"redux": "^3.6.0",
"redux-logger": "^3.0.1"
"redux-logger": "^3.0.1",
"styled-components": "^2.4.0"
},
"devDependencies": {
"babel-eslint": "^8.0.2",
......@@ -71,6 +72,9 @@
"stylelint-config-pubsweet": "^0.0.3",
"webpack-hot-middleware": "^2.20.0"
},
"resolutions": {
"grid-styled/styled-components": "2.4.0"
},
"scripts": {
"test": "echo YOU HAVE NO TESTS, FOOOL!",
"clean": "rm -rf node_modules",
......
......@@ -2,7 +2,7 @@ import React from 'react'
import { ThemeProvider } from 'styled-components'
import StyleRoot from 'pubsweet-client/src/helpers/StyleRoot'
import theme from '@pubsweet/default-theme'
import theme from '@pubsweet/elife-theme'
export default ({ children }) => (
<ThemeProvider theme={theme}>
......
......@@ -233,7 +233,7 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
ansi-escapes@^1.0.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
......@@ -1102,14 +1102,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-polyfill@6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
dependencies:
babel-runtime "^6.22.0"
core-js "^2.4.0"
regenerator-runtime "^0.10.0"
babel-preset-env@^1.6.0:
version "1.6.1"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
......@@ -3318,7 +3310,7 @@ extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
external-editor@^2.0.1, external-editor@^2.0.4:
external-editor@^2.0.4:
version "2.1.0"
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
dependencies:
......@@ -4323,24 +4315,6 @@ ini@1.x.x, ini@^1.3.4, ini@~1.3.0:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
inquirer@3.0.6:
version "3.0.6"
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
dependencies:
ansi-escapes "^1.1.0"
chalk "^1.0.0"
cli-cursor "^2.1.0"
cli-width "^2.0.0"
external-editor "^2.0.1"
figures "^2.0.0"
lodash "^4.3.0"
mute-stream "0.0.7"
run-async "^2.2.0"
rx "^4.1.0"
string-width "^2.0.0"
strip-ansi "^3.0.0"
through "^2.3.6"
inquirer@3.3.0, inquirer@^3.0.6:
version "3.3.0"
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
......@@ -5577,7 +5551,7 @@ minimist@1.1.x:
version "1.1.3"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
minimist@^1.1.3, minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
......@@ -5762,13 +5736,6 @@ node-dir@^0.1.10:
dependencies:
minimatch "^3.0.2"
node-fetch@1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
dependencies:
encoding "^0.1.11"
is-stream "^1.0.1"
node-fetch@^1.0.1:
version "1.7.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
......@@ -6043,24 +6010,6 @@ onetime@^2.0.0:
dependencies:
mimic-fn "^1.0.0"
opencollective@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
dependencies:
babel-polyfill "6.23.0"
chalk "1.1.3"
inquirer "3.0.6"
minimist "1.2.0"
node-fetch "1.6.3"
opn "4.0.2"
opn@4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
dependencies:
object-assign "^4.0.1"
pinkie-promise "^2.0.0"
opn@5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225"
......@@ -7590,10 +7539,6 @@ regenerate@^1.2.1:
version "1.3.3"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
regenerator-runtime@^0.10.0:
version "0.10.5"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
......@@ -7977,10 +7922,6 @@ rx-lite@*, rx-lite@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
rx@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
rxjs@^5.0.0-beta.11, rxjs@^5.4.2:
version "5.5.8"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.8.tgz#b2b0809a57614ad6254c03d7446dea0d83ca3791"
......@@ -8559,22 +8500,7 @@ style-search@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
"styled-components@>=2.0 || >=3.0":
version "3.2.3"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.2.3.tgz#50f71207320eeb1ef539dec4637f21f5e3c936b4"
dependencies:
buffer "^5.0.3"
css-to-react-native "^2.0.3"
fbjs "^0.8.9"
hoist-non-react-statics "^1.2.0"
is-plain-object "^2.0.1"
opencollective "^1.0.3"
prop-types "^15.5.4"
stylis "^3.5.0"
stylis-rule-sheet "^0.0.10"
supports-color "^3.2.3"
styled-components@^2.4.0:
styled-components@2.4.0, "styled-components@>=2.0 || >=3.0", styled-components@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-2.4.0.tgz#086d0fd483d54638837fca3ea546a030b94adf75"
dependencies:
......@@ -8667,11 +8593,7 @@ stylelint@^8.2.0:
svg-tags "^1.0.0"
table "^4.0.1"
stylis-rule-sheet@^0.0.10:
version "0.0.10"
resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
stylis@^3.4.0, stylis@^3.5.0:
stylis@^3.4.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
......