item groups now have order - start page is now item group 1 (configurable in globals)

This commit is contained in:
Senad Uka
2015-04-21 06:39:30 +02:00
parent ecbe58c626
commit c9949c444a
17 changed files with 126 additions and 12 deletions

View File

@@ -2,7 +2,8 @@ var React = require('react'),
Router = require('react-router'),
RouteHandler = Router.RouteHandler,
AllItems = require('../items/allItems'),
LinkBanner = require('../linkBanner/linkBanner');
LinkBanner = require('../linkBanner/linkBanner'),
AllItemsInGroup = require('../items/allItemsInGroup');
var StartPage = React.createClass({
render : function() {
@@ -11,7 +12,7 @@ var StartPage = React.createClass({
<div className='col-md-12'>
<LinkBanner locationName="startPage" />
<AllItems />
<AllItemsInGroup />
<RouteHandler />
</div>
</div>

View File

@@ -1,6 +1,7 @@
module.exports = {
ApiUrl: '@@apiEndpoint',
DefaultPageSize: 18,
ItemGroupIdOfStartPage: "1",
FormatCurrency: function(amount_s) {
var amount = parseFloat(amount_s);
return ( amount.toFixed(2) + " KM" )

View File

@@ -1,5 +1,6 @@
var AppDispatcher = require('../dispatcher/appDispatcher');
var EventEmitter = require('events').EventEmitter;
var Globals = require('../globals');
var NavigationConstants = require('../constants/navigationConstants')
var _ = require('underscore');
@@ -15,8 +16,12 @@ var getGroupIdFromUrl = function() {
var url = document.URL;
var itemIdRegex = /grupa\/(\d+)\//g;
var match = itemIdRegex.exec(url);
console.log(match);
return match[1];
var result = Globals.ItemGroupIdOfStartPage;
if(match) {
result = match[1]
}
return result;
};
// Extend ItemStore with EventEmitter to add eventing capabilities