diff --git a/front-api/db/migrate/20150131134330_add_image_to_categories.rb b/front-api/db/migrate/20150131134330_add_image_to_categories.rb new file mode 100644 index 0000000..4d0787b --- /dev/null +++ b/front-api/db/migrate/20150131134330_add_image_to_categories.rb @@ -0,0 +1,5 @@ +class AddImageToCategories < ActiveRecord::Migration + def change + add_column :categories, :image_url, :string + end +end diff --git a/front-api/db/schema.rb b/front-api/db/schema.rb index adb7080..5490b49 100644 --- a/front-api/db/schema.rb +++ b/front-api/db/schema.rb @@ -11,6 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. + ActiveRecord::Schema.define(version: 20150131061353) do # These are extensions that must be enabled in order to support this database @@ -19,6 +20,7 @@ ActiveRecord::Schema.define(version: 20150131061353) do create_table "categories", force: :cascade do |t| t.string "name" t.integer "section_id" + t.string "image_url" end create_table "items", force: :cascade do |t| @@ -55,10 +57,8 @@ ActiveRecord::Schema.define(version: 20150131061353) do end create_table "sub_categories", force: :cascade do |t| - t.string "name" - t.integer "category_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "name" + t.integer "category_id" end create_table "units", force: :cascade do |t| diff --git a/front-ui/app/actions/itemActions.js b/front-ui/app/actions/itemActions.js index 2d139a0..6e823af 100644 --- a/front-ui/app/actions/itemActions.js +++ b/front-ui/app/actions/itemActions.js @@ -8,15 +8,21 @@ var ItemActions = { loadFrontPageItems: function() { AppDispatcher.handleAction({ actionType: ItemConstants.LOAD_FOR_FRONTPAGE - }) + }); }, loadItemWithDetails: function() { AppDispatcher.handleAction({ actionType: ItemConstants.LOAD_ITEM_WITH_DETAILS, - }) - } + }); + }, + loadBestSellingItemsForSection: function(sectionId) { + AppDispatcher.handleAction({ + actionType : ItemConstants.LOAD_BSI_FOR_SECTION, + sectionId: sectionId + }); + } }; -module.exports = ItemActions; \ No newline at end of file +module.exports = ItemActions; diff --git a/front-ui/app/actions/sectionActions.js b/front-ui/app/actions/sectionActions.js index 1624a72..f72daf5 100644 --- a/front-ui/app/actions/sectionActions.js +++ b/front-ui/app/actions/sectionActions.js @@ -15,15 +15,22 @@ var SectionActions = { AppDispatcher.handleAction({ actionType: SectionConstants.SET_SECTION_HOVER, section: section - }) + }); }, unsetSectionHover: function() { AppDispatcher.handleAction({ actionType: SectionConstants.UNSET_SECTION_HOVER - }) + }); + }, + + loadSectionDetails: function(sectionId) { + AppDispatcher.handleAction({ + actionType: SectionConstants.LOAD_SECTION_DETAILS, + sectionId: sectionId + }); } }; -module.exports = SectionActions; \ No newline at end of file +module.exports = SectionActions; diff --git a/front-ui/app/components/browsing/bySection.js b/front-ui/app/components/browsing/bySection.js index 7dbcd24..edd0aac 100644 --- a/front-ui/app/components/browsing/bySection.js +++ b/front-ui/app/components/browsing/bySection.js @@ -1,18 +1,88 @@ var React = require('react'), - Router = require('react-router'); + Router = require('react-router'), + ItemActions = require('../../actions/itemActions.js'), + ItemStore = require('../../stores/itemStore'), + NavigationStore = require('../../stores/navigationStore'), + ItemList = require('../items/itemList'), + ItemCollection = require('../../models/itemCollection'), + SectionStore = require('../../stores/sectionStore'), + SectionActions = require('../../actions/sectionActions.js'), + NavigationActions = require('../../actions/navigationActions'), + Section = require('../../models/section'); var BySection = React.createClass({ mixins: [Router.State], + getInitialState : function() { + return { + items: (new ItemCollection()), + section : (new Section()) + }; + }, render : function() { + var s ={ float: 'left'}; + var self = this; return (
Here goes section for refining search, by section
-

