diff --git a/.rsync-exclude b/.rsync-exclude index 0a8c30b..344ac06 100644 --- a/.rsync-exclude +++ b/.rsync-exclude @@ -1,4 +1,5 @@ /log/ ++ /tmp/restart.txt /tmp/ /vendor/bundle/ /node_modules/ diff --git a/Gemfile b/Gemfile index 2c795eb..86c6872 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem "actionmailer", "~> 7.1" gem 'sprockets-rails' gem 'pg', '~> 1.5' gem 'puma', '>= 5.0' -gem 'importmap-rails' +gem 'jsbundling-rails' gem 'cssbundling-rails' gem 'sassc', '~> 2.4' gem 'dotenv-rails', '~> 3.1' @@ -40,3 +40,7 @@ end gem 'tzinfo-data', platforms: %i[ mswin mswin64 mingw x64_mingw jruby ] + + + +gem "pdfjs_viewer-rails", "~> 0.3.2" diff --git a/Gemfile.lock b/Gemfile.lock index 1ca9deb..6910f22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,16 +141,15 @@ GEM multi_xml (>= 0.5.2) i18n (1.14.5) concurrent-ruby (~> 1.0) - importmap-rails (2.0.1) - actionpack (>= 6.0.0) - activesupport (>= 6.0.0) - railties (>= 6.0.0) invisible_captcha (2.3.0) rails (>= 5.2) io-console (0.7.2) irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) + jsbundling-rails (1.3.1) + railties (>= 6.0.0) + json (2.7.2) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -188,6 +187,10 @@ GEM racc (~> 1.4) nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) + pdfjs_viewer-rails (0.3.2) + json (> 1.8.4) + rails (> 4.2.0) + sassc-rails (>= 2.1) pg (1.5.7) pry (0.14.2) coderay (~> 1.1) @@ -253,6 +256,12 @@ GEM rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (4.24.0) base64 (~> 0.2) logger (~> 1.4) @@ -269,6 +278,7 @@ GEM stringio (3.1.1) strscan (3.1.0) thor (1.3.2) + tilt (2.4.0) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -303,8 +313,9 @@ DEPENDENCIES dotenv-rails (~> 3.1) error_highlight (>= 0.4.0) httparty (~> 0.22.0) - importmap-rails invisible_captcha (~> 2.3) + jsbundling-rails + pdfjs_viewer-rails (~> 0.3.2) pg (~> 1.5) pry-byebug puma (>= 5.0) diff --git a/Procfile.dev b/Procfile.dev index 18f64d2..6e11fb6 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,2 +1,3 @@ web: env RUBY_DEBUG_OPEN=true bin/rails server css: yarn watch:css +js: yarn build --watch diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 099033f..f4d8295 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -43,10 +43,18 @@ div.progress { font-size: 75%; } +div.letters.show { + & object, & iframe { + width: 100%; + height: 100%; + } +} + @media screen and (max-width: 1024px) { div.letters.show { - & > embed { - height: 400px; + & object, & iframe { + height: 600px; + max-width: 100%; } } } diff --git a/app/javascript/application.js b/app/javascript/application.js index 9cce588..786b2ec 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -1 +1 @@ -import * as bootstrap from "bootstrap" +import * as bootstrap from 'bootstrap' diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js deleted file mode 100644 index e69de29..0000000 diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 695686e..9af93ff 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,8 +4,8 @@