fixed some merge bugs
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user