beerify 0.1.3 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +9 -1
  3. data/app/assets/stylesheets/beerify/application.css +2 -1
  4. data/app/assets/stylesheets/beerify/bootstrap-sass.css.sass +1 -0
  5. data/app/assets/stylesheets/beerify/main_css_classes/main.css.sass +299 -0
  6. data/app/models/settings.rb +1 -7
  7. data/app/models/user.rb +0 -1
  8. data/app/views/devise/confirmations/new.html.slim +9 -0
  9. data/app/views/devise/mailer/confirmation_instructions.html.slim +3 -0
  10. data/app/views/devise/mailer/reset_password_instructions.html.slim +5 -0
  11. data/app/views/devise/mailer/unlock_instructions.html.slim +4 -0
  12. data/app/views/devise/passwords/edit.html.slim +11 -0
  13. data/app/views/devise/passwords/new.html.slim +9 -0
  14. data/app/views/devise/registrations/edit.html.slim +13 -0
  15. data/app/views/devise/registrations/new.html.slim +11 -0
  16. data/app/views/devise/sessions/new.html.slim +11 -0
  17. data/app/views/devise/shared/_links.html.slim +14 -0
  18. data/app/views/devise/unlocks/new.html.slim +9 -0
  19. data/config/initializers/rails_admin.rb +4 -1
  20. data/config/locales/attributes.en.yml +2 -1
  21. data/config/locales/attributes.fr.yml +2 -1
  22. data/config/locales/devise.views.fr.yml +10 -2
  23. data/config/routes.rb +1 -1
  24. data/lib/beerify/engine.rb +7 -2
  25. data/lib/beerify/version.rb +1 -1
  26. metadata +101 -35
  27. data/app/assets/stylesheets/beerify/bootstrap.css +0 -5909
  28. data/app/views/devise/confirmations/new.html.erb +0 -14
  29. data/app/views/devise/mailer/confirmation_instructions.html.erb +0 -3
  30. data/app/views/devise/mailer/reset_password_instructions.html.erb +0 -5
  31. data/app/views/devise/mailer/unlock_instructions.html.erb +0 -4
  32. data/app/views/devise/passwords/edit.html.erb +0 -16
  33. data/app/views/devise/passwords/new.html.erb +0 -14
  34. data/app/views/devise/registrations/edit.html.erb +0 -20
  35. data/app/views/devise/registrations/new.html.erb +0 -16
  36. data/app/views/devise/sessions/new.html.erb +0 -14
  37. data/app/views/devise/shared/_links.erb +0 -25
  38. data/app/views/devise/unlocks/new.html.erb +0 -14
  39. data/config/settings/beerify/development.yml +0 -2
  40. data/config/settings/beerify/production.yml +0 -2
  41. data/config/settings/beerify/settings.yml +0 -1
  42. data/spec/dummy/log/test.log +0 -176
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
- metadata.gz: f1973f04e8b730782428c78cc4fcf1b3bc568f09
4
- data.tar.gz: 048faef3bf0f93a764990520d6de813acefbbd83
3
+ metadata.gz: 7db7f6be529b18df3663f0a4d2e813191d99fdd2
4
+ data.tar.gz: 2970c046a529af0eaceeab5a580dc633a245da4d
5
5
  !binary "U0hBNTEy":
6
- metadata.gz: a1a97d1005d20cd89489b059539dab48f585446af564b90479236d978c408440b3843e0eb2b6de952ea465ae291b7314ac9aab1f0a34e99c5cc2251bafc4d896
7
- data.tar.gz: dd898f7be83890bd85868f119dfe684515673e8769f29b69f14b4bd2d5994af7bfd47655730dba540a53a931e93c2a2d5c49c553790e425af005a7955e6a37f9
6
+ metadata.gz: 94998bbb51d274414e6f858f09d28ea32294ff3261945e582119b9f745ed67c39302201693ceea3a5d4bab9f3d796304860630e5ffd68d8d2a75c41ea341792a
7
+ data.tar.gz: 196cd9aa42297b1c71d74eced3e30c80960b417b40d0bd96121918df1705b64552a9854c6d80f1fefc754f41d6f474f73b1f01d8fa062625251dfb5002553f82
data/README.md CHANGED
@@ -32,7 +32,15 @@ Or install it yourself as:
32
32
  */
