wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-17 11:27:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removing divs from routes

Browse Source
This commit is contained in:
Belen Curcio
2016-11-08 15:51:43 -03:00
parent 57ec16e6ef
commit 1508eac92d
8 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/index.ejs
+2 -2
View File
@@ -10,8 +10,8 @@
body, #root {
width: 100%;
height: 100%;
margin: 0;
background: #fff;
margin: 0;
background: #fff;
}
</style>
</head>
client/coral-admin/package.json
+1
View File
@@ -5,6 +5,7 @@
"main": "index.js",
"scripts": {
"build": "./node_modules/.bin/webpack --config webpack.config.js",
"watch": "./node_modules/.bin/webpack --config webpack.config.js --watch",
"start": "./node_modules/.bin/webpack-dev-server --config webpack.config.dev.js --inline --hot --content-base public --port 3142"
},
"keywords": [],
client/coral-admin/public/index.html
+2 -2
View File
@@ -10,8 +10,8 @@
body, #root {
width: 100%;
height: 100%;
margin: 0;
background: #fff;
margin: 0;
background: #fff;
}
</style>
</head>
client/coral-admin/src/components/App.js
+5 -6
View File
@@ -18,14 +18,13 @@ export default class App extends React.Component {
<Provider store={store}>
<Layout>
<Header>
<div>
<Router history={browserHistory}>
<Route path={config.base} component={ModerationQueue} />
<Route path={`${config.base}/embed`} component={CommentStream} />
<Route path={`${config.base}/embedlink`} component={EmbedLink} />
<Route path={`${config.base}/configure`} component={Configure} />
<Route path={config.base} component={ModerationQueue}>
<Route path="embed" component={CommentStream} />
<Route path="embedlink" component={EmbedLink} />
<Route path="configure" component={Configure} />
</Route>
</Router>
</div>
</Header>
</Layout>
</Provider>
client/coral-admin/src/components/Header.js
+5 -4
View File
@@ -9,14 +9,15 @@ export default (props) => (
<Layout fixedDrawer>
<Header title='Talk'>
<Navigation>
<Link className={styles.navLink} href={`/${config.base}/`}>Moderate</Link>
<Link className={styles.navLink} href={`/${config.base}/configure`}>Configure</Link>
<Link className={styles.navLink} to={`/${config.basePath}/`}>Moderate</Link>
<Link className={styles.navLink} to={`/${config.basePath}/`}>Community</Link>
<Link className={styles.navLink} to={`/${config.basePath}/configure`}>Configure</Link>
</Navigation>
</Header>
<Drawer>
<Navigation>
<Link className={styles.navLink} href={`/${config.base}/`}>Moderate</Link>
<Link className={styles.navLink} href={`/${config.base}/configure`}>Configure</Link>
<Link className={styles.navLink} to={`/${config.basePath}/`}>Moderate</Link>
<Link className={styles.navLink} to={`/${config.basePath}/configure`}>Configure</Link>
</Navigation>
</Drawer>
{props.children}
client/coral-admin/src/containers/CommunityContainer.js
+10
View File
@@ -0,0 +1,10 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
import I18n from 'coral-framework/i18n/i18n'
import translations from '../translations'
export default class CommunityContainer extends Component {
render() {
return <div>Hello</div>
}
}
client/coral-admin/webpack.config.dev.js
+6
View File
@@ -36,6 +36,12 @@ module.exports = {
context: __dirname,
postcss: [autoprefixer, precss]
}
}),
new webpack.DefinePlugin({
'process.env': {
'NODE_ENV': JSON.stringify('development'),
'VERSION': JSON.stringify(require("./package.json").version)
}
})
],
resolve: {
client/coral-admin/webpack.config.js
+7 -1
View File
@@ -35,6 +35,12 @@ module.exports = Object.assign({}, devConfig, {
debug: false
}
}),
new webpack.optimize.UglifyJsPlugin()
new webpack.optimize.UglifyJsPlugin(),
new webpack.DefinePlugin({
'process.env': {
'NODE_ENV': JSON.stringify('production'),
'VERSION': JSON.stringify(require("./package.json").version)
}
})
]
})