Welcome to section {this.getParams().id}

+
+ Najprodavanije u sekciji {this.state.section.get('name')} +
+ +
Kategorije
+
+ {(this.state.section.get('categories') || []).map(function(category){ + return ( +
+ + +
{category.name}
+
    + {category.sub_categories.map(function(sc) { + return (
  • {sc.name}
    • ) + })} +
+ +
+ ) + })} +
+
) + }, + onCategoryClick: function(category, section) { + NavigationActions.goToCategory(category, section); + + }, + componentWillReceiveProps: function(nextProps) { + var sectionId = this.getParams().id; + ItemActions.loadBestSellingItemsForSection(sectionId); + SectionActions.loadSectionDetails(sectionId); + }, + componentDidMount: function() { + console.log('mounting....'); + var sectionId = this.getParams().id; + ItemActions.loadBestSellingItemsForSection(sectionId); + SectionActions.loadSectionDetails(sectionId); + + SectionStore.addChangeListener(this._onSectionChange); + ItemStore.addChangeListener(this._onChange); + }, + _onSectionChange: function() { + if(this.isMounted()) { + this.setState({ + section: SectionStore.getSectionDetails() + }); + } + }, + _onChange: function() { + if(this.isMounted()) { + console.log('items store changed! by section'); + this.setState({items: ItemStore.getBestSellingForSection()}); + } } }); diff --git a/front-ui/app/constants/itemConstants.js b/front-ui/app/constants/itemConstants.js index a0c0188..703e1d9 100644 --- a/front-ui/app/constants/itemConstants.js +++ b/front-ui/app/constants/itemConstants.js @@ -2,5 +2,6 @@ var keyMirror = require('react/lib/keyMirror'); // Define action constants module.exports = keyMirror({ - LOAD_FOR_FRONTPAGE: null -}); \ No newline at end of file + LOAD_FOR_FRONTPAGE: null, + LOAD_BSI_FOR_SECTION: null +}); diff --git a/front-ui/app/constants/sectionConstants.js b/front-ui/app/constants/sectionConstants.js index d071288..14dc150 100644 --- a/front-ui/app/constants/sectionConstants.js +++ b/front-ui/app/constants/sectionConstants.js @@ -4,5 +4,6 @@ var keyMirror = require('react/lib/keyMirror'); module.exports = keyMirror({ LOAD_SECTIONS: null, SET_SECTION_HOVER: null, - UNSET_SECTION_HOVER: null -}); \ No newline at end of file + UNSET_SECTION_HOVER: null, + LOAD_SECTION_DETAILS: null +}); diff --git a/front-ui/app/models/itemCollection.js b/front-ui/app/models/itemCollection.js index 83399e2..f363e02 100644 --- a/front-ui/app/models/itemCollection.js +++ b/front-ui/app/models/itemCollection.js @@ -18,7 +18,7 @@ var ItemCollection = Backbone.Collection.extend({ this.classificationType = type; } , - setClassificatonId: function(id) { + setClassificationId: function(id) { this.classificationId = id; }, diff --git a/front-ui/app/stores/itemStore.js b/front-ui/app/stores/itemStore.js index eb7c477..75090cb 100644 --- a/front-ui/app/stores/itemStore.js +++ b/front-ui/app/stores/itemStore.js @@ -7,7 +7,8 @@ var _ = require('underscore'); // Define initial data points var _items = new ItemCollection(), - _itemWithDetails = new ItemWithDetails(); + _itemWithDetails = new ItemWithDetails(), + _bestSellingForSection = new ItemCollection(); var loadItemsForFrontpage = function() { @@ -49,10 +50,30 @@ var fetchItemWithDetails = function() { } } +var fetchBestSellingItemsForSection = function(sectionId) { + console.log('getting section', sectionId); + var items = _bestSellingForSection; + items.setClassificationType(1); + items.setClassificationId(sectionId); + items.setLimit(30); + items.setOffset(0); + + + items.fetch({ + success: function() { + ItemStore.emitChange(); + } + }); +}; + // Extend ItemStore with EventEmitter to add eventing capabilities var ItemStore = _.extend({}, EventEmitter.prototype, { + getBestSellingForSection: function() { + + return _bestSellingForSection; + }, // item with details getLoadedItemWithDetails: function() { return _itemWithDetails; @@ -94,6 +115,9 @@ AppDispatcher.register(function(payload) { fetchItemWithDetails(); break; + case ItemConstants.LOAD_BSI_FOR_SECTION: + fetchBestSellingItemsForSection(action.sectionId); + break; case ItemConstants.LOAD_FOR_FRONTPAGE: loadItemsForFrontpage(); @@ -109,4 +133,4 @@ AppDispatcher.register(function(payload) { }); -module.exports = ItemStore; \ No newline at end of file +module.exports = ItemStore; diff --git a/front-ui/app/stores/sectionStore.js b/front-ui/app/stores/sectionStore.js index 75cea0e..d2614d7 100644 --- a/front-ui/app/stores/sectionStore.js +++ b/front-ui/app/stores/sectionStore.js @@ -1,27 +1,38 @@ var AppDispatcher = require('../dispatcher/appDispatcher'); var EventEmitter = require('events').EventEmitter; var SectionCollection = require('../models/sectionCollection'); +var Section = require('../models/section'); var SectionConstants = require('../constants/sectionConstants'); var _ = require('underscore'); - +var _sectionDetails = new Section(); var sectionState = { - sections : [], - hoveredSection : '' + sections : [], + hoveredSection : '' }; var loadSections = function() { - var sections = new SectionCollection(); - sections.fetch({success: function() { - sectionState.sections = sections.models; - // change will be called automatically when - // action is run but we need to emit it again - // when the data arive - // it's a bit "unfluxy" but convenient. - // "true philosophy" would be to run another "data arrived" action - SectionStore.emitChange(); - }}); + var sections = new SectionCollection(); + sections.fetch({success: function() { + sectionState.sections = sections.models; + // change will be called automatically when + // action is run but we need to emit it again + // when the data arive + // it's a bit "unfluxy" but convenient. + // "true philosophy" would be to run another "data arrived" action + SectionStore.emitChange(); + }}); +}; + +var loadSectionDetails = function(sectionId) { + var section = new Section({id : sectionId}); + section.fetch({ + success: function() { + _sectionDetails = section; + SectionStore.emitChange(); + } + }); }; var setHovered = function(id) { @@ -36,23 +47,24 @@ var SectionStore = _.extend({}, EventEmitter.prototype, { getState: function() { return sectionState; }, + getSectionDetails: function() { + return _sectionDetails; + }, + // Emit Change event + emitChange: function() { + console.log("Emmiting Section change!"); + this.emit('change'); + }, - // Emit Change event - emitChange: function() { - console.log("Emmiting Section change!"); - this.emit('change'); - }, - - // Add change listener - addChangeListener: function(callback) { - this.on('change', callback); - }, - - // Remove change listener - removeChangeListener: function(callback) { - this.removeListener('change', callback); - } + // Add change listener + addChangeListener: function(callback) { + this.on('change', callback); + }, + // Remove change listener + removeChangeListener: function(callback) { + this.removeListener('change', callback); + } }); @@ -76,6 +88,10 @@ AppDispatcher.register(function(payload) { setHovered(''); break; + case SectionConstants.LOAD_SECTION_DETAILS: + loadSectionDetails(action.sectionId); + break; + default: return true; }