33
33
  ```
34
34
 
35
- ## Populate your database
35
+ ## Bootstrap database
36
+
37
+ * **First step**: Install migrations
38
+
39
+ ```rb
40
+ rake beerify:install:migrations
41
+ ```
42
+
43
+ * **Second step**: Populate your database
36
44
 
37
45
  ```rb
38
46
  rake beerify:db:populate
@@ -1,3 +1,4 @@
1
1
  /*
2
- *= require beerify/bootstrap
2
+ *= require beerify/bootstrap-sass
3
+ *= require beerify/main_css_classes/main
3
4
  */
@@ -0,0 +1 @@
1
+ @import "bootstrap"
@@ -0,0 +1,299 @@
1
+ .visible
2
+ display: inherit !important
3
+
4
+ .invisible
5
+ visibility: hidden !important
6
+
7
+ .hidden
8
+ display: none !important
9
+ visibility: hidden !important
10
+
11
+ .pull-left
12
+ float: left !important
13
+
14
+ .pull-center
15
+ margin: auto !important
16
+
17
+ .pull-right
18
+ float: right !important
19
+
20
+ .max-width
21
+ width: 100% !important
22
+
23
+ .pos-inherit
24
+ position: inherit !important
25
+
26
+ .pos-relative
27
+ position: relative !important
28
+
29
+ .pos-absolute
30
+ position: absolute !important
31
+
32
+ .pos-fixed
33
+ position: fixed !important
34
+
35
+ .text-left
36
+ text-align: left !important
37
+
38
+ .text-center
39
+ text-align: center !important
40
+
41
+ .text-right
42
+ text-align: right !important
43
+
44
+ .text-justify
45
+ text-align: justify !important
46
+
47
+ .li-unstyled
48
+ list-style: none !important
49
+
50
+ .li-inline
51
+ display: inline-block !important
52
+
53
+ .huge-margin
54
+ margin-top: 70px !important
55
+ margin-bottom: 70px !important
56
+
57
+ .huge-padding
58
+ padding-top: 70px !important
59
+ padding-bottom: 70px !important
60
+
61
+ .pvn
62
+ padding-top: 0px !important
63
+ padding-bottom: 0px !important
64
+
65
+ .pvx
66
+ padding-top: 3px !important
67
+ padding-bottom: 3px !important
68
+
69
+ .pvs
70
+ padding-top: 5px !important
71
+ padding-bottom: 5px !important
72
+
73
+ .pvm
74
+ padding-top: 10px !important
75
+ padding-bottom: 10px !important
76
+
77
+ .pvl
78
+ padding-top: 20px !important
79
+ padding-bottom: 20px !important
80
+
81
+ .pvxl
82
+ padding-top: 30px !important
83
+ padding-bottom: 30px !important
84
+
85
+ .phn
86
+ padding-right: 0px !important
87
+ padding-left: 0px !important
88
+
89
+ .phx
90
+ padding-right: 3px !important
91
+ padding-left: 3px !important
92
+
93
+ .phs
94
+ padding-right: 5px !important
95
+ padding-left: 5px !important
96
+
97
+ .phm
98
+ padding-right: 10px !important
99
+ padding-left: 10px !important
100
+
101
+ .phl
102
+ padding-right: 20px !important
103
+ padding-left: 20px !important
104
+
105
+ .phxl
106
+ padding-right: 30px !important
107
+ padding-left: 30px !important
108
+
109
+ .ptn
110
+ padding-top: 0px !important
111
+
112
+ .ptx
113
+ padding-top: 3px !important
114
+
115
+ .pts
116
+ padding-top: 5px !important
117
+
118
+ .ptm
119
+ padding-top: 10px !important
120
+
121
+ .ptl
122
+ padding-top: 20px !important
123
+
124
+ .ptxl
125
+ padding-top: 30px !important
126
+
127
+ .prn
128
+ padding-right: 0px !important
129
+
130
+ .prx
131
+ padding-right: 3px !important
132
+
133
+ .prs
134
+ padding-right: 5px !important
135
+
136
+ .prm
137
+ padding-right: 10px !important
138
+
139
+ .prl
140
+ padding-right: 20px !important
141
+
142
+ .prxl
143
+ padding-right: 30px !important
144
+
145
+ .pbn
146
+ padding-bottom: 0px !important
147
+
148
+ .pbx
149
+ padding-bottom: 3px !important
150
+
151
+ .pbs
152
+ padding-bottom: 5px !important
153
+
154
+ .pbm
155
+ padding-bottom: 10px !important
156
+
157
+ .pbl
158
+ padding-bottom: 20px !important
159
+
160
+ .pbxl
161
+ padding-bottom: 30px !important
162
+
163
+ .pln
164
+ padding-left: 0px !important
165
+
166
+ .plx
167
+ padding-left: 3px !important
168
+
169
+ .pls
170
+ padding-left: 5px !important
171
+
172
+ .plm
173
+ padding-left: 10px !important
174
+
175
+ .pll
176
+ padding-left: 20px !important
177
+
178
+ .plxl
179
+ padding-left: 30px !important
180
+
181
+ .mvn
182
+ margin-top: 0px !important
183
+ margin-bottom: 0px !important
184
+
185
+ .mvx
186
+ margin-top: 3px !important
187
+ margin-bottom: 3px !important
188
+
189
+ .mvs
190
+ margin-top: 5px !important
191
+ margin-bottom: 5px !important
192
+
193
+ .mvm
194
+ margin-top: 10px !important
195
+ margin-bottom: 10px !important
196
+
197
+ .mvl
198
+ margin-top: 20px !important
199
+ margin-bottom: 20px !important
200
+
201
+ .mvxl
202
+ margin-top: 30px !important
203
+ margin-bottom: 30px !important
204
+
205
+ .mhn
206
+ margin-right: 0px !important
207
+ margin-left: 0px !important
208
+
209
+ .mhx
210
+ margin-right: 3px !important
211
+ margin-left: 3px !important
212
+
213
+ .mhs
214
+ margin-right: 5px !important
215
+ margin-left: 5px !important
216
+
217
+ .mhm
218
+ margin-right: 10px !important
219
+ margin-left: 10px !important
220
+
221
+ .mhl
222
+ margin-right: 20px !important
223
+ margin-left: 20px !important
224
+
225
+ .mhxl
226
+ margin-right: 30px !important
227
+ margin-left: 30px !important
228
+
229
+ .mtn
230
+ margin-top: 0px !important
231
+
232
+ .mtx
233
+ margin-top: 3px !important
234
+
235
+ .mts
236
+ margin-top: 5px !important
237
+
238
+ .mtm
239
+ margin-top: 10px !important
240
+
241
+ .mtl
242
+ margin-top: 20px !important
243
+
244
+ .mtxl
245
+ margin-top: 30px !important
246
+
247
+ .mrn
248
+ margin-right: 0px !important
249
+
250
+ .mrx
251
+ margin-right: 3px !important
252
+
253
+ .mrs
254
+ margin-right: 5px !important
255
+
256
+ .mrm
257
+ margin-right: 10px !important
258
+
259
+ .mrl
260
+ margin-right: 20px !important
261
+
262
+ .mrxl
263
+ margin-right: 30px !important
264
+
265
+ .mbn
266
+ margin-bottom: 0px !important
267
+
268
+ .mbx
269
+ margin-bottom: 3px !important
270
+
271
+ .mbs
272
+ margin-bottom: 5px !important
273
+
274
+ .mbm
275
+ margin-bottom: 10px !important
276
+
277
+ .mbl
278
+ margin-bottom: 20px !important
279
+
280
+ .mbxl
281
+ margin-bottom: 30px !important
282
+
283
+ .mln
284
+ margin-left: 0px !important
285
+
286
+ .mlx
287
+ margin-left: 3px !important
288
+
289
+ .mls
290
+ margin-left: 5px !important
291
+
292
+ .mlm
293
+ margin-left: 10px !important
294
+
295
+ .mll
296
+ margin-left: 20px !important
297
+
298
+ .mlxl
299
+ margin-left: 30px !important
@@ -1,10 +1,4 @@
1
1
  class Settings < Settingslogic
