Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ ruby '3.4.5'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 8.0', '>= 8.0.2.1'

gem "propshaft"

gem 'delayed_job_mongoid', '~> 3.0.0'
gem 'mongoid', '~> 9.0.0'

Expand All @@ -28,8 +30,9 @@ gem 'csv', '~> 3.3', '>= 3.3.5'

# Dependencies for CMS Assets Framework
gem 'bootstrap', '~> 5.3.5'
gem 'dartsass-sprockets', '~> 3.2', '>= 3.2.1'
# gem 'dartsass-sprockets', '~> 3.2', '>= 3.2.1'

gem "font-awesome-propshaft"
gem 'font-awesome-sass', '~> 6.7', '>= 6.7.2'
gem 'jquery-rails'
# TODO: remove or use gem
Expand All @@ -44,16 +47,16 @@ gem 'uglifier', '>= 1.3.0'
gem 'breadcrumbs_on_rails'
# Help our forms
gem 'bootstrap_form', '~> 5.4'
gem 'jasny-bootstrap-rails'
# gem 'jasny-bootstrap-rails'

gem 'jquery-datatables-rails'
# gem 'jquery-datatables-rails'
gem 'local_time', '~> 2.0.0'

# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks', git: 'https://github.com/turbolinks/turbolinks-classic', branch: 'master'
gem 'turbo-rails'
gem 'stimulus-rails'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.14', '>= 2.14.1'
# A set of responders modules to dry up your Rails 4.2+ app.
Expand Down Expand Up @@ -154,3 +157,7 @@ end
group :production do
gem 'newrelic_rpm'
end

gem "importmap-rails", "~> 2.2"

gem "dartsass-rails", "~> 0.5.1"
91 changes: 33 additions & 58 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
GIT
remote: https://github.com/turbolinks/turbolinks-classic
revision: 80216ce9d89920bf073709405e3fce6d0a3ccd9a
branch: master
specs:
turbolinks (3.0.0)
coffee-rails

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -155,13 +147,6 @@ GEM
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
coffee-rails (5.0.0)
coffee-script (>= 2.2.0)
railties (>= 5.2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
cqm-models (4.2.0)
Expand Down Expand Up @@ -228,12 +213,9 @@ GEM
cucumber (>= 7, < 11)
railties (>= 6.1, < 9)
cucumber-tag-expressions (6.1.2)
dartsass-sprockets (3.2.1)
railties (>= 4.0.0)
sassc-embedded (~> 1.80.1)
sprockets (> 3.0)
sprockets-rails
tilt
dartsass-rails (0.5.1)
railties (>= 6.0.0)
sass-embedded (~> 1.63)
database_cleaner-core (2.0.1)
database_cleaner-mongoid (2.0.1)
database_cleaner-core (~> 2.0.0)
Expand Down Expand Up @@ -284,29 +266,33 @@ GEM
ffi (1.17.2-x86_64-darwin)
ffi (1.17.2-x86_64-linux-gnu)
ffi (1.17.2-x86_64-linux-musl)
font-awesome-propshaft (1.1.2)
dartsass-rails (>= 0.4.0, < 2.0)
propshaft (>= 0.8, < 2.0)
railties (>= 7.0, < 9.0)
font-awesome-sass (6.7.2)
sassc (~> 2.0)
globalid (1.3.0)
activesupport (>= 6.1)
google-protobuf (4.32.1)
google-protobuf (4.33.0)
bigdecimal
rake (>= 13)
google-protobuf (4.32.1-aarch64-linux-gnu)
google-protobuf (4.33.0-aarch64-linux-gnu)
bigdecimal
rake (>= 13)
google-protobuf (4.32.1-aarch64-linux-musl)
google-protobuf (4.33.0-aarch64-linux-musl)
bigdecimal
rake (>= 13)
google-protobuf (4.32.1-arm64-darwin)
google-protobuf (4.33.0-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.32.1-x86_64-darwin)
google-protobuf (4.33.0-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.32.1-x86_64-linux-gnu)
google-protobuf (4.33.0-x86_64-linux-gnu)
bigdecimal
rake (>= 13)
google-protobuf (4.32.1-x86_64-linux-musl)
google-protobuf (4.33.0-x86_64-linux-musl)
bigdecimal
rake (>= 13)
hashdiff (1.2.1)
Expand All @@ -319,22 +305,19 @@ GEM
image_processing (1.14.0)
mini_magick (>= 4.9.5, < 6)
ruby-vips (>= 2.0.17, < 3)
importmap-rails (2.2.2)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
iniparse (1.5.0)
io-console (0.8.1)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jasny-bootstrap-rails (3.1.3)
railties (>= 3.0)
jbuilder (2.14.1)
actionview (>= 7.0.0)
activesupport (>= 7.0.0)
jquery-datatables-rails (3.4.0)
actionpack (>= 3.1)
jquery-rails
railties (>= 3.1)
sass-rails
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
Expand Down Expand Up @@ -453,6 +436,10 @@ GEM
prettyprint
prettyprint (0.2.0)
prism (1.5.1)
propshaft (1.3.1)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
Expand Down Expand Up @@ -588,18 +575,8 @@ GEM
google-protobuf (~> 4.31)
sass-embedded (1.93.2-x86_64-linux-musl)
google-protobuf (~> 4.31)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-embedded (1.80.5)
sass-embedded (~> 1.80)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
securerandom (0.4.1)
selenium-webdriver (4.35.0)
base64 (~> 0.2)
Expand All @@ -617,15 +594,9 @@ GEM
simplecov (~> 0.19)
simplecov-html (0.13.2)
simplecov_json_formatter (0.1.4)
sprockets (4.2.2)
concurrent-ruby (~> 1.0)
logger
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
ssrf_filter (1.3.0)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.1.7)
sys-uname (1.4.1)
ffi (~> 1.1)
Expand All @@ -637,9 +608,11 @@ GEM
nokogiri (>= 1.3.2)
thor (1.4.0)
thread_safe (0.3.6)
tilt (2.6.1)
timeout (0.4.3)
tsort (0.2.0)
turbo-rails (2.0.20)
actionpack (>= 7.1.0)
railties (>= 7.1.0)
typhoeus (1.5.0)
ethon (>= 0.9.0, < 0.16.0)
tzinfo (2.0.6)
Expand Down Expand Up @@ -721,17 +694,17 @@ DEPENDENCIES
cqm-validators (~> 4.0.6)
csv (~> 3.3, >= 3.3.5)
cucumber-rails
dartsass-sprockets (~> 3.2, >= 3.2.1)
dartsass-rails (~> 0.5.1)
database_cleaner-mongoid
delayed_job_mongoid (~> 3.0.0)
devise
devise_invitable
factory_bot_rails
faker (> 1.5.0)
font-awesome-propshaft
font-awesome-sass (~> 6.7, >= 6.7.2)
jasny-bootstrap-rails
importmap-rails (~> 2.2)
jbuilder (~> 2.14, >= 2.14.1)
jquery-datatables-rails
jquery-rails
jquery-ui-rails (~> 8.0.0)
kaminari-mongoid
Expand All @@ -748,6 +721,7 @@ DEPENDENCIES
newrelic_rpm
overcommit
poltergeist
propshaft
pry
pry-nav
puma (~> 6.6)
Expand All @@ -766,8 +740,9 @@ DEPENDENCIES
selenium-webdriver
simplecov
simplecov-cobertura
stimulus-rails
telephone_number
turbolinks!
turbo-rails
uglifier (>= 1.3.0)
validate_url
vcr
Expand Down
2 changes: 2 additions & 0 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
web: bin/rails server -p 3000
css: bin/rails dartsass:watch
Empty file added app/assets/builds/.keep
Empty file.
1 change: 1 addition & 0 deletions app/assets/builds/application.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
//= link_directory ../javascripts .js
// compile all SCSS through application.scss, expose that one CSS bundle
//= link application.css
//= link_tree ../../javascript .js
//= link_tree ../../../vendor/javascript .js
//= link_tree ../builds
File renamed without changes.
51 changes: 0 additions & 51 deletions app/assets/javascripts/application.js

