comable_frontend 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579942b136c94b56c0611087feab3531a74199ca
-  data.tar.gz: d1c958f90bda97a66044fa951643ebc5919a3bd8
+  metadata.gz: fe65bcf31263e266c7bac888896e42e1cf9fe632
+  data.tar.gz: 3178cdd2a4a40456628b29d021c361bf277d891e
 SHA512:
-  metadata.gz: 22a575fd34ed0d4d1dbd14693b9ffd82c7b9b0ab01c3b36eb90c2c2f9374ace3a2b11a4af6c62da197ceca33861e63c9dda991fa360219933ba3cfaa43b41cd8
-  data.tar.gz: 926f576b0b47332c4df17709faeb92bac55ccae21ee469a04f57b82d356dffc560f9c386d5eeaf856ecc0a0da9d1008d0cc639cace115392d8f69b304f1125e1
+  metadata.gz: 78eefb1e487c62ca3f68e038d7bc03746e0a290a01ed7be4e1e7cbf18b7bebf5b72523a768ea31ebb164db87b3f98d4627e1c0aad36ebcf324ea1a11948def55
+  data.tar.gz: 0fd2d5bd6372f451fe7a3608271fe590d523d8b68c93d4cae3a74b209c00a8f67cb0584cf29d525c1c4fed2961b52080ad33c3297938ba7fbffbb6f245652515

data/Rakefile

@@ -16,6 +16,11 @@ end
 APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
+def command(string)
+  puts string
+  system string
+end
+
 if File.exist?('comable.gemspec')
   $LOAD_PATH.unshift File.expand_path('..', __FILE__)
   require 'tasks/release'
@@ -45,9 +50,7 @@ if File.exist?('comable.gemspec')
     namespace :migrate do
       task :all do
         FRAMEWORKS.each do |framework|
-          command = "cd #{framework} && test -d db && bundle exec rake db:migrate RAILS_ENV=#{Rails.env}"
-          puts command
-          system command
+          command "cd #{framework} && test -d db/migrate && bundle exec rake db:migrate RAILS_ENV=#{Rails.env}"
         end
       end
     end
@@ -59,11 +62,8 @@ if File.exist?('comable.gemspec')
 
       namespace :reset do
         task :all do
-          FRAMEWORKS.each do |framework|
-            command = "cd #{framework} && test -d db && bundle exec rake db:migrate:reset RAILS_ENV=#{Rails.env}"
-            puts command
-            system command
-          end
+          command "bundle exec rake db:drop db:create RAILS_ENV=#{Rails.env}"
+          Rake::Task['db:migrate'].invoke
         end
       end
     end
@@ -90,6 +90,7 @@ end
 namespace :brakeman do
   task :all do
     FRAMEWORKS.each do |framework|
+      next unless File.directory?("#{framework}/app")
       sh "brakeman --exit-on-warn --ignore-config .brakeman.ignore #{framework}"
     end
   end

data/app/assets/stylesheets/comable/frontend/application.scss

