Skip to content

Commit

Permalink
changing front end
Browse files Browse the repository at this point in the history
  • Loading branch information
Kunpeng Liu committed Sep 14, 2014
1 parent 31759b6 commit d188541
Show file tree
Hide file tree
Showing 10 changed files with 132 additions and 40 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

# Ignore bundler config.
/.bundle
/.idea/

# Ignore the default SQLite database.
/db/*.sqlite3
Expand Down
12 changes: 12 additions & 0 deletions .idea/my_store.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 62 additions & 38 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ gem 'spring', group: :development

gem 'spree', github: 'spree/spree', branch: '2-3-stable'
gem 'spree_gateway', :git => 'https://github.com/spree/spree_gateway.git', :branch => '2-3-stable'
gem 'spree_auth_devise', :git => 'https://github.com/spree/spree_auth_devise.git', :branch => '2-3-stable'
gem 'spree_auth_devise', :git => 'https://github.com/spree/spree_auth_devise.git', :branch => '2-3-stable'
gem 'spree_fancy', :github => 'spree/spree_fancy', :branch => '2-3-stable'
20 changes: 20 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@ GIT
spree_sample (2.3.3.beta)
spree_core (= 2.3.3.beta)

GIT
remote: git://github.com/spree/spree_fancy.git
revision: 7336df05ff1a7e7d1e42591f56c0165ad0b32bc0
branch: 2-3-stable
specs:
spree_fancy (1.3.0)
compass-rails
deface (~> 1.0.0rc3)
jquery-ui-rails
spree_core (~> 2.3.0)

GIT
remote: https://github.com/spree/spree_auth_devise.git
revision: 4f4a76d4fab7f37702db3bed9caf0b3e10263916
Expand Down Expand Up @@ -130,6 +141,7 @@ GEM
cancancan (1.8.4)
canonical-rails (0.0.7)
rails (>= 3.1, < 5.0)
chunky_png (1.3.1)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.4)
Expand All @@ -142,6 +154,12 @@ GEM
execjs
coffee-script-source (1.8.0)
colorize (0.7.3)
compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (2.0.0)
compass (>= 0.12.2)
deface (1.0.1)
colorize (>= 0.5.8)
nokogiri (~> 1.6.0)
Expand All @@ -162,6 +180,7 @@ GEM
railties (>= 3.2, < 5.0)
friendly_id (5.0.4)
activerecord (>= 4.0.0)
fssm (0.2.10)
highline (1.6.21)
hike (1.2.3)
httparty (0.13.1)
Expand Down Expand Up @@ -293,6 +312,7 @@ DEPENDENCIES
sdoc (~> 0.4.0)
spree!
spree_auth_devise!
spree_fancy!
spree_gateway!
spring
sqlite3
Expand Down
1 change: 1 addition & 0 deletions config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# Rails.application.config.assets.precompile += %w( search.js )
Rails.application.config.assets.precompile += %w( bx_loader.gif )
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This migration comes from spree_fancy (originally 20121211151950)
class AddSliderTaxonsAndApplyThem < ActiveRecord::Migration
def up
tags = Spree::Taxonomy.create(:name => 'Tags')
slider = Spree::Taxon.create({:taxonomy_id => tags.id, :parent_id => tags.root.id, :name => 'Slider'})
featured = Spree::Taxon.create({:taxonomy_id => tags.id, :parent_id => tags.root.id, :name => 'Featured'})
latest = Spree::Taxon.create({:taxonomy_id => tags.id, :parent_id => tags.root.id, :name => 'Latest'})

products = Spree::Product.all

if products[6]
products[0..6].each do |product|
product.taxons << slider
end
end

if products[15]
products[4..15].each do |product|
product.taxons << featured
end

products[0..12].each do |product|
product.taxons << latest
end
end
end

def down
Spree::Taxonomy.where(:name => 'Tags').destroy_all
end
end
2 changes: 1 addition & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20140914035183) do
ActiveRecord::Schema.define(version: 20140914051831) do

create_table "spree_addresses", force: true do |t|
t.string "firstname"
Expand Down
1 change: 1 addition & 0 deletions vendor/assets/javascripts/spree/frontend/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
//= require spree/frontend

//= require_tree .
//= require spree/fancy
1 change: 1 addition & 0 deletions vendor/assets/stylesheets/spree/frontend/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
*= require_self
*= require_tree .
*= require spree/fancy
*/

0 comments on commit d188541

Please sign in to comment.