senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added image url for categories

Browse Source
This commit is contained in:
Edin Dazdarevic
2015-01-31 14:49:27 +01:00
parent 819cee9391
commit 646fbbcf4e
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
front-api/db/migrate/20150131134330_add_image_to_categories.rb Normal file
View File

@@ -0,0 +1,5 @@
class AddImageToCategories < ActiveRecord::Migration
def change
add_column :categories, :image_url, :string
end
end

9
front-api/db/schema.rb
View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150130041842) do
ActiveRecord::Schema.define(version: 20150131134330) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -19,6 +19,7 @@ ActiveRecord::Schema.define(version: 20150130041842) 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|
@@ -54,10 +55,8 @@ ActiveRecord::Schema.define(version: 20150130041842) 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|

15
front-ui/app/components/browsing/bySection.js
View File

@@ -7,6 +7,7 @@ var React = require('react'),
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({
@@ -19,6 +20,7 @@ var BySection = React.createClass({
},
render : function() {
var s ={ float: 'left'};
var self = this;
return ( <div>
<div className='col-md-2'>
@@ -35,8 +37,13 @@ var BySection = React.createClass({
return (
<div style={s}>
<img src='http://www.windeln.de/resources/img/content/kat_windelnwickeln.jpg'/>
<div> {category.name}</div>
<img src={category.image_url || 'http://www.windeln.de/resources/img/content/kat_windelnwickeln.jpg'}/>
<div onClick={self.onCategoryClick.bind(self, category, self.state.section)}> {category.name}</div>
<ul>
{category.sub_categories.map(function(sc) {
return (<li>{sc.name}</li>)
})}
</ul>
</div>
)
@@ -46,6 +53,10 @@ var BySection = React.createClass({
</div>
</div> )
},
onCategoryClick: function(category, section) {
NavigationActions.goToCategory(category, section);
},
componentWillReceiveProps: function(nextProps) {
var sectionId = this.getParams().id;
ItemActions.loadBestSellingItemsForSection(sectionId);