fl 0.3.4 → 0.3.5
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/.gitignore +1 -1
- data/Gemfile.lock +153 -82
- data/app/admin/options.rb +1 -1
- data/app/admin/pages.rb +1 -1
- data/app/admin/users.rb +1 -1
- data/app/assets/javascripts/active_admin.coffee.erb +2 -1
- data/app/assets/stylesheets/active_admin.sass +0 -6
- data/app/assets/stylesheets/application.sass.erb +2 -2
- data/app/controllers/application_controller.rb +3 -0
- data/app/models/profile.rb +1 -1
- data/config/initializers/active_admin.rb +20 -2
- data/config/initializers/ckeditor.rb +1 -1
- data/config/locales/en.yml +5 -5
- data/config/puma.rb +11 -43
- data/config/routes.rb +14 -7
- data/db/seeds.rb +1 -1
- data/fl.gemspec +13 -12
- data/lib/fl/constants.rb +1 -1
- data/lib/fl/engine.rb +0 -3
- metadata +18 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 972325c1b6752f9815326c71692829c8d0ac4409
|
|
4
|
+
data.tar.gz: 4955e3ec80216783db135732be1ea76a3a95e483
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 074cedc3b3b5e75642e705d43a208559150114046f2116b1925ea0f2905d26aa4ce2c46e64749c23bb60d28d9f26b07b2c61fe4d999dd63fc41e6f2c2909d542
|
|
7
|
+
data.tar.gz: 43d8d0c6af36b7795a6bdff8dd0ee1eded11d370074810c5d6b5b7cd8f92cd8659300d9dc558a8b843927aec2a37ee7967d01f7cf62c17444386412739ee482c
|
data/.gitignore
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
fl (0.
|
|
4
|
+
fl (0.3.4)
|
|
5
|
+
activeadmin
|
|
5
6
|
autoprefixer-rails
|
|
7
|
+
bootstrap (~> 4.0.0.beta)
|
|
8
|
+
ckeditor
|
|
6
9
|
devise
|
|
7
10
|
exception_handler
|
|
8
11
|
font-awesome-rails
|
|
9
12
|
friendly_id
|
|
13
|
+
liquid
|
|
10
14
|
nilify_blanks
|
|
11
15
|
paperclip
|
|
12
16
|
rails (>= 5)
|
|
13
|
-
rails-assets-animate-css
|
|
14
17
|
responders
|
|
15
18
|
rmagick
|
|
16
19
|
|
|
@@ -18,93 +21,145 @@ GEM
|
|
|
18
21
|
remote: https://rubygems.org/
|
|
19
22
|
remote: https://rails-assets.org/
|
|
20
23
|
specs:
|
|
21
|
-
actioncable (5.
|
|
22
|
-
actionpack (= 5.
|
|
23
|
-
nio4r (~>
|
|
24
|
+
actioncable (5.1.4)
|
|
25
|
+
actionpack (= 5.1.4)
|
|
26
|
+
nio4r (~> 2.0)
|
|
24
27
|
websocket-driver (~> 0.6.1)
|
|
25
|
-
actionmailer (5.
|
|
26
|
-
actionpack (= 5.
|
|
27
|
-
actionview (= 5.
|
|
28
|
-
activejob (= 5.
|
|
28
|
+
actionmailer (5.1.4)
|
|
29
|
+
actionpack (= 5.1.4)
|
|
30
|
+
actionview (= 5.1.4)
|
|
31
|
+
activejob (= 5.1.4)
|
|
29
32
|
mail (~> 2.5, >= 2.5.4)
|
|
30
33
|
rails-dom-testing (~> 2.0)
|
|
31
|
-
actionpack (5.
|
|
32
|
-
actionview (= 5.
|
|
33
|
-
activesupport (= 5.
|
|
34
|
+
actionpack (5.1.4)
|
|
35
|
+
actionview (= 5.1.4)
|
|
36
|
+
activesupport (= 5.1.4)
|
|
34
37
|
rack (~> 2.0)
|
|
35
|
-
rack-test (
|
|
38
|
+
rack-test (>= 0.6.3)
|
|
36
39
|
rails-dom-testing (~> 2.0)
|
|
37
40
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
|
38
|
-
actionview (5.
|
|
39
|
-
activesupport (= 5.
|
|
41
|
+
actionview (5.1.4)
|
|
42
|
+
activesupport (= 5.1.4)
|
|
40
43
|
builder (~> 3.1)
|
|
41
|
-
|
|
44
|
+
erubi (~> 1.4)
|
|
42
45
|
rails-dom-testing (~> 2.0)
|
|
43
|
-
rails-html-sanitizer (~> 1.0, >= 1.0.
|
|
44
|
-
|
|
45
|
-
|
|
46
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
|
47
|
+
activeadmin (1.1.0)
|
|
48
|
+
arbre (>= 1.1.1)
|
|
49
|
+
coffee-rails
|
|
50
|
+
formtastic (~> 3.1)
|
|
51
|
+
formtastic_i18n
|
|
52
|
+
inherited_resources (~> 1.7)
|
|
53
|
+
jquery-rails
|
|
54
|
+
kaminari (>= 0.15, < 2.0)
|
|
55
|
+
railties (>= 4.2, < 5.2)
|
|
56
|
+
ransack (~> 1.3)
|
|
57
|
+
sass (~> 3.1)
|
|
58
|
+
sprockets (< 4.1)
|
|
59
|
+
activejob (5.1.4)
|
|
60
|
+
activesupport (= 5.1.4)
|
|
46
61
|
globalid (>= 0.3.6)
|
|
47
|
-
activemodel (5.
|
|
48
|
-
activesupport (= 5.
|
|
49
|
-
activerecord (5.
|
|
50
|
-
activemodel (= 5.
|
|
51
|
-
activesupport (= 5.
|
|
52
|
-
arel (~>
|
|
53
|
-
activesupport (5.
|
|
62
|
+
activemodel (5.1.4)
|
|
63
|
+
activesupport (= 5.1.4)
|
|
64
|
+
activerecord (5.1.4)
|
|
65
|
+
activemodel (= 5.1.4)
|
|
66
|
+
activesupport (= 5.1.4)
|
|
67
|
+
arel (~> 8.0)
|
|
68
|
+
activesupport (5.1.4)
|
|
54
69
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
55
70
|
i18n (~> 0.7)
|
|
56
71
|
minitest (~> 5.1)
|
|
57
72
|
tzinfo (~> 1.1)
|
|
58
|
-
|
|
59
|
-
|
|
73
|
+
arbre (1.1.1)
|
|
74
|
+
activesupport (>= 3.0.0)
|
|
75
|
+
arel (8.0.0)
|
|
76
|
+
autoprefixer-rails (7.1.4)
|
|
60
77
|
execjs
|
|
61
78
|
bcrypt (3.1.11-x64-mingw32)
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
79
|
+
bootstrap (4.0.0.beta)
|
|
80
|
+
autoprefixer-rails (>= 6.0.3)
|
|
81
|
+
popper_js (~> 1.11.1)
|
|
82
|
+
sass (>= 3.4.19)
|
|
66
83
|
builder (3.2.3)
|
|
67
|
-
|
|
84
|
+
ckeditor (4.2.4)
|
|
85
|
+
cocaine
|
|
86
|
+
orm_adapter (~> 0.5.0)
|
|
87
|
+
climate_control (0.2.0)
|
|
68
88
|
cocaine (0.5.8)
|
|
69
89
|
climate_control (>= 0.0.3, < 1.0)
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
90
|
+
coffee-rails (4.2.2)
|
|
91
|
+
coffee-script (>= 2.2.0)
|
|
92
|
+
railties (>= 4.0.0)
|
|
93
|
+
coffee-script (2.4.1)
|
|
94
|
+
coffee-script-source
|
|
95
|
+
execjs
|
|
96
|
+
coffee-script-source (1.12.2)
|
|
97
|
+
concurrent-ruby (1.0.5)
|
|
98
|
+
devise (4.3.0)
|
|
73
99
|
bcrypt (~> 3.0)
|
|
74
100
|
orm_adapter (~> 0.1)
|
|
75
|
-
railties (>= 4.1.0, < 5.
|
|
101
|
+
railties (>= 4.1.0, < 5.2)
|
|
76
102
|
responders
|
|
77
103
|
warden (~> 1.2.3)
|
|
78
|
-
|
|
79
|
-
exception_handler (0.7.0)
|
|
80
|
-
bundler
|
|
104
|
+
erubi (1.6.1)
|
|
105
|
+
exception_handler (0.7.7.0)
|
|
106
|
+
bundler
|
|
81
107
|
rails (>= 4.2.0)
|
|
82
108
|
responders
|
|
83
109
|
execjs (2.7.0)
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
110
|
+
ffi (1.9.18-x64-mingw32)
|
|
111
|
+
font-awesome-rails (4.7.0.2)
|
|
112
|
+
railties (>= 3.2, < 5.2)
|
|
113
|
+
formtastic (3.1.5)
|
|
114
|
+
actionpack (>= 3.2.13)
|
|
115
|
+
formtastic_i18n (0.6.0)
|
|
116
|
+
friendly_id (5.2.2)
|
|
87
117
|
activerecord (>= 4.0.0)
|
|
88
|
-
globalid (0.
|
|
118
|
+
globalid (0.4.0)
|
|
119
|
+
activesupport (>= 4.2.0)
|
|
120
|
+
has_scope (0.7.1)
|
|
121
|
+
actionpack (>= 4.1, < 5.2)
|
|
122
|
+
activesupport (>= 4.1, < 5.2)
|
|
123
|
+
i18n (0.8.6)
|
|
124
|
+
inherited_resources (1.7.2)
|
|
125
|
+
actionpack (>= 3.2, < 5.2.x)
|
|
126
|
+
has_scope (~> 0.6)
|
|
127
|
+
railties (>= 3.2, < 5.2.x)
|
|
128
|
+
responders
|
|
129
|
+
jquery-rails (4.3.1)
|
|
130
|
+
rails-dom-testing (>= 1, < 3)
|
|
131
|
+
railties (>= 4.2.0)
|
|
132
|
+
thor (>= 0.14, < 2.0)
|
|
133
|
+
kaminari (1.0.1)
|
|
89
134
|
activesupport (>= 4.1.0)
|
|
90
|
-
|
|
135
|
+
kaminari-actionview (= 1.0.1)
|
|
136
|
+
kaminari-activerecord (= 1.0.1)
|
|
137
|
+
kaminari-core (= 1.0.1)
|
|
138
|
+
kaminari-actionview (1.0.1)
|
|
139
|
+
actionview
|
|
140
|
+
kaminari-core (= 1.0.1)
|
|
141
|
+
kaminari-activerecord (1.0.1)
|
|
142
|
+
activerecord
|
|
143
|
+
kaminari-core (= 1.0.1)
|
|
144
|
+
kaminari-core (1.0.1)
|
|
145
|
+
liquid (4.0.0)
|
|
91
146
|
loofah (2.0.3)
|
|
92
147
|
nokogiri (>= 1.5.9)
|
|
93
|
-
mail (2.6.
|
|
148
|
+
mail (2.6.6)
|
|
94
149
|
mime-types (>= 1.16, < 4)
|
|
95
150
|
method_source (0.8.2)
|
|
96
151
|
mime-types (3.1)
|
|
97
152
|
mime-types-data (~> 3.2015)
|
|
98
153
|
mime-types-data (3.2016.0521)
|
|
99
154
|
mimemagic (0.3.2)
|
|
100
|
-
mini_portile2 (2.
|
|
101
|
-
minitest (5.10.
|
|
155
|
+
mini_portile2 (2.3.0)
|
|
156
|
+
minitest (5.10.3)
|
|
102
157
|
nilify_blanks (1.2.1)
|
|
103
158
|
activerecord (>= 3.0.0)
|
|
104
159
|
activesupport (>= 3.0.0)
|
|
105
|
-
nio4r (
|
|
106
|
-
nokogiri (1.
|
|
107
|
-
mini_portile2 (~> 2.
|
|
160
|
+
nio4r (2.1.0)
|
|
161
|
+
nokogiri (1.8.1-x64-mingw32)
|
|
162
|
+
mini_portile2 (~> 2.3.0)
|
|
108
163
|
orm_adapter (0.5.0)
|
|
109
164
|
paperclip (5.1.0)
|
|
110
165
|
activemodel (>= 4.2.0)
|
|
@@ -112,51 +167,68 @@ GEM
|
|
|
112
167
|
cocaine (~> 0.5.5)
|
|
113
168
|
mime-types
|
|
114
169
|
mimemagic (~> 0.3.0)
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
170
|
+
polyamorous (1.3.1)
|
|
171
|
+
activerecord (>= 3.0)
|
|
172
|
+
popper_js (1.11.1)
|
|
173
|
+
rack (2.0.3)
|
|
174
|
+
rack-test (0.7.0)
|
|
175
|
+
rack (>= 1.0, < 3)
|
|
176
|
+
rails (5.1.4)
|
|
177
|
+
actioncable (= 5.1.4)
|
|
178
|
+
actionmailer (= 5.1.4)
|
|
179
|
+
actionpack (= 5.1.4)
|
|
180
|
+
actionview (= 5.1.4)
|
|
181
|
+
activejob (= 5.1.4)
|
|
182
|
+
activemodel (= 5.1.4)
|
|
183
|
+
activerecord (= 5.1.4)
|
|
184
|
+
activesupport (= 5.1.4)
|
|
185
|
+
bundler (>= 1.3.0)
|
|
186
|
+
railties (= 5.1.4)
|
|
129
187
|
sprockets-rails (>= 2.0.0)
|
|
130
|
-
rails-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
nokogiri (~> 1.6)
|
|
188
|
+
rails-dom-testing (2.0.3)
|
|
189
|
+
activesupport (>= 4.2.0)
|
|
190
|
+
nokogiri (>= 1.6)
|
|
134
191
|
rails-html-sanitizer (1.0.3)
|
|
135
192
|
loofah (~> 2.0)
|
|
136
|
-
railties (5.
|
|
137
|
-
actionpack (= 5.
|
|
138
|
-
activesupport (= 5.
|
|
193
|
+
railties (5.1.4)
|
|
194
|
+
actionpack (= 5.1.4)
|
|
195
|
+
activesupport (= 5.1.4)
|
|
139
196
|
method_source
|
|
140
197
|
rake (>= 0.8.7)
|
|
141
198
|
thor (>= 0.18.1, < 2.0)
|
|
142
199
|
rake (10.5.0)
|
|
143
|
-
|
|
144
|
-
|
|
200
|
+
ransack (1.8.3)
|
|
201
|
+
actionpack (>= 3.0)
|
|
202
|
+
activerecord (>= 3.0)
|
|
203
|
+
activesupport (>= 3.0)
|
|
204
|
+
i18n
|
|
205
|
+
polyamorous (~> 1.3)
|
|
206
|
+
rb-fsevent (0.10.2)
|
|
207
|
+
rb-inotify (0.9.10)
|
|
208
|
+
ffi (>= 0.5.0, < 2)
|
|
209
|
+
responders (2.4.0)
|
|
210
|
+
actionpack (>= 4.2.0, < 5.3)
|
|
211
|
+
railties (>= 4.2.0, < 5.3)
|
|
145
212
|
rmagick (2.16.0)
|
|
213
|
+
sass (3.5.1)
|
|
214
|
+
sass-listen (~> 4.0.0)
|
|
215
|
+
sass-listen (4.0.0)
|
|
216
|
+
rb-fsevent (~> 0.9, >= 0.9.4)
|
|
217
|
+
rb-inotify (~> 0.9, >= 0.9.7)
|
|
146
218
|
sprockets (3.7.1)
|
|
147
219
|
concurrent-ruby (~> 1.0)
|
|
148
220
|
rack (> 1, < 3)
|
|
149
|
-
sprockets-rails (3.2.
|
|
221
|
+
sprockets-rails (3.2.1)
|
|
150
222
|
actionpack (>= 4.0)
|
|
151
223
|
activesupport (>= 4.0)
|
|
152
224
|
sprockets (>= 3.0.0)
|
|
153
|
-
thor (0.
|
|
154
|
-
thread_safe (0.3.
|
|
155
|
-
tzinfo (1.2.
|
|
225
|
+
thor (0.20.0)
|
|
226
|
+
thread_safe (0.3.6)
|
|
227
|
+
tzinfo (1.2.3)
|
|
156
228
|
thread_safe (~> 0.1)
|
|
157
|
-
warden (1.2.
|
|
229
|
+
warden (1.2.7)
|
|
158
230
|
rack (>= 1.0)
|
|
159
|
-
websocket-driver (0.6.
|
|
231
|
+
websocket-driver (0.6.5)
|
|
160
232
|
websocket-extensions (>= 0.1.0)
|
|
161
233
|
websocket-extensions (0.1.2)
|
|
162
234
|
|
|
@@ -164,10 +236,9 @@ PLATFORMS
|
|
|
164
236
|
x64-mingw32
|
|
165
237
|
|
|
166
238
|
DEPENDENCIES
|
|
167
|
-
better_errors
|
|
168
239
|
bundler (~> 1.12)
|
|
169
240
|
fl!
|
|
170
241
|
rake (~> 10.0)
|
|
171
242
|
|
|
172
243
|
BUNDLED WITH
|
|
173
|
-
1.
|
|
244
|
+
1.16.0.pre.2
|
data/app/admin/options.rb
CHANGED
|
@@ -17,7 +17,7 @@ unless (model.constantize rescue nil).nil?
|
|
|
17
17
|
##################################
|
|
18
18
|
|
|
19
19
|
# => Menu
|
|
20
|
-
menu priority: 2, label: -> { [
|
|
20
|
+
menu priority: 2, label: -> { ['🔒', model.constantize.model_name.human(count: 2)].join(' ') }
|
|
21
21
|
|
|
22
22
|
# => Strong Params
|
|
23
23
|
permit_params :slug, :ref, :val
|
data/app/admin/pages.rb
CHANGED
|
@@ -16,7 +16,7 @@ unless (model.constantize rescue nil).nil?
|
|
|
16
16
|
##################################
|
|
17
17
|
##################################
|
|
18
18
|
|
|
19
|
-
menu priority: 3, label: -> {
|
|
19
|
+
menu priority: 3, label: -> { ['🚀', model.constantize.model_name.human(count: 2)].join(' ') }
|
|
20
20
|
|
|
21
21
|
##################################
|
|
22
22
|
##################################
|
data/app/admin/users.rb
CHANGED
|
@@ -4,7 +4,7 @@ ActiveAdmin.register User do
|
|
|
4
4
|
##################################
|
|
5
5
|
|
|
6
6
|
# => Menu
|
|
7
|
-
menu priority: 1, label: -> {
|
|
7
|
+
menu priority: 1, label: -> { ['👽', User.model_name.human(count: 2)].join(' ') }
|
|
8
8
|
|
|
9
9
|
# => Params
|
|
10
10
|
permit_params :email, :password, :password_confirmation
|
|
@@ -10,9 +10,10 @@
|
|
|
10
10
|
############################################
|
|
11
11
|
############################################
|
|
12
12
|
|
|
13
|
+
# ActiveAdmin
|
|
13
14
|
#= require active_admin/base
|
|
14
15
|
|
|
15
|
-
<% if Gem.loaded_specs.has_key?
|
|
16
|
+
<% if Gem.loaded_specs.has_key? 'ckeditor' %>
|
|
16
17
|
#= require ckeditor/init
|
|
17
18
|
<% end %>
|
|
18
19
|
|
|
@@ -41,9 +41,6 @@
|
|
|
41
41
|
////////////////////////////////////////////////////////////
|
|
42
42
|
////////////////////////////////////////////////////////////
|
|
43
43
|
|
|
44
|
-
////////////////////////////////////////////////////////////
|
|
45
|
-
////////////////////////////////////////////////////////////
|
|
46
|
-
|
|
47
44
|
// General
|
|
48
45
|
// Fix small issues in ActieAdmin
|
|
49
46
|
#header
|
|
@@ -112,6 +109,3 @@
|
|
|
112
109
|
|
|
113
110
|
////////////////////////////////////////////////////////////
|
|
114
111
|
////////////////////////////////////////////////////////////
|
|
115
|
-
|
|
116
|
-
////////////////////////////////////////////////////////////
|
|
117
|
-
////////////////////////////////////////////////////////////
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
@import functions
|
|
33
33
|
|
|
34
34
|
// Libraries
|
|
35
|
-
|
|
35
|
+
//@import animate-css
|
|
36
36
|
@import <%= gdep.matching_specs.max_by(&:version) ? "font-awesome" : "ionicons" %>
|
|
37
37
|
|
|
38
38
|
////////////////////////////////////////////////////////////
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
|
|
41
41
|
// Styling
|
|
42
42
|
@import styles/**/*
|
|
43
|
-
|
|
43
|
+
//@import <%= Rails.root.join("app", "assets", "stylesheets", "styles", "**", "*") %>
|
|
44
44
|
|
|
45
45
|
////////////////////////////////////////////////////////////
|
|
46
46
|
////////////////////////////////////////////////////////////
|
|
@@ -16,6 +16,9 @@ class ApplicationController < ActionController::Base
|
|
|
16
16
|
# => Layout
|
|
17
17
|
layout Proc.new { |c| Rails.application.secrets[:app][:layout] unless c.request.xhr? }
|
|
18
18
|
|
|
19
|
+
# => Maintenance
|
|
20
|
+
before_action Proc.new { @maintenance = Node.find_by(ref: "maintenance").try(:val) }, only: :show
|
|
21
|
+
|
|
19
22
|
##################################
|
|
20
23
|
##################################
|
|
21
24
|
|
data/app/models/profile.rb
CHANGED
|
@@ -6,7 +6,7 @@ class Profile < ApplicationRecord
|
|
|
6
6
|
belongs_to :user, inverse_of: :profile
|
|
7
7
|
|
|
8
8
|
# Role
|
|
9
|
-
belongs_to :role, class_name: "Meta::Role", primary_key: :ref, foreign_key: :role
|
|
9
|
+
belongs_to :role, class_name: "Meta::Role", primary_key: :ref, foreign_key: :role, optional: true
|
|
10
10
|
|
|
11
11
|
# Avatar
|
|
12
12
|
has_one :avatar, class_name: "Asset", as: :assetable, dependent: :destroy
|
|
@@ -44,7 +44,7 @@ if Gem.loaded_specs.has_key?('activeadmin')
|
|
|
44
44
|
# config.default_namespace = false
|
|
45
45
|
#
|
|
46
46
|
# Default:
|
|
47
|
-
|
|
47
|
+
config.default_namespace = false
|
|
48
48
|
#
|
|
49
49
|
# You can customize the settings for each namespace by using
|
|
50
50
|
# a namespace block. For example, to change the site title
|
|
@@ -186,6 +186,12 @@ if Gem.loaded_specs.has_key?('activeadmin')
|
|
|
186
186
|
# Force the use of quotes
|
|
187
187
|
# config.csv_options = { force_quotes: true }
|
|
188
188
|
|
|
189
|
+
# == Batch Actions
|
|
190
|
+
#
|
|
191
|
+
# Enable and disable Batch Actions
|
|
192
|
+
#
|
|
193
|
+
config.batch_actions = true
|
|
194
|
+
|
|
189
195
|
# == Menu System
|
|
190
196
|
#
|
|
191
197
|
# You can add a navigation menu to be used in your application, or configure a provided menu
|
|
@@ -198,6 +204,18 @@ if Gem.loaded_specs.has_key?('activeadmin')
|
|
|
198
204
|
# admin.add_logout_button_to_menu menu
|
|
199
205
|
# end
|
|
200
206
|
# end
|
|
207
|
+
|
|
208
|
+
### Custom User Credentials (top right) ###
|
|
209
|
+
#config.namespace "" do |admin|
|
|
210
|
+
# admin.build_menu :utility_navigation do |menu|
|
|
211
|
+
## menu.add :label => proc{ display_name current_active_admin_user.name },
|
|
212
|
+
# :url => proc{ edit_admin_admin_user_path(current_active_admin_user) } ,#link_to current_active_admin_user,
|
|
213
|
+
# :id => 'current_user',
|
|
214
|
+
# :if => proc{ current_active_admin_user? }
|
|
215
|
+
# admin.add_logout_button_to_menu menu
|
|
216
|
+
# end
|
|
217
|
+
#end
|
|
218
|
+
|
|
201
219
|
#
|
|
202
220
|
# If you wanted to add a static menu item to the default menu provided:
|
|
203
221
|
#
|
|
@@ -259,7 +277,7 @@ if Gem.loaded_specs.has_key?('activeadmin')
|
|
|
259
277
|
# By default, the footer shows the current Active Admin version. You can
|
|
260
278
|
# override the content of the footer here.
|
|
261
279
|
#
|
|
262
|
-
config.footer = "<b><a href=\"#{Rails.application.secrets[:app][:domain]}\">#{Rails.application.secrets[:app][:name]}</a
|
|
280
|
+
config.footer = "<b><a href=\"#{Rails.application.secrets[:app][:domain]}\">#{Rails.application.secrets[:app][:name]}</a> © #{Date.today.year}</b>".html_safe
|
|
263
281
|
|
|
264
282
|
end
|
|
265
283
|
|
|
@@ -47,7 +47,7 @@ if Gem.loaded_specs.has_key? "ckeditor"
|
|
|
47
47
|
# To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
|
|
48
48
|
# By default: nil (no limit)
|
|
49
49
|
config.assets_languages = ['en', 'uk']
|
|
50
|
-
#
|
|
50
|
+
#config.assets_plugins = ['image', 'smiley']
|
|
51
51
|
|
|
52
52
|
# CKEditor CDN
|
|
53
53
|
# More info here http://cdn.ckeditor.com/
|
data/config/locales/en.yml
CHANGED
data/config/puma.rb
CHANGED
|
@@ -10,50 +10,18 @@
|
|
|
10
10
|
########################################
|
|
11
11
|
########################################
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
# Any libraries that use thread pools should be configured to match
|
|
16
|
-
# the maximum value specified for Puma. Default is set to 5 threads for minimum
|
|
17
|
-
# and maximum, this matches the default thread size of Active Record.
|
|
18
|
-
#
|
|
19
|
-
threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
|
|
13
|
+
workers Integer(ENV['WEB_CONCURRENCY'] || 2)
|
|
14
|
+
threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
|
|
20
15
|
threads threads_count, threads_count
|
|
21
16
|
|
|
22
|
-
|
|
23
|
-
# => https://github.com/puma/puma/issues/1200
|
|
24
|
-
port ENV.fetch("PORT") { 4200 }
|
|
17
|
+
preload_app!
|
|
25
18
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
environment ENV
|
|
19
|
+
rackup DefaultRackup
|
|
20
|
+
port ENV['PORT'] || 3000
|
|
21
|
+
environment ENV['RACK_ENV'] || 'development'
|
|
29
22
|
|
|
30
|
-
|
|
31
|
-
#
|
|
32
|
-
#
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
#
|
|
36
|
-
# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
|
|
37
|
-
|
|
38
|
-
# Use the `preload_app!` method when specifying a `workers` number.
|
|
39
|
-
# This directive tells Puma to first boot the application and load code
|
|
40
|
-
# before forking the application. This takes advantage of Copy On Write
|
|
41
|
-
# process behavior so workers use less memory. If you use this option
|
|
42
|
-
# you need to make sure to reconnect any threads in the `on_worker_boot`
|
|
43
|
-
# block.
|
|
44
|
-
#
|
|
45
|
-
# preload_app!
|
|
46
|
-
|
|
47
|
-
# The code in the `on_worker_boot` will be called if you are using
|
|
48
|
-
# clustered mode by specifying a number of `workers`. After each worker
|
|
49
|
-
# process is booted this block will be run, if you are using `preload_app!`
|
|
50
|
-
# option you will want to use this block to reconnect to any threads
|
|
51
|
-
# or connections that may have been created at application boot, Ruby
|
|
52
|
-
# cannot share connections between processes.
|
|
53
|
-
#
|
|
54
|
-
# on_worker_boot do
|
|
55
|
-
# ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
|
|
56
|
-
# end
|
|
57
|
-
|
|
58
|
-
# Allow puma to be restarted by `rails restart` command.
|
|
59
|
-
plugin :tmp_restart
|
|
23
|
+
on_worker_boot do
|
|
24
|
+
# Worker specific setup for Rails 4.1+
|
|
25
|
+
# See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
|
|
26
|
+
ActiveRecord::Base.establish_connection
|
|
27
|
+
end
|
data/config/routes.rb
CHANGED
|
@@ -25,9 +25,16 @@ Rails.application.routes.draw do
|
|
|
25
25
|
# => CKEditor
|
|
26
26
|
mount Ckeditor::Engine => '/ckeditor' if Gem.loaded_specs.has_key? "ckeditor"
|
|
27
27
|
|
|
28
|
-
# =>
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
# => ActiveAdmin
|
|
29
|
+
if Gem.loaded_specs.has_key? "activeadmin"
|
|
30
|
+
|
|
31
|
+
# => Admin
|
|
32
|
+
constraints subdomain: "admin" do
|
|
33
|
+
devise_for :users, ActiveAdmin::Devise.config
|
|
34
|
+
ActiveAdmin.routes(self)
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
end
|
|
31
38
|
|
|
32
39
|
########################################
|
|
33
40
|
########################################
|
|
@@ -36,15 +43,15 @@ Rails.application.routes.draw do
|
|
|
36
43
|
# => Shows index of app
|
|
37
44
|
root "application#show"
|
|
38
45
|
|
|
39
|
-
|
|
40
|
-
|
|
46
|
+
########################################
|
|
47
|
+
########################################
|
|
41
48
|
|
|
42
49
|
# Robots.txt
|
|
43
50
|
# => https://blog.ragnarson.com/2013/11/15/hide-your-staging-environment-from-google.html
|
|
44
51
|
get "robots.txt" => "application#robots", as: :robots
|
|
45
52
|
|
|
46
|
-
|
|
47
|
-
|
|
53
|
+
########################################
|
|
54
|
+
########################################
|
|
48
55
|
|
|
49
56
|
# => Everything else
|
|
50
57
|
# => Nodes shown through system
|
data/db/seeds.rb
CHANGED
|
@@ -27,7 +27,7 @@ end
|
|
|
27
27
|
########################################
|
|
28
28
|
|
|
29
29
|
# => Users
|
|
30
|
-
User.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password', send_email: true) unless User.
|
|
30
|
+
User.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password', send_email: true) unless User.any?
|
|
31
31
|
|
|
32
32
|
########################################
|
|
33
33
|
########################################
|
data/fl.gemspec
CHANGED
|
@@ -45,26 +45,27 @@ Gem::Specification.new do |spec|
|
|
|
45
45
|
##############################################################
|
|
46
46
|
|
|
47
47
|
## Dev ##
|
|
48
|
-
spec.add_development_dependency
|
|
49
|
-
spec.add_development_dependency
|
|
48
|
+
spec.add_development_dependency 'bundler', '~> 1.16'
|
|
49
|
+
spec.add_development_dependency 'rake', '~> 10.0'
|
|
50
50
|
|
|
51
51
|
## Prod ##
|
|
52
|
-
spec.add_dependency
|
|
53
|
-
spec.add_dependency
|
|
54
|
-
spec.add_dependency
|
|
55
|
-
spec.add_dependency
|
|
52
|
+
spec.add_dependency 'rails', '>= 5' # => Rails
|
|
53
|
+
spec.add_dependency 'sprockets', '~> 3.7.1' # => Sprockets
|
|
54
|
+
spec.add_dependency 'autoprefixer-rails' # => Autoprefixer
|
|
55
|
+
spec.add_dependency 'font-awesome-rails' # => Icons
|
|
56
|
+
spec.add_dependency 'activeadmin' # => ActiveAdmin
|
|
56
57
|
|
|
57
58
|
## Backend ##
|
|
58
59
|
spec.add_dependency 'bootstrap', '~> 4.0.0.beta' # => Bootstrap (tooltips)
|
|
59
60
|
spec.add_dependency 'liquid' # => Liquid
|
|
60
61
|
spec.add_dependency 'ckeditor' # => CKEditor
|
|
61
62
|
spec.add_dependency 'nilify_blanks' # => Nilify Blanks
|
|
62
|
-
spec.add_dependency
|
|
63
|
-
spec.add_dependency
|
|
64
|
-
spec.add_dependency
|
|
65
|
-
spec.add_dependency
|
|
66
|
-
spec.add_dependency
|
|
67
|
-
spec.add_dependency
|
|
63
|
+
spec.add_dependency 'paperclip' # => Paperclip
|
|
64
|
+
spec.add_dependency 'rmagick' # => RMagick
|
|
65
|
+
spec.add_dependency 'friendly_id' # => FriendlyID
|
|
66
|
+
spec.add_dependency 'devise' # => Devise
|
|
67
|
+
spec.add_dependency 'exception_handler' # => ExceptionHandler
|
|
68
|
+
spec.add_dependency 'responders' # => Responders (used in controller)
|
|
68
69
|
|
|
69
70
|
##############################################################
|
|
70
71
|
##############################################################
|
data/lib/fl/constants.rb
CHANGED
data/lib/fl/engine.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fl
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- R.Peck
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-09-
|
|
11
|
+
date: 2017-09-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: '1.
|
|
19
|
+
version: '1.16'
|
|
20
20
|
type: :development
|
|
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: '1.
|
|
26
|
+
version: '1.16'
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: rake
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -52,6 +52,20 @@ dependencies:
|
|
|
52
52
|
- - ">="
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '5'
|
|
55
|
+
- !ruby/object:Gem::Dependency
|
|
56
|
+
name: sprockets
|
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
|
58
|
+
requirements:
|
|
59
|
+
- - "~>"
|
|
60
|
+
- !ruby/object:Gem::Version
|
|
61
|
+
version: 3.7.1
|
|
62
|
+
type: :runtime
|
|
63
|
+
prerelease: false
|
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
65
|
+
requirements:
|
|
66
|
+
- - "~>"
|
|
67
|
+
- !ruby/object:Gem::Version
|
|
68
|
+
version: 3.7.1
|
|
55
69
|
- !ruby/object:Gem::Dependency
|
|
56
70
|
name: autoprefixer-rails
|
|
57
71
|
requirement: !ruby/object:Gem::Requirement
|