Merge pull request #218 from projekteuler/uglifier-fix

Fix uglifier config

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5', '2.6', '2.7']
+        ruby: ['2.6', '2.7', '3.0']
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.ruby }}
@@ -17,7 +17,7 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Set up Node
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: '14'
       - name: Install dependencies

Gemfile

@@ -2,7 +2,9 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '6.0.3.4'
+gem 'rails', '6.1.3.2'
+# Use Puma as the app server
+gem 'puma', '~> 5.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4.1'
 
@@ -30,16 +32,14 @@ gem 'jquery-rails', '~> 4.4.0'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks', '~> 5.2.1'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.10.1'
+gem 'jbuilder', '~> 2.11.2'
 # bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 2.0.2',          group: :doc
+gem 'sdoc', '~> 2.1.0',          group: :doc
 
 gem 'web-console', '~> 4.1.0', group: :development
+gem 'listen', '~> 3.5.1', group: :development
 
-# Use Codacy for coverage
+gem 'bootstrap', '~> 5.0.1'
-gem 'codacy-coverage', :require => false
-
-gem 'bootstrap', '~> 4.5.3'
 gem "bootstrap_form", "~> 4.5"
 gem 'font-awesome-sass', '~> 5.15.1'
 
@@ -50,8 +50,9 @@ gem 'diff-lcs'
 gem 'will_paginate', '~> 3.3.0'
 gem 'will_paginate-bootstrap4', '~> 0.2.2'
 
-gem 'devise', '~> 4.7.3'
+gem 'devise', '~> 4.8.0'
 gem 'omniauth'
+gem 'omniauth-rails_csrf_protection'
 gem 'omniauth-github'
 
 # Use ActiveModel has_secure_password

Gemfile.lock

