fixed some merge bugs

This commit is contained in:
Senad Uka
2015-01-28 05:09:53 +01:00
parent c35d8a57de
commit 1445e8f702
2 changed files with 3 additions and 10 deletions

View File

@@ -13,12 +13,11 @@ var StartPage = require('./components/startPage/startPage');
var ByCategory = require('./components/browsing/byCategory');
var BySection = require('./components/browsing/bySection');
var ItemPage = require('./components/items/itemPage');
var routes = (
<Route name='app' path='/' handler={RootApp}>
<Route name='sekcija' path='sekcija/:id/:name' handler={BySection} />
<Route name='artikal' path="artikal/:id/*" handler={ItemPage} />
<Route name='artikal' path="artikal/:id/*" handler={ItemWithDetailsPage} />
<Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} />
<DefaultRoute handler={StartPage}/>
</Route>