Skip to content
Open
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ yarn-debug.log*

# Ignore Jetbrains IDE files
/.idea

/app/assets/builds/*
!/app/assets/builds/.keep
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ source 'https://rubygems.org'
gem 'bcrypt', '~> 3.1.20'
gem 'bootsnap', '~> 1.18.4'
gem 'browser', '~> 6.2.0'
gem 'cssbundling-rails', '~> 1.4'
gem 'devise', '~>4.9.4'
gem 'devise-i18n', '~>1.13.0'
gem 'factory_bot_rails', '~> 6.4.4'
Expand All @@ -11,6 +12,7 @@ gem 'font-awesome-rails', '~> 4.7.0.9'
gem 'http', '~> 5.2.0'
gem 'jbuilder', '~> 2.13.0'
gem 'jquery-rails', '~> 4.6.0'
gem 'jsbundling-rails', '~> 1.3'
gem 'kaminari', '~> 1.2.2'
gem 'mollie-api-ruby', '~> 4.17.0'
gem 'net-imap', '~> 0.5.7'
Expand All @@ -29,17 +31,16 @@ gem 'rails', '~> 7.1.5', '>= 7.1.5.1'
gem 'rails-i18n', '~> 7.0.10'
gem 'redis-rails', '~> 5.0.2'
gem 'rest-client', '~> 2.1.0'
gem 'sassc-rails', '~> 2.1.2'
gem 'sentry-rails', '~> 5.23'
gem 'sentry-ruby', '~> 5.23'
gem 'sentry-sidekiq', '~> 5.23'
gem 'sidekiq', '~> 7.3.9'
gem 'sidekiq', '~> 8.0.3'
gem 'sidekiq-scheduler', '~> 6.0.1'
gem 'simple_form', '~> 5.3.1'
gem 'sprockets-rails', '~> 3.5'
gem 'turbolinks', '~> 5.2.1'
gem 'uglifier', '~> 4.2.1'
gem 'validates_timeliness', '~> 7.1.0'
gem 'webpacker', '~> 5.4.4'
gem 'wicked_pdf', '~> 2.6.3'
gem 'wkhtmltopdf-binary', '~> 0.12.6.5'

Expand Down
86 changes: 40 additions & 46 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ GEM
connection_pool (2.5.3)
consistency_fail (0.3.7)
crass (1.0.6)
cssbundling-rails (1.4.3)
railties (>= 6.0.0)
date (3.4.1)
devise (4.9.4)
bcrypt (~> 3.0)
Expand Down Expand Up @@ -215,6 +217,8 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.11.3)
jwt (2.4.1)
kaminari (1.2.2)
Expand Down Expand Up @@ -289,12 +293,13 @@ GEM
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
oauth2 (1.4.9)
oauth2 (2.0.9)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
omniauth (2.1.3)
hashie (>= 3.4.6)
rack (>= 2.2.3)
Expand Down Expand Up @@ -339,20 +344,18 @@ GEM
activesupport (>= 3.0.0)
raabro (1.4.0)
racc (1.8.1)
rack (2.2.16)
rack (3.1.14)
rack-attack (6.7.0)
rack (>= 1.0, < 4)
rack-protection (3.0.6)
rack
rack-proxy (0.7.2)
rack
rack-session (1.0.2)
rack (< 3)
rack-session (2.1.1)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.2.0)
rack (>= 1.3)
rackup (1.0.1)
rack (< 3)
webrick
rackup (2.2.1)
rack (>= 3)
rails (7.1.5.1)
actioncable (= 7.1.5.1)
actionmailbox (= 7.1.5.1)
Expand Down Expand Up @@ -398,17 +401,17 @@ GEM
rdoc (6.13.1)
psych (>= 4.0.0)
redis (4.8.1)
redis-actionpack (5.3.0)
actionpack (>= 5, < 8)
redis-rack (>= 2.1.0, < 3)
redis-actionpack (5.5.0)
actionpack (>= 5)
redis-rack (>= 2.1.0, < 4)
redis-store (>= 1.1.0, < 2)
redis-activesupport (5.3.0)
activesupport (>= 3, < 8)
redis-store (>= 1.3, < 2)
redis-client (0.24.0)
connection_pool
redis-rack (2.1.4)
rack (>= 2.0.8, < 3)
redis-rack (3.0.0)
rack-session (>= 0.2.0)
redis-store (>= 1.2, < 2)
redis-rails (5.0.2)
redis-actionpack (>= 5.0, < 6)
Expand Down Expand Up @@ -488,16 +491,7 @@ GEM
ruby2_keywords (0.0.5)
rufus-scheduler (3.9.2)
fugit (~> 1.1, >= 1.11.1)
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
securerandom (0.4.1)
semantic_range (3.0.0)
sentry-rails (5.23.0)
railties (>= 5.0)
sentry-ruby (~> 5.23.0)
Expand All @@ -508,13 +502,13 @@ GEM
sentry-ruby (~> 5.23.0)
sidekiq (>= 3.0)
shellany (0.0.1)
sidekiq (7.3.9)
base64
connection_pool (>= 2.3.0)
logger
rack (>= 2.2.4)
redis-client (>= 0.22.2)
sidekiq-scheduler (6.0.1)
sidekiq (8.0.3)
connection_pool (>= 2.5.0)
json (>= 2.9.0)
logger (>= 1.6.2)
rack (>= 3.1.0)
redis-client (>= 0.23.2)
sidekiq-scheduler (6.0.0)
rufus-scheduler (~> 3.2)
sidekiq (>= 7.3, < 9)
simple_form (5.3.1)
Expand All @@ -527,18 +521,22 @@ GEM
simplecov-html (0.12.3)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
spring (2.1.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (4.0.3)
sprockets (4.2.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
logger
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sshkit (1.21.2)
net-scp (>= 1.1.2)
Expand Down Expand Up @@ -567,19 +565,14 @@ GEM
validates_timeliness (7.1.0)
activemodel (>= 7.0.0, < 8)
timeliness (>= 0.3.10, < 1)
version_gem (1.1.8)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.1)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
webrick (1.9.1)
websocket-driver (0.7.7)
base64
websocket-extensions (>= 0.1.0)
Expand All @@ -604,6 +597,7 @@ DEPENDENCIES
capistrano-sidekiq (~> 2.3.0)
colorize (~> 0.8.1)
consistency_fail
cssbundling-rails (~> 1.4)
devise (~> 4.9.4)
devise-i18n (~> 1.13.0)
dotenv-rails (~> 3.1.8)
Expand All @@ -616,6 +610,7 @@ DEPENDENCIES
http (~> 5.2.0)
jbuilder (~> 2.13.0)
jquery-rails (~> 4.6.0)
jsbundling-rails (~> 1.3)
kaminari (~> 1.2.2)
listen (~> 3.7.1)
mina (~> 1.2.5)
Expand Down Expand Up @@ -647,26 +642,25 @@ DEPENDENCIES
rubocop-rails (~> 2.31)
rubocop-rspec (~> 3.5)
rubocop-rspec_rails (~> 2.31)
sassc-rails (~> 2.1.2)
sentry-rails (~> 5.23)
sentry-ruby (~> 5.23)
sentry-sidekiq (~> 5.23)
sidekiq (~> 7.3.9)
sidekiq (~> 8.0.3)
sidekiq-scheduler (~> 6.0.1)
simple_form (~> 5.3.1)
simplecov (~> 0.21.2)
simplecov-lcov (~> 0.8.0)
spring (~> 2.1.1)
spring-commands-rspec (~> 1.0.4)
spring-watcher-listen (~> 2.0.1)
sprockets-rails (~> 3.5)
terminal-notifier-guard (~> 1.7.0)
timecop (~> 0.9.5)
turbolinks (~> 5.2.1)
tzinfo-data
uglifier (~> 4.2.1)
validates_timeliness (~> 7.1.0)
web-console (~> 4.2.1)
webpacker (~> 5.4.4)
wicked_pdf (~> 2.6.3)
wkhtmltopdf-binary (~> 0.12.6.5)

Expand Down
3 changes: 3 additions & 0 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
web: env RUBY_DEBUG_OPEN=true bin/rails server
js: yarn build --watch
css: yarn build:css --watch
Empty file added app/assets/builds/.keep
Empty file.
2 changes: 1 addition & 1 deletion app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
//= link_tree ../builds
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.sass.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Entry point for your Sass build
1 change: 1 addition & 0 deletions app/javascript/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Entry point for the build script in your package.json
2 changes: 2 additions & 0 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@


<%= csrf_meta_tags %>
<%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
<%= stylesheet_link_tag "application" %>

</head>
<body>
Expand Down
11 changes: 11 additions & 0 deletions bin/dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env sh

if gem list --no-installed --exact --silent foreman; then
echo "Installing foreman..."
gem install foreman
fi

# Default to port 3000 if not specified
export PORT="${PORT:-3000}"

exec foreman start -f Procfile.dev --env /dev/null "$@"
19 changes: 0 additions & 19 deletions bin/webpack

This file was deleted.

19 changes: 0 additions & 19 deletions bin/webpack-dev-server

This file was deleted.

5 changes: 1 addition & 4 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
Rails.application.configure do
# Verifies that versions and hashed value of the package contents in the project's package.json
config.webpacker.check_yarn_integrity = true

# Settings specified here will take precedence over those in config/application.rb.

# In the development environment your application's code is reloaded on
Expand Down Expand Up @@ -70,7 +67,7 @@
config.action_mailer.asset_host = 'http://localhost:5000'
config.action_mailer.preview_path = Rails.root.join('spec', 'mailers', 'previews')

config.sass.inline_source_maps = true
# config.sass.inline_source_maps = true

config.after_initialize do
Bullet.enable = true
Expand Down
3 changes: 0 additions & 3 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
Rails.application.configure do
# Verifies that versions and hashed value of the package contents in the project's package.json
config.webpacker.check_yarn_integrity = false

# Settings specified here will take precedence over those in config/application.rb.

# Code is not reloaded between requests.
Expand Down
6 changes: 1 addition & 5 deletions config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@

# Add additional assets to the asset load path.
# 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')
Rails.application.config.assets.paths << Rails.root.join('node_modules', 'bootstrap', 'dist', 'js')
Rails.application.config.assets.paths << Rails.root.join('node_modules', 'bootstrap', 'scss')
Rails.application.config.assets.paths << Rails.root.join('node_modules', 'webfontloader')


# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets
Expand Down
Loading