@@ -1,79 +1,81 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.4)
+    actioncable (6.1.3.2)
-      actionpack (= 6.0.3.4)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.4)
+    actionmailbox (6.1.3.2)
-      actionpack (= 6.0.3.4)
+      actionpack (= 6.1.3.2)
-      activejob (= 6.0.3.4)
+      activejob (= 6.1.3.2)
-      activerecord (= 6.0.3.4)
+      activerecord (= 6.1.3.2)
-      activestorage (= 6.0.3.4)
+      activestorage (= 6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
+    actionmailer (6.1.3.2)
-      actionpack (= 6.0.3.4)
+      actionpack (= 6.1.3.2)
-      actionview (= 6.0.3.4)
+      actionview (= 6.1.3.2)
-      activejob (= 6.0.3.4)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
+    actionpack (6.1.3.2)
-      actionview (= 6.0.3.4)
+      actionview (= 6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
-      rack (~> 2.0, >= 2.0.8)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.4)
+    actiontext (6.1.3.2)
-      actionpack (= 6.0.3.4)
+      actionpack (= 6.1.3.2)
-      activerecord (= 6.0.3.4)
+      activerecord (= 6.1.3.2)
-      activestorage (= 6.0.3.4)
+      activestorage (= 6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
+    actionview (6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
+    activejob (6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
+    activemodel (6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
-    activerecord (6.0.3.4)
+    activerecord (6.1.3.2)
-      activemodel (= 6.0.3.4)
+      activemodel (= 6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
-    activestorage (6.0.3.4)
+    activestorage (6.1.3.2)
-      actionpack (= 6.0.3.4)
+      actionpack (= 6.1.3.2)
-      activejob (= 6.0.3.4)
+      activejob (= 6.1.3.2)
-      activerecord (= 6.0.3.4)
+      activerecord (= 6.1.3.2)
-      marcel (~> 0.3.1)
+      activesupport (= 6.1.3.2)
-    activesupport (6.0.3.4)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    autoprefixer-rails (10.0.2.0)
+    autoprefixer-rails (10.2.5.0)
-      execjs
+      execjs (< 2.8.0)
     bcrypt (3.1.16)
     bindex (0.8.1)
-    bootsnap (1.5.1)
+    bootsnap (1.7.5)
       msgpack (~> 1.0)
-    bootstrap (4.5.3)
+    bootstrap (5.0.1)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.14.3, < 2)
+      popper_js (>= 2.9.2, < 3)
       sassc-rails (>= 2.0.0)
     bootstrap_form (4.5.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     builder (3.2.4)
-    codacy-coverage (2.2.1)
-      simplecov
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
       railties (>= 5.2.0)
@@ -81,10 +83,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
-    crack (0.4.4)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    devise (4.7.3)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -92,82 +95,99 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.4.4)
     diffy (3.4.0)
-    docile (1.3.2)
+    erubi (1.10.0)
-    erubi (1.9.0)
     execjs (2.7.0)
-    faraday (1.0.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.13.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    ffi (1.15.0)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (1.0.1)
     hashie (4.1.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.1)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jwt (2.2.1)
+    jwt (2.2.3)
-    loofah (2.7.0)
+    listen (3.5.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
+    marcel (1.0.1)
-      mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mini_mime (1.0.3)
-    mini_mime (1.0.2)
+    mini_portile2 (2.5.1)
-    mini_portile2 (2.4.0)
+    minitest (5.14.4)
-    minitest (5.14.2)
+    msgpack (1.4.2)
-    msgpack (1.3.3)
+    multi_json (1.15.0)
-    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
-    nio4r (2.5.4)
+    nio4r (2.5.7)
-    nokogiri (1.10.10)
+    nokogiri (1.11.5)
-      mini_portile2 (~> 2.4.0)
+      mini_portile2 (~> 2.5.0)
-    oauth2 (1.4.3)
+      racc (~> 1.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.1)
+    omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-github (1.4.0)
+      rack-protection
-      omniauth (~> 1.5)
+    omniauth-github (2.0.0)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
+      omniauth (~> 2.0)
-    omniauth-oauth2 (1.6.0)
+      omniauth-oauth2 (~> 1.7.1)
-      oauth2 (~> 1.1)
+    omniauth-oauth2 (1.7.1)
-      omniauth (~> 1.9)
+      oauth2 (~> 1.4)
+      omniauth (>= 1.9, < 3)
+    omniauth-rails_csrf_protection (1.0.0)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)
     orm_adapter (0.5.0)
-    popper_js (1.16.0)
+    popper_js (2.9.2)
     public_suffix (4.0.6)
+    puma (5.3.1)
+      nio4r (~> 2.0)
+    racc (1.5.2)
     rack (2.2.3)
+    rack-protection (2.1.0)
+      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.4)
+    rails (6.1.3.2)
-      actioncable (= 6.0.3.4)
+      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.0.3.4)
+      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.0.3.4)
+      actionmailer (= 6.1.3.2)
-      actionpack (= 6.0.3.4)
+      actionpack (= 6.1.3.2)
-      actiontext (= 6.0.3.4)
+      actiontext (= 6.1.3.2)
-      actionview (= 6.0.3.4)
+      actionview (= 6.1.3.2)
-      activejob (= 6.0.3.4)
+      activejob (= 6.1.3.2)
-      activemodel (= 6.0.3.4)
+      activemodel (= 6.1.3.2)
-      activerecord (= 6.0.3.4)
+      activerecord (= 6.1.3.2)
-      activestorage (= 6.0.3.4)
+      activestorage (= 6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
-      bundler (>= 1.3.0)
+      bundler (>= 1.15.0)
-      railties (= 6.0.3.4)
+      railties (= 6.1.3.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -181,17 +201,22 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.3.4)
+    railties (6.1.3.2)
-      actionpack (= 6.0.3.4)
+      actionpack (= 6.1.3.2)
-      activesupport (= 6.0.3.4)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
-    rake (13.0.1)
+    rake (13.0.3)
-    rdoc (6.2.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rdoc (6.3.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
+    rexml (3.2.5)
+    ruby2_keywords (0.0.4)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -200,12 +225,8 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sdoc (2.0.2)
+    sdoc (2.1.0)
       rdoc (>= 5.0)
-    simplecov (0.18.1)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11.0)
-    simplecov-html (0.11.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -214,14 +235,13 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
+    thor (1.1.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.8)
+    tzinfo (2.0.4)
-      thread_safe (~> 0.1)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     warden (1.2.9)
@@ -231,7 +251,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.10.0)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -241,31 +261,33 @@ GEM
     will_paginate (3.3.0)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootsnap
-  bootstrap (~> 4.5.3)
+  bootstrap (~> 5.0.1)
   bootstrap_form (~> 4.5)
-  codacy-coverage
   coffee-rails (~> 5.0.0)
-  devise (~> 4.7.3)
+  devise (~> 4.8.0)
   diff-lcs
   diffy
   font-awesome-sass (~> 5.15.1)
-  jbuilder (~> 2.10.1)
+  jbuilder (~> 2.11.2)
   jquery-rails (~> 4.4.0)
+  listen (~> 3.5.1)
   mysql2 (~> 0.5.2)
   omniauth
   omniauth-github
-  rails (= 6.0.3.4)
+  omniauth-rails_csrf_protection
+  puma (~> 5.0)
+  rails (= 6.1.3.2)
   rails-controller-testing
   rails-i18n (~> 6.0.0)
   sassc-rails (~> 2.1.2)
-  sdoc (~> 2.0.2)
+  sdoc (~> 2.1.0)
   sqlite3 (~> 1.4.1)
   turbolinks (~> 5.2.1)
   tzinfo-data
@@ -276,4 +298,4 @@ DEPENDENCIES
   will_paginate-bootstrap4 (~> 0.2.2)
 
 BUNDLED WITH
-   2.1.4
+   2.2.17

README.md

@@ -2,7 +2,6 @@ Projekt Euler
 =============
 
 ![Build Status](https://github.com/projekteuler/projekteuler/workflows/CI/badge.svg)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/68921bff5347435f8fff10c1d6872568)](https://www.codacy.com/app/projekteuler/projekteuler)
 
 This is the Ruby on Rails web-app powering [projekteuler.de](https://projekteuler.de).
 It allows visitors to view and suggest German translations of the maths puzzles found on [projecteuler.net](https://projecteuler.net).

app/assets/javascripts/init.coffee

@@ -18,6 +18,6 @@ App.init = ->
 $(document).on "turbolinks:load", ->
   App.init()
 
-$(document).on "click", '#translationTab a[href="#preview"]', ->
+$(document).on "click", '#translationTab button[data-bs-target="#preview"]', ->
   $('#preview .problem-content').html(cm.getValue())
   MathJax.Hub.Queue(["Typeset",MathJax.Hub]);

app/helpers/application_helper.rb

@@ -7,11 +7,8 @@ module ApplicationHelper
     capture do
       flash.each do |msg_type, message|
         concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} alert-dismissible", role: 'alert') do
-          concat(content_tag(:button, class: 'close', data: { dismiss: 'alert' }) do
-            concat content_tag(:span, '×'.html_safe, 'aria-hidden' => true)
-            concat content_tag(:span, 'Close', class: 'sr-only')
-          end)
           concat message
+          concat content_tag(:button, "", class: 'btn-close', data: { 'bs-dismiss': 'alert' }, 'aria-label': 'Close')
         end)
       end
       nil
@@ -29,9 +26,8 @@ module ApplicationHelper
   end
 
   def nav_link_to(body, url)
-    nav_options = { class: current_page?(url) ? 'nav-item active': 'nav-item' }
+    content_tag(:li, class: 'nav-item') do
-    content_tag(:li, nav_options) do
+      link_to body, url, class: current_page?(url) ? 'nav-link active': 'nav-link'
-      link_to body, url, class: 'nav-link'
     end
   end
 

app/scrubbers/translation_content_scrubber.rb

@@ -3,7 +3,7 @@ class TranslationContentScrubber < Rails::Html::PermitScrubber
     super
     self.tags = %w( strong em b i p code pre tt samp kbd var sub
         sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dl dt dd abbr
-        acronym a img blockquote del ins table th tr td thead tbody tfoot )
+        acronym a img blockquote del ins table th tr td thead tbody tfoot u )
     self.attributes = %w( href src width height alt cite datetime title class name xml:lang abbr style
         align border cellpadding cellspacing colspan )
   end

app/views/about/index.de.html.erb

@@ -1,4 +1,4 @@
-<div class="jumbotron">
+<div class="bg-light p-5 rounded">
   <h1 class="display-4">Willkommen auf Projekt Euler!</h1>
   <p>Diese Seite ist eine Übersetzung der englischen Rätsel-Webseite <a href="https://projecteuler.net/">projecteuler.net</a>.</p>
   <p class="lead">
@@ -7,26 +7,27 @@
     <% end %>
 </div>
 
-<div class="container">
+<div class="row g-4 py-5 row-cols-1 row-cols-lg-3">
-  <!-- Example row of columns -->
+  <div class="col d-flex align-items-start">
-  <div class="row">
+    <div>
-    <div class="col-md-4">
       <h2>Ansehen</h2>
       <p>Sehen Sie sich die mathematischen Probleme in deutscher Sprache an.</p>
-      <p>
       <%= link_to problems_path, class: 'btn btn-primary' do %>
           Zu den Problemen &raquo;
       <% end %>
-      </p>
     </div>
-    <div class="col-md-4">
+  </div>
+  <div class="col d-flex align-items-start">
+    <div>
       <h2>Übersetzen</h2>
       <p>Bisher wurden erst <%= Problem.translated_count %> der <%= Problem.count %> Probleme übersetzt. Helfen Sie mit, Übersetzungen zu erstellen und anzupassen!</p>
     </div>
-    <div class="col-md-4">
+  </div>
+  <div class="col d-flex align-items-start">
+    <div>
       <h2>Verbessern</h2>
       <p>Vermissen Sie eine Funktion auf der Webseite, oder ist Ihnen ein Fehler aufgefallen? Dann helfen Sie beim Entwickeln der Webseite in Ruby on Rails!</p>
-      <p><a class="btn btn-primary" href="https://github.com/projekteuler/projekteuler" target="_blank">Projekt Euler auf GitHub &raquo;</a></p>
+      <a class="btn btn-primary" href="https://github.com/projekteuler/projekteuler" target="_blank">Projekt Euler auf GitHub &raquo;</a>
     </div>
   </div>
 </div>

app/views/layouts/_header.html.erb

@@ -1,44 +1,46 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
   <div class="container">
-    <%= link_to t('application.site_title'), root_path, class: 'navbar-brand' %>
+    <%= link_to root_path, class: 'navbar-brand' do %>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <%= image_tag "favicon.ico", alt: "", width: 24, height: 24, class: "d-inline-block align-text-top" %> <%= t('application.site_title') %>
+  <% end %>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon">
         <%= icon('fas', 'bars') %>
       </span>
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-        <ul class="navbar-nav mr-auto">
+      <ul class="navbar-nav me-auto">
           <%= nav_link_to t('application.info'), about_info_path %>
           <%= nav_link_to Problem.model_name.human(count: 2), problems_path %>
           <% if user_signed_in? and current_user.admin? %>
               <%= nav_link_to t('admin.dashboard.index.administration'), admin_dashboard_index_path %>
               <%= link_to admin_translations_path, class: 'nav-link' do %>
-                  <%= t('admin.dashboard.index.translations') %> <span class="badge badge-secondary"><%= Translation.pending.count %></span>
+                <%= t('admin.dashboard.index.translations') %> <span class="badge bg-secondary"><%= Translation.pending.count %></span>
               <% end %>
           <% end %>
       </ul>
-        <ul class="navbar-nav">
       <% if user_signed_in? %>
-            <li class="nav-item">
         <span class="navbar-text"><%= t 'application.logged_in_as_html', name: current_user.name %>
           <% if current_user.admin? %>
             <b><%= icon('fas', 'star') %></b>
           <% end %>
         </span>
-            </li>
+      <ul class="navbar-nav">
         <li class="nav-item">
           <%= link_to t('application.sign_out'), destroy_user_session_path, method: :delete, class: 'nav-link' %>
         </li>
+      </ul>
       <% else %>
+        <ul class="navbar-nav">
           <li class="nav-item">
             <% if Rails.env.development? %>
-                <%= link_to t('application.sign_in_with_github'), user_developer_omniauth_authorize_path, class: 'nav-link' %>
+              <%= link_to t('application.sign_in_with_github'), user_developer_omniauth_authorize_path, method: :post, class: 'nav-link' %>
             <% else %>
-                <%= link_to t('application.sign_in_with_github'), user_github_omniauth_authorize_path, class: 'nav-link' %>
+              <%= link_to t('application.sign_in_with_github'), user_github_omniauth_authorize_path, method: :post, class: 'nav-link' %>
             <% end %>
           </li>
-          <% end %>
         </ul>
+      <% end %>
     </div>
   </div>
 </nav>

app/views/translations/_form.html.erb

@@ -2,10 +2,10 @@
   <%= f.text_field :title %>
   <ul class="nav nav-tabs" id="translationTab" role="tablist">
     <li class="nav-item">
-      <%= link_to t('.source_code'), '#source', data: {toggle: 'tab'}, class:'nav-link active', id:'source-tab', role:'tab', 'aria-controls':'source', 'aria-selected':'true' %>
+      <button class="nav-link active" id="source-tab" data-bs-toggle="tab" data-bs-target="#source" type="button" role="tab" aria-controls="source" aria-selected="true"><%= t('.source_code') %></button>
     </li>
     <li class="nav-item">
-      <%= link_to t('.preview'), '#preview', data: {toggle: 'tab'}, class:'nav-link', id:'preview-tab', role:'tab', 'aria-controls':'preview', 'aria-selected':'false' %>
+      <button class="nav-link" id="preview-tab" data-bs-toggle="tab" data-bs-target="#preview" type="button" role="tab" aria-controls="preview" aria-selected="false"><%= t('.preview') %></button>
     </li>
   </ul>
   <div class="tab-content" id="translationTabContent">

bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
+require_relative "../config/boot"
-require 'rails/commands'
+require "rails/commands"

bin/rake

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
+require_relative "../config/boot"
-require 'rake'
+require "rake"
 Rake.application.run

bin/setup

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'fileutils'
+require "fileutils"
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -9,8 +9,8 @@ def system!(*args)
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to setup or update your development environment automatically.
+  # This script is a way to set up or update your development environment automatically.
-  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
@@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
   system('bundle check') || system!('bundle install')
 
   # Install JavaScript dependencies
-  # system('bin/yarn')
+  # system! 'bin/yarn'
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')

bin/yarn

@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
-  begin
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
-    exec "yarnpkg", *ARGV
+    select { |dir| File.expand_path(dir) != __dir__ }.
-  rescue Errno::ENOENT
+    product(["yarn", "yarn.exe"]).
+    map { |dir, file| File.expand_path(file, dir) }.
+    find { |file| File.executable?(file) }
+
+  if yarn
+    exec yarn, *ARGV
+  else
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
     exit 1

config.ru

@@ -1,4 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require_relative "config/environment"
+
 run Rails.application
+Rails.application.load_server

config/application.rb

@@ -1,6 +1,6 @@
-require_relative 'boot'
+require_relative "boot"
 
-require 'rails/all'
+require "rails/all"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -9,12 +9,12 @@ Bundler.require(*Rails.groups)
 module Projekteuler
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 6.1
 
-    # Settings in config/environments/* take precedence over those specified here.
+    # Configuration for the application, engines, and railties goes here.
-    # Application configuration can go into files in config/initializers
+    #
-    # -- all .rb files in that directory are automatically loaded after loading
+    # These settings can be overridden in specific environments using the files
-    # the framework and any gems in your application.
+    # in config/environments, which are processed later.
 
     config.action_dispatch.default_headers = {
         'X-Frame-Options' => 'DENY',

config/boot.rb

@@ -1,4 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
+require "bundler/setup" # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.

config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!

config/environments/development.rb

@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # In the development environment your application's code is reloaded on
+  # In the development environment your application's code is reloaded any time
-  # every request. This slows down response time but is perfect for development
+  # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -39,6 +41,12 @@ Rails.application.configure do
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
@@ -54,9 +62,15 @@ Rails.application.configure do
   config.assets.quiet = true
 
   # Raises error for missing translations.
-  config.action_view.raise_on_missing_translations = true
+  config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
-  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  # Uncomment if you wish to allow Action Cable access from any origin.
+  # config.action_cable.disable_request_forgery_protection = true
 end

config/environments/production.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -23,7 +25,7 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JS using a preprocessor.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   
   # Compress CSS using a preprocessor.
   # config.assets.css_compressor = :sass
@@ -32,7 +34,7 @@ Rails.application.configure do
   config.assets.compile = false
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # config.asset_host = 'http://assets.example.com'
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
@@ -49,9 +51,9 @@ Rails.application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   config.force_ssl = true
 
-  # Use the lowest log level to ensure availability of diagnostic information
+  # Include generic and useful information about system operation, but avoid logging too much
-  # when problems arise.
+  # information to avoid inadvertent exposure of personally identifiable information (PII).
-  config.log_level = :debug
+  config.log_level = :info
 
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
@@ -71,16 +73,22 @@ Rails.application.configure do
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
-  config.i18n.fallbacks = [I18n.default_locale]
+  config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
+  # Log disallowed deprecations.
+  config.active_support.disallowed_deprecation = :log
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
   # Use a different logger for distributed setups.
-  # require 'syslog/logger'
+  # require "syslog/logger"
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV["RAILS_LOG_TO_STDOUT"].present?

config/environments/test.rb

@@ -43,6 +43,15 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raises error for missing translations.
-  config.action_view.raise_on_missing_translations = true
+  config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 end

config/initializers/assets.rb

@@ -7,3 +7,8 @@ Rails.application.config.assets.version = '1.0'
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
 Rails.application.config.assets.paths << Rails.root.join('node_modules')
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )

config/initializers/backtrace_silencers.rb

@@ -1,7 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
 
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
-# Rails.backtrace_cleaner.remove_silencers!
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]

config/initializers/filter_parameter_logging.rb

@@ -1,4 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]

config/initializers/permissions_policy.rb

@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+Rails.application.config.permissions_policy do |f|
+  f.camera      :none
+  f.gyroscope   :none
+  f.microphone  :none
+  f.usb         :none
+  f.fullscreen  :self
+  f.payment     :none
+end

test/helpers/application_helper_test.rb

@@ -8,6 +8,6 @@ class ApplicationHelperTest < ActionView::TestCase
 
   test "bootstrap flash messages should work" do
     flash[:error] = "Error"
-    assert_equal "<div class=\"alert alert-danger alert-dismissible\" role=\"alert\"><button class=\"close\" data-dismiss=\"alert\"><span aria-hidden=\"true\">&times;</span><span class=\"sr-only\">Close</span></button>Error</div>", flash_messages
+    assert_equal "<div class=\"alert alert-danger alert-dismissible\" role=\"alert\">Error<button class=\"btn-close\" data-bs-dismiss=\"alert\" aria-label=\"Close\"></button></div>", flash_messages
   end
 end

test/integration/translator_flow_test.rb

@@ -8,7 +8,7 @@ class TranslatorFlowTest < ActionDispatch::IntegrationTest
   end
 
   test "can login via github" do
-    get '/users/auth/github'
+    post '/users/auth/github'
     assert_response :redirect
     follow_redirect!
     follow_redirect!

test/test_helper.rb

@@ -1,8 +1,5 @@
-require 'codacy-coverage'
 require 'webmock/minitest'
 
-Codacy::Reporter.start
-
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'