This file was deleted.

61 changes: 61 additions & 0 deletions app/assets/javascripts/application.old
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*global Turbolinks */

// require turbolinks
// require jquery2
// require jquery_ujs
// require jquery.remotipart
// require parsley/parsley
// require dragon_drop/dragon-drop
// require dataTables/jquery.dataTables
// require jquery-ui/widgets/autocomplete
// require jquery-ui/widgets/tabs
// require jquery-ui/widgets/accordion
// require jquery-ui/widgets/button
// require jquery-ui/widgets/dialog
// require jquery-ui/widgets/menu
// require jquery-ui/widgets/progressbar
// require jquery-ui/widgets/slider
// require jquery-ui/widgets/spinner
// require jquery-ui/widgets/tooltip
// require jquery-ui/widgets/datepicker
// require assets_framework/assets.core
// require assets_framework/breadcrumb
// require jasny-bootstrap.min
// require local-time
// require_tree .
// require popper


import * as jQuery from "jquery";
import "./cypress";
import "turbolinks";
import "jquery-ui";
import "popper";
import "popper";
import "bootstrap";
import "jasny-bootstrap";
import "datatables.net";
import "datatables.net-dt/css/jquery.dataTables.css";
// will cover turbolinks changes (ajax already covered by rails ujs)
// this is necessary for CSRF tokens in changed form elements
// any statically changed form elements will require a separate token refresh call
$(document).on('page:load page:partial-load page:restore turbolinks:load', function () {
$.rails.refreshCSRFTokens();
});

$(function() {
Turbolinks.ProgressBar.enable();
$('.breadcrumb').breadcrumb();

$(document).on('ajaxComplete',function(e){
if(e.delegateTarget.activeElement.tagName.toLowerCase() == 'button') {
$(e.delegateTarget.activeElement).blur();
}
});

$(document).on('submit',function(e){
window.setTimeout(function(){
$(e.delegateTarget.activeElement).blur();
}, 1500);
});
});
File renamed without changes.
Loading
Loading