Commit d44e748b authored by Jure's avatar Jure

Fixes

parent b420a18c
......@@ -22,7 +22,7 @@ export default class Navigation extends React.Component {
<Navbar fluid>
<Navbar.Header>
<NavbarBrand>
<a href='#'><img src='/science.png' alt='science'/></a>
<a href='#'><img src='/pubsweet.jpg' alt='science'/></a>
</NavbarBrand>
</Navbar.Header>
<Nav eventKey={0}>
......
......@@ -5,15 +5,14 @@
"scripts": {
"setup": "node node_modules/pubsweet-core/api/setup.js",
"build": "webpack --colors --config ./webpack/webpack.prod.config.js",
"start": "PORT=3333 NODE_ENV=production node bin/www",
"start": "PORT=80 NODE_ENV=production node bin/www",
"dev": "NODE_ENV=dev LOADER=hot node bin/www",
"pouchdb": "./node_modules/pouchdb-server/bin/pouchdb-server --level-prefix=./api/db/ -d ./api/db/",
"test": "NODE_ENV=test ./node_modules/.bin/mocha --harmony api/test/*.js -R nyan",
"eslint": "eslint"
},
"dependencies": {
"pubsweet-core": "git+https://gitlab.coko.foundation/pubsweet/core.git#master",
"react-hot-loader": "^3.0.0-beta.1"
"pubsweet-core": "git+https://gitlab.coko.foundation/pubsweet/core.git#7a8e4ee"
},
"devDependencies": {
"babel-core": "^6.3.0",
......@@ -30,6 +29,7 @@
"extract-text-webpack-plugin": "^1.0.1",
"style-loader": "^0.12.3",
"webpack": "^1.12.14",
"webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.10.0"
},
"standard": {
......
......@@ -13,10 +13,10 @@ var commonLoaders = [
loader: 'babel',
query: {
presets: ['es2015', 'react', 'stage-2'],
plugins: ['react-hot-loader/babel']
plugins: ['pubsweet-core/node_modules/react-hot-loader/babel']
},
include: [
new RegExp(path.join(__dirname, '../node_modules/core/app')),
new RegExp(path.join(__dirname, '../node_modules/pubsweet-core/app')),
new RegExp(path.join(__dirname, '../app')),
new RegExp(path.join(__dirname, '../../core/app')) // TODO: Temp while linked.
]
......@@ -47,7 +47,7 @@ module.exports = [
context: path.join(__dirname, '..', 'app'),
entry: {
app: [
'react-hot-loader/patch',
'pubsweet-core/node_modules/react-hot-loader/patch',
'webpack-hot-middleware/client',
'./app'
]
......
......@@ -15,10 +15,10 @@ var commonLoaders = [
loader: 'babel',
query: {
presets: ['es2015', 'react', 'stage-2'],
plugins: ['react-hot-loader/babel']
plugins: ['pubsweet-core/node_modules/react-hot-loader/babel']
},
include: [
new RegExp(path.join(__dirname, '../node_modules/core/app')),
new RegExp(path.join(__dirname, '../node_modules/pubsweet-core/app')),
new RegExp(path.join(__dirname, '../app')),
new RegExp(path.join(__dirname, '../../core/app')) // TODO: Temp while linked.
]
......
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