comable_frontend 0.2.3 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/MIT-LICENSE +1 -1
- data/Rakefile +16 -4
- data/app/assets/javascripts/comable/frontend/application.coffee +5 -0
- data/app/assets/stylesheets/comable/frontend/application.scss +434 -0
- data/app/assets/stylesheets/comable/frontend/products.scss +0 -0
- data/app/assets/stylesheets/comable/products.scss +0 -0
- data/app/controllers/comable/application_controller.rb +2 -0
- data/app/controllers/comable/carts_controller.rb +32 -17
- data/app/controllers/comable/customers_controller.rb +5 -5
- data/app/controllers/comable/orders_controller.rb +31 -71
- data/app/controllers/comable/products_controller.rb +15 -1
- data/app/controllers/concerns/comable/payment_action.rb +3 -13
- data/app/controllers/concerns/comable/shipment_action.rb +2 -12
- data/app/controllers/concerns/comable/signin_action.rb +55 -0
- data/app/views/comable/carts/show.slim +65 -20
- data/app/views/comable/customers/_address.slim +7 -7
- data/app/views/comable/customers/addresses.slim +31 -29
- data/app/views/comable/customers/show.slim +60 -2
- data/app/views/comable/orders/confirm.slim +73 -30
- data/app/views/comable/orders/create.slim +6 -4
- data/app/views/comable/orders/delivery.slim +23 -14
- data/app/views/comable/orders/orderer.slim +38 -20
- data/app/views/comable/orders/payment.slim +12 -11
- data/app/views/comable/orders/shipment.slim +12 -10
- data/app/views/comable/orders/signin.slim +22 -0
- data/app/views/comable/products/index.slim +30 -10
- data/app/views/comable/products/show.slim +89 -21
- data/app/views/comable/shared/_address.slim +13 -20
- data/app/views/comable/shared/_address_form.slim +33 -15
- data/app/views/comable/shared/_footer.slim +2 -0
- data/app/views/comable/shared/_header.slim +74 -0
- data/app/views/comable/shared/_header_for_checkout.slim +18 -0
- data/app/views/kaminari/comable_frontend/_gap.html.slim +2 -0
- data/app/views/kaminari/comable_frontend/_next_page.html.slim +7 -0
- data/app/views/kaminari/comable_frontend/_page.html.slim +3 -0
- data/app/views/kaminari/comable_frontend/_paginator.html.slim +11 -0
- data/app/views/kaminari/comable_frontend/_prev_page.html.slim +7 -0
- data/app/views/layouts/comable/application.slim +23 -14
- data/config/routes.rb +9 -12
- data/lib/comable/frontend/engine.rb +8 -0
- metadata +151 -7
- data/app/controllers/concerns/comable/permitted_attributes.rb +0 -15
- data/app/views/comable/orders/new.slim +0 -4
data/config/routes.rb
CHANGED
|
@@ -1,25 +1,22 @@
|
|
|
1
1
|
Comable::Core::Engine.routes.draw do
|
|
2
|
-
|
|
2
|
+
root to: 'products#index'
|
|
3
3
|
|
|
4
4
|
resources :products
|
|
5
5
|
|
|
6
6
|
resource :cart do
|
|
7
7
|
collection do
|
|
8
|
+
# TODO: post => put
|
|
8
9
|
post :add
|
|
10
|
+
put :checkout
|
|
9
11
|
end
|
|
10
12
|
end
|
|
11
13
|
|
|
12
|
-
resource :order do
|
|
14
|
+
resource :order, only: [:create] do
|
|
13
15
|
collection do
|
|
14
|
-
get :
|
|
15
|
-
put :
|
|
16
|
-
get :
|
|
17
|
-
put :
|
|
18
|
-
get :shipment
|
|
19
|
-
put :shipment
|
|
20
|
-
get :payment
|
|
21
|
-
put :payment
|
|
22
|
-
get :confirm
|
|
16
|
+
get 'signin', as: :signin
|
|
17
|
+
put 'guest', as: :guest
|
|
18
|
+
get ':state', action: :edit, as: :next
|
|
19
|
+
put ':state', action: :update
|
|
23
20
|
end
|
|
24
21
|
end
|
|
25
22
|
|
|
@@ -28,7 +25,7 @@ Comable::Core::Engine.routes.draw do
|
|
|
28
25
|
resource :customer, path: :member do
|
|
29
26
|
member do
|
|
30
27
|
get :addresses
|
|
31
|
-
put :addresses
|
|
28
|
+
put :addresses, action: :update_addresses
|
|
32
29
|
end
|
|
33
30
|
end
|
|
34
31
|
end
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
require 'comable_core'
|
|
2
2
|
|
|
3
3
|
require 'slim'
|
|
4
|
+
require 'jquery-ui-rails'
|
|
5
|
+
require 'bootstrap-sass'
|
|
6
|
+
require 'sass-rails'
|
|
7
|
+
require 'compass-rails'
|
|
8
|
+
require 'kaminari'
|
|
9
|
+
|
|
10
|
+
require 'rails-assets-jquery'
|
|
11
|
+
require 'rails-assets-jquery-ujs'
|
|
4
12
|
|
|
5
13
|
module Comable
|
|
6
14
|
module Frontend
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: comable_frontend
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- YOSHIDA Hiroki
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2015-02-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: comable_core
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 0.
|
|
19
|
+
version: 0.3.0
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - '='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 0.
|
|
26
|
+
version: 0.3.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: rails
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -31,6 +31,9 @@ dependencies:
|
|
|
31
31
|
- - ">="
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
33
|
version: 3.2.0
|
|
34
|
+
- - "<"
|
|
35
|
+
- !ruby/object:Gem::Version
|
|
36
|
+
version: 4.2.0
|
|
34
37
|
type: :runtime
|
|
35
38
|
prerelease: false
|
|
36
39
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -38,6 +41,9 @@ dependencies:
|
|
|
38
41
|
- - ">="
|
|
39
42
|
- !ruby/object:Gem::Version
|
|
40
43
|
version: 3.2.0
|
|
44
|
+
- - "<"
|
|
45
|
+
- !ruby/object:Gem::Version
|
|
46
|
+
version: 4.2.0
|
|
41
47
|
- !ruby/object:Gem::Dependency
|
|
42
48
|
name: slim-rails
|
|
43
49
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -53,7 +59,133 @@ dependencies:
|
|
|
53
59
|
- !ruby/object:Gem::Version
|
|
54
60
|
version: '0'
|
|
55
61
|
- !ruby/object:Gem::Dependency
|
|
56
|
-
name:
|
|
62
|
+
name: sass-rails
|
|
63
|
+
requirement: !ruby/object:Gem::Requirement
|
|
64
|
+
requirements:
|
|
65
|
+
- - ">="
|
|
66
|
+
- !ruby/object:Gem::Version
|
|
67
|
+
version: '0'
|
|
68
|
+
type: :runtime
|
|
69
|
+
prerelease: false
|
|
70
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
71
|
+
requirements:
|
|
72
|
+
- - ">="
|
|
73
|
+
- !ruby/object:Gem::Version
|
|
74
|
+
version: '0'
|
|
75
|
+
- !ruby/object:Gem::Dependency
|
|
76
|
+
name: coffee-rails
|
|
77
|
+
requirement: !ruby/object:Gem::Requirement
|
|
78
|
+
requirements:
|
|
79
|
+
- - ">="
|
|
80
|
+
- !ruby/object:Gem::Version
|
|
81
|
+
version: '0'
|
|
82
|
+
type: :runtime
|
|
83
|
+
prerelease: false
|
|
84
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
85
|
+
requirements:
|
|
86
|
+
- - ">="
|
|
87
|
+
- !ruby/object:Gem::Version
|
|
88
|
+
version: '0'
|
|
89
|
+
- !ruby/object:Gem::Dependency
|
|
90
|
+
name: compass-rails
|
|
91
|
+
requirement: !ruby/object:Gem::Requirement
|
|
92
|
+
requirements:
|
|
93
|
+
- - ">="
|
|
94
|
+
- !ruby/object:Gem::Version
|
|
95
|
+
version: '0'
|
|
96
|
+
type: :runtime
|
|
97
|
+
prerelease: false
|
|
98
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
99
|
+
requirements:
|
|
100
|
+
- - ">="
|
|
101
|
+
- !ruby/object:Gem::Version
|
|
102
|
+
version: '0'
|
|
103
|
+
- !ruby/object:Gem::Dependency
|
|
104
|
+
name: uglifier
|
|
105
|
+
requirement: !ruby/object:Gem::Requirement
|
|
106
|
+
requirements:
|
|
107
|
+
- - ">="
|
|
108
|
+
- !ruby/object:Gem::Version
|
|
109
|
+
version: '0'
|
|
110
|
+
type: :runtime
|
|
111
|
+
prerelease: false
|
|
112
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
113
|
+
requirements:
|
|
114
|
+
- - ">="
|
|
115
|
+
- !ruby/object:Gem::Version
|
|
116
|
+
version: '0'
|
|
117
|
+
- !ruby/object:Gem::Dependency
|
|
118
|
+
name: jquery-ui-rails
|
|
119
|
+
requirement: !ruby/object:Gem::Requirement
|
|
120
|
+
requirements:
|
|
121
|
+
- - ">="
|
|
122
|
+
- !ruby/object:Gem::Version
|
|
123
|
+
version: '0'
|
|
124
|
+
type: :runtime
|
|
125
|
+
prerelease: false
|
|
126
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
127
|
+
requirements:
|
|
128
|
+
- - ">="
|
|
129
|
+
- !ruby/object:Gem::Version
|
|
130
|
+
version: '0'
|
|
131
|
+
- !ruby/object:Gem::Dependency
|
|
132
|
+
name: bootstrap-sass
|
|
133
|
+
requirement: !ruby/object:Gem::Requirement
|
|
134
|
+
requirements:
|
|
135
|
+
- - ">="
|
|
136
|
+
- !ruby/object:Gem::Version
|
|
137
|
+
version: '0'
|
|
138
|
+
type: :runtime
|
|
139
|
+
prerelease: false
|
|
140
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
141
|
+
requirements:
|
|
142
|
+
- - ">="
|
|
143
|
+
- !ruby/object:Gem::Version
|
|
144
|
+
version: '0'
|
|
145
|
+
- !ruby/object:Gem::Dependency
|
|
146
|
+
name: font-awesome-rails
|
|
147
|
+
requirement: !ruby/object:Gem::Requirement
|
|
148
|
+
requirements:
|
|
149
|
+
- - ">="
|
|
150
|
+
- !ruby/object:Gem::Version
|
|
151
|
+
version: '0'
|
|
152
|
+
type: :runtime
|
|
153
|
+
prerelease: false
|
|
154
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
155
|
+
requirements:
|
|
156
|
+
- - ">="
|
|
157
|
+
- !ruby/object:Gem::Version
|
|
158
|
+
version: '0'
|
|
159
|
+
- !ruby/object:Gem::Dependency
|
|
160
|
+
name: kaminari
|
|
161
|
+
requirement: !ruby/object:Gem::Requirement
|
|
162
|
+
requirements:
|
|
163
|
+
- - ">="
|
|
164
|
+
- !ruby/object:Gem::Version
|
|
165
|
+
version: '0'
|
|
166
|
+
type: :runtime
|
|
167
|
+
prerelease: false
|
|
168
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
169
|
+
requirements:
|
|
170
|
+
- - ">="
|
|
171
|
+
- !ruby/object:Gem::Version
|
|
172
|
+
version: '0'
|
|
173
|
+
- !ruby/object:Gem::Dependency
|
|
174
|
+
name: rails-assets-jquery
|
|
175
|
+
requirement: !ruby/object:Gem::Requirement
|
|
176
|
+
requirements:
|
|
177
|
+
- - "~>"
|
|
178
|
+
- !ruby/object:Gem::Version
|
|
179
|
+
version: 2.1.3
|
|
180
|
+
type: :runtime
|
|
181
|
+
prerelease: false
|
|
182
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
183
|
+
requirements:
|
|
184
|
+
- - "~>"
|
|
185
|
+
- !ruby/object:Gem::Version
|
|
186
|
+
version: 2.1.3
|
|
187
|
+
- !ruby/object:Gem::Dependency
|
|
188
|
+
name: rails-assets-jquery-ujs
|
|
57
189
|
requirement: !ruby/object:Gem::Requirement
|
|
58
190
|
requirements:
|
|
59
191
|
- - ">="
|
|
@@ -75,14 +207,18 @@ extra_rdoc_files: []
|
|
|
75
207
|
files:
|
|
76
208
|
- MIT-LICENSE
|
|
77
209
|
- Rakefile
|
|
210
|
+
- app/assets/javascripts/comable/frontend/application.coffee
|
|
211
|
+
- app/assets/stylesheets/comable/frontend/application.scss
|
|
212
|
+
- app/assets/stylesheets/comable/frontend/products.scss
|
|
213
|
+
- app/assets/stylesheets/comable/products.scss
|
|
78
214
|
- app/controllers/comable/application_controller.rb
|
|
79
215
|
- app/controllers/comable/carts_controller.rb
|
|
80
216
|
- app/controllers/comable/customers_controller.rb
|
|
81
217
|
- app/controllers/comable/orders_controller.rb
|
|
82
218
|
- app/controllers/comable/products_controller.rb
|
|
83
219
|
- app/controllers/concerns/comable/payment_action.rb
|
|
84
|
-
- app/controllers/concerns/comable/permitted_attributes.rb
|
|
85
220
|
- app/controllers/concerns/comable/shipment_action.rb
|
|
221
|
+
- app/controllers/concerns/comable/signin_action.rb
|
|
86
222
|
- app/views/comable/carts/show.slim
|
|
87
223
|
- app/views/comable/customers/_address.slim
|
|
88
224
|
- app/views/comable/customers/addresses.slim
|
|
@@ -90,14 +226,22 @@ files:
|
|
|
90
226
|
- app/views/comable/orders/confirm.slim
|
|
91
227
|
- app/views/comable/orders/create.slim
|
|
92
228
|
- app/views/comable/orders/delivery.slim
|
|
93
|
-
- app/views/comable/orders/new.slim
|
|
94
229
|
- app/views/comable/orders/orderer.slim
|
|
95
230
|
- app/views/comable/orders/payment.slim
|
|
96
231
|
- app/views/comable/orders/shipment.slim
|
|
232
|
+
- app/views/comable/orders/signin.slim
|
|
97
233
|
- app/views/comable/products/index.slim
|
|
98
234
|
- app/views/comable/products/show.slim
|
|
99
235
|
- app/views/comable/shared/_address.slim
|
|
100
236
|
- app/views/comable/shared/_address_form.slim
|
|
237
|
+
- app/views/comable/shared/_footer.slim
|
|
238
|
+
- app/views/comable/shared/_header.slim
|
|
239
|
+
- app/views/comable/shared/_header_for_checkout.slim
|
|
240
|
+
- app/views/kaminari/comable_frontend/_gap.html.slim
|
|
241
|
+
- app/views/kaminari/comable_frontend/_next_page.html.slim
|
|
242
|
+
- app/views/kaminari/comable_frontend/_page.html.slim
|
|
243
|
+
- app/views/kaminari/comable_frontend/_paginator.html.slim
|
|
244
|
+
- app/views/kaminari/comable_frontend/_prev_page.html.slim
|
|
101
245
|
- app/views/layouts/comable/application.slim
|
|
102
246
|
- config/routes.rb
|
|
103
247
|
- lib/comable/frontend/engine.rb
|