@@ -50,6 +50,7 @@ body.comable-checkout-layout {
 nav {
   &.navbar {
     @include border-radius(0);
+    margin-bottom: 0;
   }
 
   .navbar-nav > li > a {
@@ -295,7 +296,8 @@ table {
 }
 
 // main
-main {
+main.container {
+  margin-top: 20px;
 }
 
 #comable-order {
@@ -311,11 +313,6 @@ main {
   }
 }
 
-footer {
-  margin: 30px;
-  text-align: center;
-}
-
 .comable-mini-cart {
   $width: 250px;
   $image-size: 40px;
@@ -418,8 +415,24 @@ footer {
     margin-bottom: 20px;
     padding-bottom: 20px;
 
-    &:not(:last-child) {
-      border-bottom: 1px solid $list-group-border;
+    a {
+      font-weight: normal;
+
+      &:link, &:visited, &:hover, &:active {
+        color: #444;
+      }
+    }
+
+    a {
+      display: block;
+      overflow: hidden;
+
+      img {
+        @include transition(all 0.5s ease 0s);
+        &:hover {
+          @include transform(scale(1.1) rotate(-1.5deg));
+        }
+      }
     }
   }
 }
@@ -432,3 +445,83 @@ footer {
   height: 100%;
   overflow: hidden;
 }
+
+body.comable-checkout-layout footer {
+  margin-top: 30px;
+  text-align: center;
+
+  .container {
+    display: none;
+  }
+}
+
+body:not(.comable-checkout-layout) footer {
+  margin-top: 30px;
+  background-color: #edeff1;
+  border-top: 2px solid #e3e3e3;
+
+  .container {
+    padding: 30px;
+    color: #036;
+  }
+
+  h3 {
+    padding-bottom: 10px;
+    border-bottom: 1px solid $list-group-border;
+  }
+
+  li {
+    padding: 3px 0;
+  }
+
+  .credit {
+    border-top: 2px solid #ccc;
+    text-align: center;
+    padding: 20px;
+    background-color: #e3e3e3;
+  }
+}
+
+// home
+#comable-home {
+  section {
+    padding: 100px;
+    text-align: center;
+
+    & > h2 {
+      margin: 0;
+    }
+
+    & > *:last-child {
+      margin-bottom: 0;
+      padding-bottom: 0;
+    }
+  }
+
+  .comable-home-top {
+    padding: 0;
+    overflow: hidden;
+    max-height: 600px;
+
+    img {
+      width: 100%;
+      height: auto;
+    }
+  }
+
+  .comable-home-one {
+    color: white;
+    background-color: #444;
+    background-image: image-url('comable/frontend/home-one.jpg');
+    background-position: top center;
+    background-size: cover;
+  }
+
+  .comable-home-two {
+  }
+
+  #comable-product {
+    padding-top: 100px;
+    padding-bottom: 60px;
+  }
+}

data/app/controllers/comable/home_controller.rb

@@ -0,0 +1,14 @@
+module Comable
+  class HomeController < Comable::ApplicationController
+    before_filter :load_products, only: :show
+
+    def show
+    end
+
+    private
+
+    def load_products
+      @products = Comable::Product.limit(5)
+    end
+  end
+end

data/app/views/comable/home/show.slim

@@ -0,0 +1,24 @@
+#comable-home
+  section.comable-home-top
+    = image_tag 'comable/frontend/home-top.jpg'
+
+  section#comable-product
+    .container
+      .products
+        = render 'comable/shared/products'
+
+  section.comable-home-one
+    h2
+      = Comable.t('sample_header')
+    h3
+      = Comable.t('sample_subheader')
+    p
+      = Comable.t('sample_text')
+
+  section.comable-home-two
+    h2
+      = Comable.t('sample_header')
+    h3
+      = Comable.t('sample_subheader')
+    p
+      = Comable.t('sample_text')

data/app/views/comable/products/index.slim

@@ -14,18 +14,7 @@
         = listed_categories Comable::Category.roots
 
     .products.col-sm-10
-      - @products.each_slice(3) do |products|
-        ul.row
-          - products.each do |product|
-            li.product.col-sm-4
-              = link_to comable.product_path(product), class: 'thumbnail' do
-                = image_tag product.image_url, width: '100%'
-              .name
-                = link_to product.name, comable.product_path(product)
-              .caption
-                = product.caption
-              .price
-                = number_to_currency product.price
+      = render 'comable/shared/products'
 
       .text-center
         = paginate @products, theme: :comable_frontend

data/app/views/comable/shared/_footer.slim

@@ -1,2 +1,39 @@
 footer
-  | Powered by #{link_to 'Comable', 'https://github.com/hyoshida/comable'}
+  .container
+    .row
+      .col-md-4
+        h3
+          = Comable.t('support')
+        ul.list-unstyled
+          li
+            i.glyphicon.glyphicon-earphone>
+            | 0123-XX-XXXX
+          li
+            i.glyphicon.glyphicon-envelope>
+            | comable@example.com
+      .col-md-4
+        h3
+          = Comable.t('pages')
+        ul.list-unstyled
+          li
+            = link_to Comable.t('home'), comable.root_path
+          li
+            = link_to Comable.t('products'), comable.products_path
+          li
+            = link_to Comable.t('cart'), comable.cart_path
+          li
+            = link_to Comable.t('my_account'), comable.user_path
+      .col-md-4
+        h3
+          = Comable.t('my_account')
+        ul.list-unstyled
+          li
+            = link_to Comable.t('sign_in'), comable.new_user_session_path
+          li
+            = link_to Comable.t('my_account'), comable.user_path
+          li
+            = link_to Comable.t('change_email_or_password'), comable.edit_user_path
+          li
+            = link_to Comable.t('edit_your_address_book'), comable.addresses_user_path
+  .credit
+    | Powered by #{link_to Comable.app_name, Comable.homepage}

data/app/views/comable/shared/_products.slim

@@ -0,0 +1,23 @@
+ul.row
+  - @products.each do |product|
+    li.col-xs-6.col-sm-3
+      .thumbnail.text-center
+        = link_to comable.product_path(product) do
+          = image_tag product.image_url, width: '100%'
+        h5
+          = link_to product.name, comable.product_path(product)
+        - if product.caption.present?
+          p
+            = product.caption
+        strong
+          = number_to_currency product.price
+        p
+          = form_tag comable.add_cart_path do
+            - stock = product.stocks.first
+            - if stock && stock.stocked?
+              .add_cart.form-inline.form-group
+                = hidden_field_tag :stock_id, stock.id
+                = submit_tag Comable.t('add_to_cart'), class: 'btn btn-default'
+            - else
+              .soldout
+                = submit_tag Comable.t('soldout'), class: 'btn btn-default', disabled: true

data/app/views/layouts/comable/application.slim

@@ -32,7 +32,7 @@ html
     - else
       = render 'comable/shared/header'
 
-    main.container
+    main class="#{'container' if controller_name != 'home'}"
       - flash.each do |name, msg|
         = content_tag(:div, msg, id: "flash_#{name}")
 

data/config/routes.rb

@@ -1,6 +1,7 @@
 Comable::Core::Engine.routes.draw do
-  root to: 'products#index'
+  root to: 'home#show'
 
+  resource :home, only: :show
   resources :products
 
   resource :cart do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comable_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -205,12 +205,15 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
+- app/assets/images/comable/frontend/home-one.jpg
+- app/assets/images/comable/frontend/home-top.jpg
 - app/assets/javascripts/comable/frontend/application.coffee
 - app/assets/stylesheets/comable/frontend/application.scss
 - app/assets/stylesheets/comable/frontend/products.scss
 - app/assets/stylesheets/comable/products.scss
 - app/controllers/comable/application_controller.rb
 - app/controllers/comable/carts_controller.rb
+- app/controllers/comable/home_controller.rb
 - app/controllers/comable/orders_controller.rb
 - app/controllers/comable/products_controller.rb
 - app/controllers/comable/users_controller.rb
@@ -218,6 +221,7 @@ files:
 - app/controllers/concerns/comable/shipment_action.rb
 - app/controllers/concerns/comable/signin_action.rb
 - app/views/comable/carts/show.slim
+- app/views/comable/home/show.slim
 - app/views/comable/orders/confirm.slim
 - app/views/comable/orders/create.slim
 - app/views/comable/orders/delivery.slim
@@ -232,6 +236,7 @@ files:
 - app/views/comable/shared/_footer.slim
 - app/views/comable/shared/_header.slim
 - app/views/comable/shared/_header_for_checkout.slim
+- app/views/comable/shared/_products.slim
 - app/views/comable/shared/_tracker.slim
 - app/views/comable/users/_address.slim
 - app/views/comable/users/addresses.slim
@@ -246,7 +251,7 @@ files:
 - lib/comable/frontend/engine.rb
 - lib/comable_frontend.rb
 - lib/tasks/comable_backend_tasks.rake
-homepage: https://github.com/hyoshida/comable#comable
+homepage: https://github.com/appirits/comable#comable
 licenses:
 - MIT
 metadata: {}
@@ -266,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provide frontend functions for Comable.