comable_frontend 0.2.3 → 0.3.0

data/config/routes.rb

@@ -1,25 +1,22 @@
 Comable::Core::Engine.routes.draw do
-  get '/' => 'products#index'
+  root to: 'products#index'
 
   resources :products
 
   resource :cart do
     collection do
+      # TODO: post => put
       post :add
+      put :checkout
     end
   end
 
-  resource :order do
+  resource :order, only: [:create] do
     collection do
-      get :orderer
-      put :orderer
-      get :delivery
-      put :delivery
-      get :shipment
-      put :shipment
-      get :payment
-      put :payment
-      get :confirm
+      get 'signin', as: :signin
+      put 'guest', as: :guest
+      get ':state', action: :edit, as: :next
+      put ':state', action: :update
     end
   end
 
@@ -28,7 +25,7 @@ Comable::Core::Engine.routes.draw do
   resource :customer, path: :member do
     member do
       get :addresses
-      put :addresses
+      put :addresses, action: :update_addresses
     end
   end
 end

data/lib/comable/frontend/engine.rb

@@ -1,6 +1,14 @@
 require 'comable_core'
 
 require 'slim'
+require 'jquery-ui-rails'
+require 'bootstrap-sass'
+require 'sass-rails'
+require 'compass-rails'
+require 'kaminari'
+
+require 'rails-assets-jquery'
+require 'rails-assets-jquery-ujs'
 
 module Comable
   module Frontend

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2015-02-04 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.2.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +59,133 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: compass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-assets-jquery
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.3
+- !ruby/object:Gem::Dependency
+  name: rails-assets-jquery-ujs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -75,14 +207,18 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
+- 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/customers_controller.rb
 - app/controllers/comable/orders_controller.rb
 - app/controllers/comable/products_controller.rb
 - app/controllers/concerns/comable/payment_action.rb
-- app/controllers/concerns/comable/permitted_attributes.rb
 - app/controllers/concerns/comable/shipment_action.rb
+- app/controllers/concerns/comable/signin_action.rb
 - app/views/comable/carts/show.slim
 - app/views/comable/customers/_address.slim
 - app/views/comable/customers/addresses.slim
@@ -90,14 +226,22 @@ files:
 - app/views/comable/orders/confirm.slim
 - app/views/comable/orders/create.slim
 - app/views/comable/orders/delivery.slim
-- app/views/comable/orders/new.slim
 - app/views/comable/orders/orderer.slim
 - app/views/comable/orders/payment.slim
 - app/views/comable/orders/shipment.slim
+- app/views/comable/orders/signin.slim
 - app/views/comable/products/index.slim
 - app/views/comable/products/show.slim
 - app/views/comable/shared/_address.slim
 - app/views/comable/shared/_address_form.slim
+- app/views/comable/shared/_footer.slim
+- app/views/comable/shared/_header.slim
+- app/views/comable/shared/_header_for_checkout.slim
+- app/views/kaminari/comable_frontend/_gap.html.slim
+- app/views/kaminari/comable_frontend/_next_page.html.slim
+- app/views/kaminari/comable_frontend/_page.html.slim
+- app/views/kaminari/comable_frontend/_paginator.html.slim
+- app/views/kaminari/comable_frontend/_prev_page.html.slim
 - app/views/layouts/comable/application.slim
 - config/routes.rb
 - lib/comable/frontend/engine.rb

data/app/controllers/concerns/comable/permitted_attributes.rb

@@ -1,15 +0,0 @@
-module Comable
-  module PermittedAttributes
-    def permitted_address_attributes
-      [
-        :family_name,
-        :first_name,
-        :zip_code,
-        :state_name,
-        :city,
-        :detail,
-        :phone_number
-      ]
-    end
-  end
-end

data/app/views/comable/orders/new.slim

@@ -1,4 +0,0 @@
-h1 注文
-
-.order
-  = link_to '規約に同意して注文', next_order_path