ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 08:37:59 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar

Browse Source 
Conflicts:
	js/routes.js
This commit is contained in:
ddejongh 2015-06-19 10:53:56 +02:00
commit 6c746d09f7
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
View File

@ -1,9 +1,13 @@
'use strict';
import React from 'react';
import Router from 'react-router';
import Input from 'react-bootstrap/lib/Input';
import Glyphicon from 'react-bootstrap/lib/Glyphicon';
import Button from 'react-bootstrap/lib/Button';
let Link = Router.Link;
let PieceListToolbar = React.createClass({
@ -30,6 +34,9 @@ let PieceListToolbar = React.createClass({
<Input type='text' ref="search" placeholder="Search..." onChange={this.searchFor} addonAfter={searchIcon} />
&nbsp;&nbsp;
{/*<PieceListToolbarFilterWidgetFilter />*/}
<Link to="register_piece">
<Button>+ Artwork</Button>
</Link>
</div>
</div>
</div>

13
js/components/register_piece.js Normal file
View File

@ -0,0 +1,13 @@
'use strict';
import React from 'react';
let RegisterPiece = React.createClass( {
render() {
return (
<span>test</span>
);
}
});
export default RegisterPiece;

2
js/routes.js
View File

@ -9,6 +9,7 @@ import EditionContainer from './components/edition_container';
import PasswordResetContainer from './components/password_reset_container';
import SettingsContainer from './components/settings_container';
import AppConstants from './constants/application_constants';
import RegisterPiece from './components/register_piece';
//import LoginModalHandler from './components/login_modal_handler';
let Route = Router.Route;
@ -21,6 +22,7 @@ let routes = (
<Route name="pieces" path="collection" handler={PieceList} />
<Route name="edition" path="editions/:editionId" handler={EditionContainer} />
<Route name="password_reset" path="password_reset" handler={PasswordResetContainer} />
<Route name="register_piece" path="register_piece" handler={RegisterPiece} />
<Route name="settings" path="settings" handler={SettingsContainer} />
<Redirect from={baseUrl} to="pieces" />