Description:
jquery, bootstrap ok
Commit status:
[Not Reviewed]
References:
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r865:8fe37a31b728 - - The requested commit is too big and content was truncated. 139 files changed. Show full diff

@@ -0,0 +1,9
1 + import { Application } from "@hotwired/stimulus"
2 +
3 + const application = Application.start()
4 +
5 + // Configure Stimulus development experience
6 + application.debug = false
7 + window.Stimulus = application
8 +
9 + export { application }
@@ -0,0 +1,7
1 + import { Controller } from "@hotwired/stimulus"
2 +
3 + export default class extends Controller {
4 + connect() {
5 + this.element.textContent = "Hello World!"
6 + }
7 + }
@@ -0,0 +1,11
1 + // Import and register all your controllers from the importmap under controllers/*
2 +
3 + import { application } from "controllers/application"
4 +
5 + // Eager load all controllers defined in the import map under controllers/**/*_controller
6 + import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
7 + eagerLoadControllersFrom("controllers", application)
8 +
9 + // Lazy load controllers as they appear in the DOM (remember not to preload controllers in import map!)
10 + // import { lazyLoadControllersFrom } from "@hotwired/stimulus-loading"
11 + // lazyLoadControllersFrom("controllers", application)
@@ -0,0 +1,11
1 + //we need jquery to load first, this is enforced by
2 + // doing
3 + // <%= javascript_import_module_tag('prepen_jquery') %>
4 + // before
5 + // <%= javascript_importmap_tags %>
6 + // (which loads application.js
7 +
8 + import jQuery from "jquery"
9 + window.$ = window.jQuery = jQuery;
10 +
11 + console.log('i am prepend_jquery');
new file 100644
@@ -33,66 +33,67
33 # in production environments by default.
33 # in production environments by default.
34 #sass-rails is depricated
34 #sass-rails is depricated
35 #gem 'sass-rails'
35 #gem 'sass-rails'
36 gem 'sassc-rails'
36 gem 'sassc-rails'
37 gem 'coffee-rails'
37 gem 'coffee-rails'
38
38
39 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
39 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
40 # gem 'therubyracer', :platforms => :ruby
40 # gem 'therubyracer', :platforms => :ruby
41
41
42 gem 'uglifier'
42 gem 'uglifier'
43
43
44 gem 'haml'
44 gem 'haml'
45 gem 'haml-rails'
45 gem 'haml-rails'
46
46
47 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
47 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
48 #gem 'turbolinks', '~> 5'
48 #gem 'turbolinks', '~> 5'
49 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
49 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
50 gem 'jbuilder'
50 gem 'jbuilder'
51
51
52
52
53 #in-place editor
53 #in-place editor
54 gem 'best_in_place', git: "https://github.com/mmotherwell/best_in_place"
54 gem 'best_in_place', git: "https://github.com/mmotherwell/best_in_place"
55
55
56 # jquery addition
56 # jquery addition
57 - gem 'jquery-rails'
57 + #gem 'jquery-rails'
58 - gem 'jquery-ui-rails'
58 + #gem 'jquery-ui-rails'
59 #gem 'jquery-timepicker-addon-rails'
59 #gem 'jquery-timepicker-addon-rails'
60 - gem 'jquery-tablesorter'
60 + #gem 'jquery-tablesorter'
61 - gem 'jquery-countdown-rails'
61 + #gem 'jquery-countdown-rails'
62
62
63 #syntax highlighter
63 #syntax highlighter
64 gem 'rouge'
64 gem 'rouge'
65
65
66 #bootstrap add-ons
66 #bootstrap add-ons
67 - gem 'bootstrap-sass', '~> 3.4.1'
67 + #gem 'bootstrap-sass', '~> 3.4.1'
68 - gem 'bootstrap-switch-rails'
68 + gem 'bootstrap', '~> 5.2'
69 - gem 'bootstrap-toggle-rails'
69 + #gem 'bootstrap-switch-rails'
70 - gem 'autoprefixer-rails'
70 + #gem 'bootstrap-toggle-rails'
71 - gem 'momentjs-rails', '>= 2.9.0'
71 + #gem 'autoprefixer-rails'
72 - gem 'rails_bootstrap_sortable'
72 + #gem 'momentjs-rails', '>= 2.9.0'
73 + #gem 'rails_bootstrap_sortable'
73 #gem 'bootstrap-datepicker-rails'
74 #gem 'bootstrap-datepicker-rails'
74 - gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
75 + #gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
75 #gem 'jquery-datatables-rails'
76 #gem 'jquery-datatables-rails'
76
77
77 #----------- user interface -----------------
78 #----------- user interface -----------------
78 gem 'simple_form'
79 gem 'simple_form'
79 #select 2
80 #select 2
80 gem 'select2-rails'
81 gem 'select2-rails'
81 #ace editor
82 #ace editor
82 gem 'ace-rails-ap'
83 gem 'ace-rails-ap'
83 #paginator
84 #paginator
84 #gem 'will_paginate', '~> 3.0.7'
85 #gem 'will_paginate', '~> 3.0.7'
85
86
86 gem 'mail'
87 gem 'mail'
87 gem 'rdiscount'
88 gem 'rdiscount'
88 gem 'dynamic_form'
89 gem 'dynamic_form'
89 gem 'in_place_editing'
90 gem 'in_place_editing'
90 #gem 'verification', :git => 'https://github.com/sikachu/verification.git'
91 #gem 'verification', :git => 'https://github.com/sikachu/verification.git'
91
92
92
93
93 #---------------- testiing -----------------------
94 #---------------- testiing -----------------------
94 gem 'minitest-reporters'
95 gem 'minitest-reporters'
95
96
96 #---------------- for console --------------------
97 #---------------- for console --------------------
97 gem 'fuzzy-string-match'
98 gem 'fuzzy-string-match'
98
99
@@ -71,55 +71,52
71 activerecord (>= 5.2.4.1)
71 activerecord (>= 5.2.4.1)
72 multi_json (~> 1.11, >= 1.11.2)
72 multi_json (~> 1.11, >= 1.11.2)
73 rack (>= 2.0.8, < 3)
73 rack (>= 2.0.8, < 3)
74 railties (>= 5.2.4.1)
74 railties (>= 5.2.4.1)
75 activestorage (7.0.4)
75 activestorage (7.0.4)
76 actionpack (= 7.0.4)
76 actionpack (= 7.0.4)
77 activejob (= 7.0.4)
77 activejob (= 7.0.4)
78 activerecord (= 7.0.4)
78 activerecord (= 7.0.4)
79 activesupport (= 7.0.4)
79 activesupport (= 7.0.4)
80 marcel (~> 1.0)
80 marcel (~> 1.0)
81 mini_mime (>= 1.1.0)
81 mini_mime (>= 1.1.0)
82 activesupport (7.0.4)
82 activesupport (7.0.4)
83 concurrent-ruby (~> 1.0, >= 1.0.2)
83 concurrent-ruby (~> 1.0, >= 1.0.2)
84 i18n (>= 1.6, < 2)
84 i18n (>= 1.6, < 2)
85 minitest (>= 5.1)
85 minitest (>= 5.1)
86 tzinfo (~> 2.0)
86 tzinfo (~> 2.0)
87 addressable (2.8.1)
87 addressable (2.8.1)
88 public_suffix (>= 2.0.2, < 6.0)
88 public_suffix (>= 2.0.2, < 6.0)
89 ansi (1.5.0)
89 ansi (1.5.0)
90 autoprefixer-rails (10.4.7.0)
90 autoprefixer-rails (10.4.7.0)
91 execjs (~> 2)
91 execjs (~> 2)
92 bindex (0.8.1)
92 bindex (0.8.1)
93 bootsnap (1.13.0)
93 bootsnap (1.13.0)
94 msgpack (~> 1.2)
94 msgpack (~> 1.2)
95 - bootstrap-sass (3.4.1)
95 + bootstrap (5.2.0)
96 - autoprefixer-rails (>= 5.2.1)
96 + autoprefixer-rails (>= 9.1.0)
97 - sassc (>= 2.0.0)
97 + popper_js (>= 2.11.5, < 3)
98 - bootstrap-switch-rails (3.3.5)
98 + sassc-rails (>= 2.0.0)
99 - bootstrap-toggle-rails (2.2.1.0)
100 - bootstrap3-datetimepicker-rails (4.17.47)
101 - momentjs-rails (>= 2.8.1)
102 builder (3.2.4)
99 builder (3.2.4)
103 capybara (3.37.1)
100 capybara (3.37.1)
104 addressable
101 addressable
105 matrix
102 matrix
106 mini_mime (>= 0.1.3)
103 mini_mime (>= 0.1.3)
107 nokogiri (~> 1.8)
104 nokogiri (~> 1.8)
108 rack (>= 1.6.0)
105 rack (>= 1.6.0)
109 rack-test (>= 0.6.3)
106 rack-test (>= 0.6.3)
110 regexp_parser (>= 1.5, < 3.0)
107 regexp_parser (>= 1.5, < 3.0)
111 xpath (~> 3.2)
108 xpath (~> 3.2)
112 childprocess (4.1.0)
109 childprocess (4.1.0)
113 coffee-rails (5.0.0)
110 coffee-rails (5.0.0)
114 coffee-script (>= 2.2.0)
111 coffee-script (>= 2.2.0)
115 railties (>= 5.2.0)
112 railties (>= 5.2.0)
116 coffee-script (2.4.1)
113 coffee-script (2.4.1)
117 coffee-script-source
114 coffee-script-source
118 execjs
115 execjs
119 coffee-script-source (1.12.2)
116 coffee-script-source (1.12.2)
120 concurrent-ruby (1.1.10)
117 concurrent-ruby (1.1.10)
121 crass (1.0.6)
118 crass (1.0.6)
122 debug (1.6.2)
119 debug (1.6.2)
123 irb (>= 1.3.6)
120 irb (>= 1.3.6)
124 reline (>= 0.3.1)
121 reline (>= 0.3.1)
125 digest (3.1.0)
122 digest (3.1.0)
@@ -137,129 +134,117
137 tilt
134 tilt
138 haml-rails (2.0.1)
135 haml-rails (2.0.1)
139 actionpack (>= 5.1)
136 actionpack (>= 5.1)
140 activesupport (>= 5.1)
137 activesupport (>= 5.1)
141 haml (>= 4.0.6, < 6.0)
138 haml (>= 4.0.6, < 6.0)
142 html2haml (>= 1.0.1)
139 html2haml (>= 1.0.1)
143 railties (>= 5.1)
140 railties (>= 5.1)
144 html2haml (2.2.0)
141 html2haml (2.2.0)
145 erubis (~> 2.7.0)
142 erubis (~> 2.7.0)
146 haml (>= 4.0, < 6)
143 haml (>= 4.0, < 6)
147 nokogiri (>= 1.6.0)
144 nokogiri (>= 1.6.0)
148 ruby_parser (~> 3.5)
145 ruby_parser (~> 3.5)
149 i18n (1.12.0)
146 i18n (1.12.0)
150 concurrent-ruby (~> 1.0)
147 concurrent-ruby (~> 1.0)
151 importmap-rails (1.1.5)
148 importmap-rails (1.1.5)
152 actionpack (>= 6.0.0)
149 actionpack (>= 6.0.0)
153 railties (>= 6.0.0)
150 railties (>= 6.0.0)
154 in_place_editing (1.2.0)
151 in_place_editing (1.2.0)
155 io-console (0.5.11)
152 io-console (0.5.11)
156 irb (1.4.1)
153 irb (1.4.1)
157 reline (>= 0.3.0)
154 reline (>= 0.3.0)
158 jbuilder (2.11.5)
155 jbuilder (2.11.5)
159 actionview (>= 5.0.0)
156 actionview (>= 5.0.0)
160 activesupport (>= 5.0.0)
157 activesupport (>= 5.0.0)
161 - jquery-countdown-rails (2.0.2)
162 - jquery-rails (4.5.0)
163 - rails-dom-testing (>= 1, < 3)
164 - railties (>= 4.2.0)
165 - thor (>= 0.14, < 2.0)
166 - jquery-tablesorter (1.27.2)
167 - railties (>= 3.2)
168 - jquery-ui-rails (6.0.1)
169 - railties (>= 3.2.16)
170 listen (3.0.8)
158 listen (3.0.8)
171 rb-fsevent (~> 0.9, >= 0.9.4)
159 rb-fsevent (~> 0.9, >= 0.9.4)
172 rb-inotify (~> 0.9, >= 0.9.7)
160 rb-inotify (~> 0.9, >= 0.9.7)
173 loofah (2.18.0)
161 loofah (2.18.0)
174 crass (~> 1.0.2)
162 crass (~> 1.0.2)
175 nokogiri (>= 1.5.9)
163 nokogiri (>= 1.5.9)
176 mail (2.7.1)
164 mail (2.7.1)
177 mini_mime (>= 0.1.1)
165 mini_mime (>= 0.1.1)
178 marcel (1.0.2)
166 marcel (1.0.2)
179 matrix (0.4.2)
167 matrix (0.4.2)
180 method_source (1.0.0)
168 method_source (1.0.0)
181 mini_mime (1.1.2)
169 mini_mime (1.1.2)
182 minitest (5.16.3)
170 minitest (5.16.3)
183 minitest-reporters (1.5.0)
171 minitest-reporters (1.5.0)
184 ansi
172 ansi
185 builder
173 builder
186 minitest (>= 5.0)
174 minitest (>= 5.0)
187 ruby-progressbar
175 ruby-progressbar
188 - momentjs-rails (2.29.4.1)
189 - railties (>= 3.1)
190 msgpack (1.5.6)
176 msgpack (1.5.6)
191 multi_json (1.15.0)
177 multi_json (1.15.0)
192 mysql2 (0.5.4)
178 mysql2 (0.5.4)
193 net-imap (0.2.3)
179 net-imap (0.2.3)
194 digest
180 digest
195 net-protocol
181 net-protocol
196 strscan
182 strscan
197 net-pop (0.1.1)
183 net-pop (0.1.1)
198 digest
184 digest
199 net-protocol
185 net-protocol
200 timeout
186 timeout
201 net-protocol (0.1.3)
187 net-protocol (0.1.3)
202 timeout
188 timeout
203 net-smtp (0.3.1)
189 net-smtp (0.3.1)
204 digest
190 digest
205 net-protocol
191 net-protocol
206 timeout
192 timeout
207 nio4r (2.5.8)
193 nio4r (2.5.8)
208 nokogiri (1.13.8-x86_64-linux)
194 nokogiri (1.13.8-x86_64-linux)
209 racc (~> 1.4)
195 racc (~> 1.4)
196 + popper_js (2.11.5)
210 public_suffix (5.0.0)
197 public_suffix (5.0.0)
211 puma (5.6.5)
198 puma (5.6.5)
212 nio4r (~> 2.0)
199 nio4r (~> 2.0)
213 racc (1.6.0)
200 racc (1.6.0)
214 rack (2.2.4)
201 rack (2.2.4)
215 rack-test (2.0.2)
202 rack-test (2.0.2)
216 rack (>= 1.3)
203 rack (>= 1.3)
217 rails (7.0.4)
204 rails (7.0.4)
218 actioncable (= 7.0.4)
205 actioncable (= 7.0.4)
219 actionmailbox (= 7.0.4)
206 actionmailbox (= 7.0.4)
220 actionmailer (= 7.0.4)
207 actionmailer (= 7.0.4)
221 actionpack (= 7.0.4)
208 actionpack (= 7.0.4)
222 actiontext (= 7.0.4)
209 actiontext (= 7.0.4)
223 actionview (= 7.0.4)
210 actionview (= 7.0.4)
224 activejob (= 7.0.4)
211 activejob (= 7.0.4)
225 activemodel (= 7.0.4)
212 activemodel (= 7.0.4)
226 activerecord (= 7.0.4)
213 activerecord (= 7.0.4)
227 activestorage (= 7.0.4)
214 activestorage (= 7.0.4)
228 activesupport (= 7.0.4)
215 activesupport (= 7.0.4)
229 bundler (>= 1.15.0)
216 bundler (>= 1.15.0)
230 railties (= 7.0.4)
217 railties (= 7.0.4)
231 rails-controller-testing (1.0.5)
218 rails-controller-testing (1.0.5)
232 actionpack (>= 5.0.1.rc1)
219 actionpack (>= 5.0.1.rc1)
233 actionview (>= 5.0.1.rc1)
220 actionview (>= 5.0.1.rc1)
234 activesupport (>= 5.0.1.rc1)
221 activesupport (>= 5.0.1.rc1)
235 rails-dom-testing (2.0.3)
222 rails-dom-testing (2.0.3)
236 activesupport (>= 4.2.0)
223 activesupport (>= 4.2.0)
237 nokogiri (>= 1.6)
224 nokogiri (>= 1.6)
238 rails-html-sanitizer (1.4.3)
225 rails-html-sanitizer (1.4.3)
239 loofah (~> 2.3)
226 loofah (~> 2.3)
240 - rails_bootstrap_sortable (2.0.7)
241 - momentjs-rails (>= 2.8.3)
242 railties (7.0.4)
227 railties (7.0.4)
243 actionpack (= 7.0.4)
228 actionpack (= 7.0.4)
244 activesupport (= 7.0.4)
229 activesupport (= 7.0.4)
245 method_source
230 method_source
246 rake (>= 12.2)
231 rake (>= 12.2)
247 thor (~> 1.0)
232 thor (~> 1.0)
248 zeitwerk (~> 2.5)
233 zeitwerk (~> 2.5)
249 rake (13.0.6)
234 rake (13.0.6)
250 rb-fsevent (0.11.2)
235 rb-fsevent (0.11.2)
251 rb-inotify (0.10.1)
236 rb-inotify (0.10.1)
252 ffi (~> 1.0)
237 ffi (~> 1.0)
253 rdiscount (2.2.0.2)
238 rdiscount (2.2.0.2)
254 regexp_parser (2.5.0)
239 regexp_parser (2.5.0)
255 reline (0.3.1)
240 reline (0.3.1)
256 io-console (~> 0.5)
241 io-console (~> 0.5)
257 rexml (3.2.5)
242 rexml (3.2.5)
258 rouge (4.0.0)
243 rouge (4.0.0)
259 ruby-progressbar (1.11.0)
244 ruby-progressbar (1.11.0)
260 ruby_parser (3.19.1)
245 ruby_parser (3.19.1)
261 sexp_processor (~> 4.16)
246 sexp_processor (~> 4.16)
262 rubyzip (2.3.2)
247 rubyzip (2.3.2)
263 sassc (2.4.0)
248 sassc (2.4.0)
264 ffi (~> 1.9)
249 ffi (~> 1.9)
265 sassc-rails (2.1.2)
250 sassc-rails (2.1.2)
@@ -304,74 +289,64
304 activemodel (>= 6.0.0)
289 activemodel (>= 6.0.0)
305 bindex (>= 0.4.0)
290 bindex (>= 0.4.0)
306 railties (>= 6.0.0)
291 railties (>= 6.0.0)
307 webdrivers (5.0.0)
292 webdrivers (5.0.0)
308 nokogiri (~> 1.6)
293 nokogiri (~> 1.6)
309 rubyzip (>= 1.3.0)
294 rubyzip (>= 1.3.0)
310 selenium-webdriver (~> 4.0)
295 selenium-webdriver (~> 4.0)
311 websocket (1.2.9)
296 websocket (1.2.9)
312 websocket-driver (0.7.5)
297 websocket-driver (0.7.5)
313 websocket-extensions (>= 0.1.0)
298 websocket-extensions (>= 0.1.0)
314 websocket-extensions (0.1.5)
299 websocket-extensions (0.1.5)
315 xpath (3.2.0)
300 xpath (3.2.0)
316 nokogiri (~> 1.8)
301 nokogiri (~> 1.8)
317 yaml_db (0.7.0)
302 yaml_db (0.7.0)
318 rails (>= 3.0)
303 rails (>= 3.0)
319 rake (>= 0.8.7)
304 rake (>= 0.8.7)
320 zeitwerk (2.6.0)
305 zeitwerk (2.6.0)
321
306
322 PLATFORMS
307 PLATFORMS
323 x86_64-linux
308 x86_64-linux
324
309
325 DEPENDENCIES
310 DEPENDENCIES
326 ace-rails-ap
311 ace-rails-ap
327 activerecord-session_store
312 activerecord-session_store
328 - autoprefixer-rails
329 best_in_place!
313 best_in_place!
330 bootsnap
314 bootsnap
331 - bootstrap-sass (~> 3.4.1)
315 + bootstrap (~> 5.2)
332 - bootstrap-switch-rails
333 - bootstrap-toggle-rails
334 - bootstrap3-datetimepicker-rails (~> 4.17.47)
335 capybara
316 capybara
336 coffee-rails
317 coffee-rails
337 debug
318 debug
338 dynamic_form
319 dynamic_form
339 fuzzy-string-match
320 fuzzy-string-match
340 haml
321 haml
341 haml-rails
322 haml-rails
342 importmap-rails (~> 1.1)
323 importmap-rails (~> 1.1)
343 in_place_editing
324 in_place_editing
344 jbuilder
325 jbuilder
345 - jquery-countdown-rails
346 - jquery-rails
347 - jquery-tablesorter
348 - jquery-ui-rails
349 listen (>= 3.0.5, < 3.2)
326 listen (>= 3.0.5, < 3.2)
350 mail
327 mail
351 minitest-reporters
328 minitest-reporters
352 - momentjs-rails (>= 2.9.0)
353 mysql2
329 mysql2
354 puma
330 puma
355 rails (~> 7.0)
331 rails (~> 7.0)
356 rails-controller-testing
332 rails-controller-testing
357 - rails_bootstrap_sortable
358 rdiscount
333 rdiscount
359 rouge
334 rouge
360 sassc-rails
335 sassc-rails
361 select2-rails
336 select2-rails
362 selenium-webdriver
337 selenium-webdriver
363 simple_form
338 simple_form
364 spring
339 spring
365 spring-watcher-listen (~> 2.0.0)
340 spring-watcher-listen (~> 2.0.0)
366 sprockets-rails
341 sprockets-rails
367 sqlite3
342 sqlite3
368 uglifier
343 uglifier
369 web-console (>= 3.3.0)
344 web-console (>= 3.3.0)
370 webdrivers
345 webdrivers
371 yaml_db
346 yaml_db
372
347
373 RUBY VERSION
348 RUBY VERSION
374 ruby 3.1.2p20
349 ruby 3.1.2p20
375
350
376 BUNDLED WITH
351 BUNDLED WITH
377 2.3.22
352 2.3.22
@@ -1,6 +1,5
1 //= link_tree ../images
1 //= link_tree ../images
2 - // x= link_directory ../javascripts .js
3 //= link_directory ../stylesheets .css
2 //= link_directory ../stylesheets .css
4 //= link_tree ../../javascript .js
3 //= link_tree ../../javascript .js
5 //= link_tree ../../../vendor/javascript .js
4 //= link_tree ../../../vendor/javascript .js
6
5
@@ -1,61 +1,61
1 /* This is a manifest file that'll be compiled into application.css, which will include all the files
1 /* This is a manifest file that'll be compiled into application.css, which will include all the files
2 * listed below.
2 * listed below.
3 *
3 *
4 * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
4 * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
5 * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
5 * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
6 *
6 *
7 * You're free to add application-wide styles to this file and they'll appear at the bottom of the
7 * You're free to add application-wide styles to this file and they'll appear at the bottom of the
8 * compiled file so the styles you add here take precedence over styles defined in any styles
8 * compiled file so the styles you add here take precedence over styles defined in any styles
9 * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
9 * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
10 * file per style scope.
10 * file per style scope.
11 *
11 *
12 * // bootstrap says that we should not do this, but @import each file instead
12 * // bootstrap says that we should not do this, but @import each file instead
13 * # *= require_tree .
13 * # *= require_tree .
14 * # *= require_self
14 * # *= require_self
15 */
15 */
16
16
17 - @import "jquery-ui";
17 + //@import "jquery-ui";
18 //@import "jquery.ui.core";
18 //@import "jquery.ui.core";
19 //@import "jquery.ui.theme";
19 //@import "jquery.ui.theme";
20 //@import "jquery.ui.datepicker";
20 //@import "jquery.ui.datepicker";
21 //@import "jquery.ui.slider";
21 //@import "jquery.ui.slider";
22 //@import "jquery-ui-timepicker-addon";
22 //@import "jquery-ui-timepicker-addon";
23 //@import "jquery-tablesorter/theme.metro-dark";
23 //@import "jquery-tablesorter/theme.metro-dark";
24 - @import "jquery.countdown";
24 + //@import "jquery.countdown";
25 - @import "tablesorter-theme.cafe";
25 + //@import "tablesorter-theme.cafe";
26
26
27 //bootstrap
27 //bootstrap
28 - @import "bootstrap-sprockets";
28 + //@import "bootstrap-sprockets";
29 @import "bootstrap";
29 @import "bootstrap";
30 @import "select2";
30 @import "select2";
31 @import "select2-bootstrap";
31 @import "select2-bootstrap";
32
32
33 //@import bootstrap3-switch
33 //@import bootstrap3-switch
34 - @import "bootstrap-toggle";
34 + //@import "bootstrap-toggle";
35 - @import "bootstrap-sortable";
35 + //@import "bootstrap-sortable";
36 //@import "bootstrap-datepicker3";
36 //@import "bootstrap-datepicker3";
37 - @import "bootstrap-datetimepicker";
37 + //@import "bootstrap-datetimepicker";
38 @import "datatables.net-bs/css/dataTables.bootstrap.min";
38 @import "datatables.net-bs/css/dataTables.bootstrap.min";
39 @import "datatables.net-buttons-bs/css/buttons.bootstrap.min";
39 @import "datatables.net-buttons-bs/css/buttons.bootstrap.min";
40
40
41 //bootstrap navbar color (from)
41 //bootstrap navbar color (from)
42 $bgDefault: #19197b;
42 $bgDefault: #19197b;
43 $bgHighlight: #06064b;
43 $bgHighlight: #06064b;
44 $colDefault: #8e8eb4;
44 $colDefault: #8e8eb4;
45 $colHighlight: #ffffff;
45 $colHighlight: #ffffff;
46 $dropDown: false;
46 $dropDown: false;
47
47
48 @font-face {
48 @font-face {
49 font-family: 'Glyphicons Halflings';
49 font-family: 'Glyphicons Halflings';
50 src: font-path('bootstrap/glyphicons-halflings-regular.eot');
50 src: font-path('bootstrap/glyphicons-halflings-regular.eot');
51 src: font-path('bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
51 src: font-path('bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
52 font-path('bootstrap/glyphicons-halflings-regular.woff') format('woff'),
52 font-path('bootstrap/glyphicons-halflings-regular.woff') format('woff'),
53 font-path('bootstrap/glyphicons-halflings-regular.ttf') format('truetype'),
53 font-path('bootstrap/glyphicons-halflings-regular.ttf') format('truetype'),
54 font-path('bootstrap/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
54 font-path('bootstrap/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
55 }
55 }
56
56
57
57
58 .navbar-default {
58 .navbar-default {
59 background-color: $bgDefault;
59 background-color: $bgDefault;
60 border-color: $bgHighlight;
60 border-color: $bgHighlight;
61
61
@@ -1,17 +1,20
1 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
1 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
2 //import "@hotwired/turbo-rails"
2 //import "@hotwired/turbo-rails"
3 //import "controllers"
3 //import "controllers"
4 //
4 //
5 - console.log('xxxxx')
5 +
6 - import jQuery from "jquery"
6 + import pdfmake from "pdfmake"
7 - //import pdfmake from "pdfmake"
8 //import jszip from "jszip"
7 //import jszip from "jszip"
9 //import DataTable from "datatables.net-bs5"
8 //import DataTable from "datatables.net-bs5"
10 - //
11 - window.$ = window.jQuery = jQuery;
12 //window.DataTable = DataTable();
9 //window.DataTable = DataTable();
13 - //
10 +
11 + //bootstrap
12 + //import * as bootstrap from "bootstrap"
13 + import "bootstrap"
14 + window.bootstrap = bootstrap
14 console.log($); // ok
15 console.log($); // ok
15 - ////console.log(jszip);
16 + console.log(bootstrap)
17 + console.log(jszip);
18 +
16 console.log('application.js ready')
19 console.log('application.js ready')
17
20
@@ -1,18 +1,24
1 <!DOCTYPE html>
1 <!DOCTYPE html>
2 %html
2 %html
3 %head
3 %head
4 %title= GraderConfiguration['contest.name']
4 %title= GraderConfiguration['contest.name']
5 = stylesheet_link_tag "application", params[:controller], :media => "all"
5 = stylesheet_link_tag "application", params[:controller], :media => "all"
6 = csrf_meta_tags
6 = csrf_meta_tags
7 = csp_meta_tag
7 = csp_meta_tag
8 + = javascript_import_module_tag('prepend_jquery')
8 = javascript_importmap_tags
9 = javascript_importmap_tags
9 = content_for :header
10 = content_for :header
10 = yield :head
11 = yield :head
12 + -# %link{href:"https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css",rel:"stylesheet",integrity:"sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT",crossorigin:"anonymous"}
13 + -# %script{src:"https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js",integrity:"sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3",crossorigin:"anonymous"}
14 + -# %script{src:"https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/js/bootstrap.bundle.min.js",integrity:"sha384-7VPbUDkoPSGFnVtYi0QogXtr74QeVeeIs99Qfg5YCF+TidwNdjvaKZX19NZ/e6oz",crossorigin:"anonymous"}
15 +
16 +
11
17
12 %body
18 %body
13 - unless local_assigns[:skip_header]
19 - unless local_assigns[:skip_header]
14 = render 'layouts/header'
20 = render 'layouts/header'
15
21
16 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
22 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
17 = flash_messages
23 = flash_messages
18 = yield
24 = yield
@@ -1,8 +1,12
1 # Pin npm packages by running ./bin/importmap
1 # Pin npm packages by running ./bin/importmap
2
2
3 + #entry point
3 pin "application", preload: true
4 pin "application", preload: true
4 - #pin_all_from "app/javascript/controllers", under: "controllers"
5 + pin "prepend_jquery", preload: true
6 + pin_all_from "app/javascript/controllers", under: "controllers"
5
7
6 - #pin "jquery" # @3.6.1
8 + pin "pdfmake", to: "https://ga.jspm.io/npm:pdfmake@0.2.5/build/pdfmake.js"
7 - #pin "pdfmake", to: "https://ga.jspm.io/npm:pdfmake@0.2.5/build/pdfmake.js"
9 + pin "jquery", to: 'jquery.js'
8 - pin "jquery", to: 'jquery-local.js'
10 + pin "bootstrap", to: "bootstrap.bundle.min.js"
11 + #no need popper, because bundled already in bootstrap
12 + #pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.6/lib/index.js"
@@ -1,22 +1,24
1 # Be sure to restart your server when you modify this file.
1 # Be sure to restart your server when you modify this file.
2
2
3 # Version of your assets, change this if you want to expire all your assets.
3 # Version of your assets, change this if you want to expire all your assets.
4 Rails.application.config.assets.version = "1.0"
4 Rails.application.config.assets.version = "1.0"
5
5
6 # Add additional assets to the asset load path.
6 # Add additional assets to the asset load path.
7 # Rails.application.config.assets.paths << Emoji.images_path
7 # Rails.application.config.assets.paths << Emoji.images_path
8 # Add Yarn node_modules folder to the asset load path.
8 # Add Yarn node_modules folder to the asset load path.
9 Rails.application.config.assets.paths << Rails.root.join('node_modules')
9 Rails.application.config.assets.paths << Rails.root.join('node_modules')
10
10
11 # Precompile additional assets.
11 # Precompile additional assets.
12 # application.js, application.css, and all non-JS/CSS in the app/assets
12 # application.js, application.css, and all non-JS/CSS in the app/assets
13 # folder are already added.
13 # folder are already added.
14 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
14 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
15 + Rails.application.config.assets.precompile += %w(bootstrap.min.js popper.js)
16 +
15 Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
17 Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
16 Rails.application.config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
18 Rails.application.config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
17 %w( announcements submissions configurations contests contest_management graders heartbeat
19 %w( announcements submissions configurations contests contest_management graders heartbeat
18 login main messages problems report site sites sources tasks groups
20 login main messages problems report site sites sources tasks groups
19 test user_admin users tags testcases).each do |controller|
21 test user_admin users tags testcases).each do |controller|
20 Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
22 Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
21 end
23 end
22
24
file renamed from vendor/javascript/jquery-local.js to vendor/javascript/jquery.js
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
You need to be logged in to leave comments. Login now