2
- def self.load_files
3
- files = Dir["#{Rails.root}/config/settings/**/*.yml"] - Dir["#{Rails.root}/config/settings/beerify/**/*.yml"]
4
-
5
- Dir["#{Rails.root}/config/settings/beerify/**/*.yml"] + files
6
- end
7
-
8
- source load_files
2
+ source "#{Rails.root}/config/application.yml"
9
3
  namespace Rails.env
10
4
  end
@@ -2,7 +2,6 @@ class User < ActiveRecord::Base
2
2
  devise :database_authenticatable,
3
3
  :recoverable,
4
4
  :rememberable,
5
- :token_authenticatable,
6
5
  :trackable,
7
6
  :validatable
8
7
 
@@ -0,0 +1,9 @@
1
+ h2= t('.resend_confirmation_instructions')
2
+
3
+ = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
4
+ .form-inputs
5
+ = f.input :email
6
+ .form-actions
7
+ = f.submit t('.resend_confirmation_instructions'), class: 'btn btn-success'
8
+
9
+ = render 'devise/shared/links'
@@ -0,0 +1,3 @@
1
+ p= t('.greeting', recipient: @resource.email)
2
+ p= t('.instruction')
3
+ p= link_to t('.action'), confirmation_url(@resource, confirmation_token: @resource.confirmation_token), class: 'btn btn-success'
@@ -0,0 +1,5 @@
1
+ p= t('.greeting', recipient: @resource.email)
2
+ p= t('.instruction')
3
+ p= link_to t('.action'), edit_password_url(@resource, reset_password_token: @resource.reset_password_token), class: 'btn'
4
+ p= t('.instruction_2')
5
+ p= t('.instruction_3')
@@ -0,0 +1,4 @@
1
+ p= t('.greeting', recipient: @resource.email, default: "Hello #{@resource.email}"
2
+ p= t('.message')
3
+ p= t('.instruction')
4
+ p= link_to t('.action'), unlock_url(@resource, unlock_token: @resource.unlock_token), class: 'btn btn-success'
@@ -0,0 +1,11 @@
1
+ h2= t('.change_your_password')
2
+
3
+ = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
4
+ = f.hidden_field :reset_password_token
5
+ .form-inputs
6
+ = f.input :password, required: true, autofocus: true
7
+ = f.input :password_confirmation, label: t('.confirm_new_password'), required: true
8
+ .form-actions
9
+ = f.submit t('.change_my_password'), class: 'btn btn-success'
10
+
11
+ = render 'devise/shared/links'
@@ -0,0 +1,9 @@
1
+ h2= t('.forgot_your_password')
2
+
3
+ = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
4
+ .form-inputs
5
+ = f.input :email
6
+ .form-actions
7
+ = f.submit t('.send_me_reset_password_instructions'), class: 'btn btn-success'
8
+
9
+ = render 'devise/shared/links'
@@ -0,0 +1,13 @@
1
+ h2= t('.title', resource: resource_class.model_name.human)
2
+
3
+ = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
4
+ .form-inputs
5
+ = f.input :email, required: true, autofocus: true
6
+ = f.input :password, autocomplete: 'off', hint: t('.leave_blank_if_you_don_t_want_to_change_it'), required: false
7
+ = f.input :password_confirmation, required: false
8
+ = f.input :current_password, hint: t('.we_need_your_current_password_to_confirm_your_changes'), required: true
9
+ .form-actions
10
+ = f.submit t('.update'), class: 'btn btn-success'
11
+
12
+ h3= t('.cancel_my_account')
13
+ = link_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete, class: 'btn btn-danger'
@@ -0,0 +1,11 @@
1
+ h2= t('.sign_up')
2
+
3
+ = simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
4
+ .form-inputs
5
+ = f.input :email, required: true, autofocus: true
6
+ = f.input :password, required: true
7
+ = f.input :password_confirmation
8
+ .form-actions
9
+ = f.submit t('.sign_up'), class: 'btn btn-success'
10
+
11
+ = render 'devise/shared/links'
@@ -0,0 +1,11 @@
1
+ h2= t('.sign_in')
2
+
3
+ = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
4
+ .form-inputs
5
+ = f.input :email
6
+ = f.input :password
7
+ = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
8
+ .form-actions
9
+ = f.submit t('.sign_in'), class: 'btn btn-success'
10
+
11
+ = render 'devise/shared/links'