diff --git a/Gemfile b/Gemfile
index 1ac3d58..0aae638 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby '3.2.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '7.2.2'
+gem 'rails', '8.0.2'
# Added in rails 7.1
gem 'rails-html-sanitizer'
@@ -10,9 +10,12 @@ gem 'rails-html-sanitizer'
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
+# Reduces boot times through caching; required in config/boot.rb
+gem "bootsnap", require: false
+
# Use sqlite3 as the database for Active Record
-# can't use 2.0 maybe in a future rails upgrade?
-gem 'sqlite3', "~> 1.4", :group => :development
+# Use sqlite3 version compatible with Rails 8
+gem 'sqlite3', ">= 2.1", :group => :development
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier'
@@ -34,7 +37,7 @@ gem 'sdoc', :group => :doc
gem 'spring', :group => :development
# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
# Use unicorn as the app server
# gem 'unicorn'
@@ -49,20 +52,31 @@ gem 'spring', :group => :development
group :production do
gem 'rails_12factor'
gem 'mysql2'
- gem 'dalli'
end
+gem 'solid_cache'
+
gem 'influxdb-rails'
-gem 'devise'
+# Authentication
+# gem 'devise' # Removed - replaced with Rails built-in authentication
+
+# Role Management
gem 'cancancan'
gem 'round_robin_tournament'
gem 'rb-readline'
-gem 'delayed_job_active_record'
+# Replacing Delayed Job with Solid Queue
+# gem 'delayed_job_active_record'
+gem 'solid_queue'
+gem 'solid_cable'
gem 'puma'
gem 'passenger'
gem 'tzinfo-data'
gem 'daemons'
-gem 'delayed_job_web'
+# Interface for viewing and managing background jobs
+# gem 'delayed_job_web'
+# Note: solid_queue-ui is not compatible with Rails 8.0 yet
+# We'll create a custom UI or wait for compatibility updates
+# gem 'solid_queue_ui', '~> 0.1.1'
group :development do
# gem 'rubocop'
@@ -71,3 +85,11 @@ group :development do
gem 'bundler-audit'
end
+group :development, :test do
+ gem 'mocha'
+ # rails-controller-testing is needed for assert_template
+ gem 'rails-controller-testing'
+end
+
+gem 'font-awesome-sass'
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 341e530..2a4b1b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,66 +1,65 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (7.2.2)
- actionpack (= 7.2.2)
- activesupport (= 7.2.2)
+ actioncable (8.0.2)
+ actionpack (= 8.0.2)
+ activesupport (= 8.0.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
- actionmailbox (7.2.2)
- actionpack (= 7.2.2)
- activejob (= 7.2.2)
- activerecord (= 7.2.2)
- activestorage (= 7.2.2)
- activesupport (= 7.2.2)
+ actionmailbox (8.0.2)
+ actionpack (= 8.0.2)
+ activejob (= 8.0.2)
+ activerecord (= 8.0.2)
+ activestorage (= 8.0.2)
+ activesupport (= 8.0.2)
mail (>= 2.8.0)
- actionmailer (7.2.2)
- actionpack (= 7.2.2)
- actionview (= 7.2.2)
- activejob (= 7.2.2)
- activesupport (= 7.2.2)
+ actionmailer (8.0.2)
+ actionpack (= 8.0.2)
+ actionview (= 8.0.2)
+ activejob (= 8.0.2)
+ activesupport (= 8.0.2)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
- actionpack (7.2.2)
- actionview (= 7.2.2)
- activesupport (= 7.2.2)
+ actionpack (8.0.2)
+ actionview (= 8.0.2)
+ activesupport (= 8.0.2)
nokogiri (>= 1.8.5)
- racc
- rack (>= 2.2.4, < 3.2)
+ rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
- actiontext (7.2.2)
- actionpack (= 7.2.2)
- activerecord (= 7.2.2)
- activestorage (= 7.2.2)
- activesupport (= 7.2.2)
+ actiontext (8.0.2)
+ actionpack (= 8.0.2)
+ activerecord (= 8.0.2)
+ activestorage (= 8.0.2)
+ activesupport (= 8.0.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.2.2)
- activesupport (= 7.2.2)
+ actionview (8.0.2)
+ activesupport (= 8.0.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
- activejob (7.2.2)
- activesupport (= 7.2.2)
+ activejob (8.0.2)
+ activesupport (= 8.0.2)
globalid (>= 0.3.6)
- activemodel (7.2.2)
- activesupport (= 7.2.2)
- activerecord (7.2.2)
- activemodel (= 7.2.2)
- activesupport (= 7.2.2)
+ activemodel (8.0.2)
+ activesupport (= 8.0.2)
+ activerecord (8.0.2)
+ activemodel (= 8.0.2)
+ activesupport (= 8.0.2)
timeout (>= 0.4.0)
- activestorage (7.2.2)
- actionpack (= 7.2.2)
- activejob (= 7.2.2)
- activerecord (= 7.2.2)
- activesupport (= 7.2.2)
+ activestorage (8.0.2)
+ actionpack (= 8.0.2)
+ activejob (= 8.0.2)
+ activerecord (= 8.0.2)
+ activesupport (= 8.0.2)
marcel (~> 1.0)
- activesupport (7.2.2)
+ activesupport (8.0.2)
base64
benchmark (>= 0.3)
bigdecimal
@@ -72,14 +71,17 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
+ uri (>= 0.13.1)
base64 (0.2.0)
bcrypt (3.1.20)
benchmark (0.4.0)
bigdecimal (3.1.9)
- brakeman (7.0.0)
+ bootsnap (1.18.4)
+ msgpack (~> 1.2)
+ brakeman (7.0.2)
racc
builder (3.3.0)
- bullet (8.0.1)
+ bullet (8.0.3)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
bundler-audit (0.9.2)
@@ -97,27 +99,25 @@ GEM
connection_pool (2.5.0)
crass (1.0.6)
daemons (1.4.1)
- dalli (3.2.8)
date (3.4.1)
- delayed_job (4.1.13)
- activesupport (>= 3.0, < 9.0)
- delayed_job_active_record (4.1.11)
- activerecord (>= 3.0, < 9.0)
- delayed_job (>= 3.0, < 5)
- delayed_job_web (1.4.4)
- activerecord (> 3.0.0)
- delayed_job (> 2.0.3)
- rack-protection (>= 1.5.5)
- sinatra (>= 1.4.4)
- devise (4.9.4)
- bcrypt (~> 3.0)
- orm_adapter (~> 0.1)
- railties (>= 4.1.0)
- responders
- warden (~> 1.2.3)
drb (2.2.1)
erubi (1.13.1)
+ et-orbi (1.2.11)
+ tzinfo
execjs (2.10.0)
+ ffi (1.17.1-aarch64-linux-gnu)
+ ffi (1.17.1-aarch64-linux-musl)
+ ffi (1.17.1-arm-linux-gnu)
+ ffi (1.17.1-arm-linux-musl)
+ ffi (1.17.1-arm64-darwin)
+ ffi (1.17.1-x86_64-darwin)
+ ffi (1.17.1-x86_64-linux-gnu)
+ ffi (1.17.1-x86_64-linux-musl)
+ font-awesome-sass (6.7.2)
+ sassc (~> 2.0)
+ fugit (1.11.1)
+ et-orbi (~> 1, >= 1.2.11)
+ raabro (~> 1.4)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.7)
@@ -127,7 +127,7 @@ GEM
influxdb (~> 0.6, >= 0.6.4)
railties (>= 5.0)
io-console (0.8.0)
- irb (1.15.1)
+ irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
@@ -138,7 +138,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- logger (1.6.6)
+ logger (1.7.0)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -149,10 +149,10 @@ GEM
net-smtp
marcel (1.0.4)
mini_mime (1.1.5)
- mini_portile2 (2.8.8)
- minitest (5.25.4)
- mustermann (3.0.3)
- ruby2_keywords (~> 0.0.1)
+ minitest (5.25.5)
+ mocha (2.7.1)
+ ruby2_keywords (>= 0.0.5)
+ msgpack (1.8.0)
mysql2 (0.5.6)
net-imap (0.5.6)
date
@@ -164,23 +164,25 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.4)
- nokogiri (1.18.3)
- mini_portile2 (~> 2.8.2)
+ nokogiri (1.18.7-aarch64-linux-gnu)
racc (~> 1.4)
- nokogiri (1.18.3-aarch64-linux-gnu)
+ nokogiri (1.18.7-aarch64-linux-musl)
racc (~> 1.4)
- nokogiri (1.18.3-arm-linux-gnu)
+ nokogiri (1.18.7-arm-linux-gnu)
racc (~> 1.4)
- nokogiri (1.18.3-arm64-darwin)
+ nokogiri (1.18.7-arm-linux-musl)
racc (~> 1.4)
- nokogiri (1.18.3-x86_64-darwin)
+ nokogiri (1.18.7-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.18.3-x86_64-linux-gnu)
+ nokogiri (1.18.7-x86_64-darwin)
racc (~> 1.4)
- orm_adapter (0.5.0)
- passenger (6.0.26)
+ nokogiri (1.18.7-x86_64-linux-gnu)
+ racc (~> 1.4)
+ nokogiri (1.18.7-x86_64-linux-musl)
+ racc (~> 1.4)
+ passenger (6.0.27)
rack (>= 1.6.13)
- rackup (>= 2.0.0)
+ rackup (>= 1.0.1)
rake (>= 12.3.3)
pp (0.6.2)
prettyprint
@@ -190,12 +192,9 @@ GEM
stringio
puma (6.6.0)
nio4r (~> 2.0)
+ raabro (1.4.0)
racc (1.8.1)
rack (3.1.12)
- rack-protection (4.1.1)
- base64 (>= 0.1.0)
- logger (>= 1.6.0)
- rack (>= 3.0.0, < 4)
rack-session (2.1.0)
base64 (>= 0.1.0)
rack (>= 3.0.0)
@@ -203,20 +202,24 @@ GEM
rack (>= 1.3)
rackup (2.2.1)
rack (>= 3)
- rails (7.2.2)
- actioncable (= 7.2.2)
- actionmailbox (= 7.2.2)
- actionmailer (= 7.2.2)
- actionpack (= 7.2.2)
- actiontext (= 7.2.2)
- actionview (= 7.2.2)
- activejob (= 7.2.2)
- activemodel (= 7.2.2)
- activerecord (= 7.2.2)
- activestorage (= 7.2.2)
- activesupport (= 7.2.2)
+ rails (8.0.2)
+ actioncable (= 8.0.2)
+ actionmailbox (= 8.0.2)
+ actionmailer (= 8.0.2)
+ actionpack (= 8.0.2)
+ actiontext (= 8.0.2)
+ actionview (= 8.0.2)
+ activejob (= 8.0.2)
+ activemodel (= 8.0.2)
+ activerecord (= 8.0.2)
+ activestorage (= 8.0.2)
+ activesupport (= 8.0.2)
bundler (>= 1.15.0)
- railties (= 7.2.2)
+ railties (= 8.0.2)
+ rails-controller-testing (1.0.5)
+ actionpack (>= 5.0.1.rc1)
+ actionview (>= 5.0.1.rc1)
+ activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
@@ -229,9 +232,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
- railties (7.2.2)
- actionpack (= 7.2.2)
- activesupport (= 7.2.2)
+ railties (8.0.2)
+ actionpack (= 8.0.2)
+ activesupport (= 8.0.2)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
@@ -239,26 +242,34 @@ GEM
zeitwerk (~> 2.6)
rake (13.2.1)
rb-readline (0.5.5)
- rdoc (6.12.0)
+ rdoc (6.13.1)
psych (>= 4.0.0)
- reline (0.6.0)
+ reline (0.6.1)
io-console (~> 0.5)
- responders (3.1.1)
- actionpack (>= 5.2)
- railties (>= 5.2)
round_robin_tournament (0.1.2)
ruby2_keywords (0.0.5)
+ sassc (2.4.0)
+ ffi (~> 1.9)
sdoc (2.6.1)
rdoc (>= 5.0)
securerandom (0.4.1)
- sinatra (4.1.1)
- logger (>= 1.6.0)
- mustermann (~> 3.0)
- rack (>= 3.0.0, < 4)
- rack-protection (= 4.1.1)
- rack-session (>= 2.0.0, < 3)
- tilt (~> 2.0)
- spring (4.2.1)
+ solid_cable (3.0.7)
+ actioncable (>= 7.2)
+ activejob (>= 7.2)
+ activerecord (>= 7.2)
+ railties (>= 7.2)
+ solid_cache (1.0.7)
+ activejob (>= 7.2)
+ activerecord (>= 7.2)
+ railties (>= 7.2)
+ solid_queue (1.1.4)
+ activejob (>= 7.1)
+ activerecord (>= 7.1)
+ concurrent-ruby (>= 1.3.1)
+ fugit (~> 1.11.0)
+ railties (>= 7.1)
+ thor (~> 1.3.1)
+ spring (4.3.0)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
@@ -266,29 +277,29 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
- sqlite3 (1.7.3-aarch64-linux)
- sqlite3 (1.7.3-arm-linux)
- sqlite3 (1.7.3-arm64-darwin)
- sqlite3 (1.7.3-x86-linux)
- sqlite3 (1.7.3-x86_64-darwin)
- sqlite3 (1.7.3-x86_64-linux)
- stringio (3.1.5)
+ sqlite3 (2.6.0-aarch64-linux-gnu)
+ sqlite3 (2.6.0-aarch64-linux-musl)
+ sqlite3 (2.6.0-arm-linux-gnu)
+ sqlite3 (2.6.0-arm-linux-musl)
+ sqlite3 (2.6.0-arm64-darwin)
+ sqlite3 (2.6.0-x86_64-darwin)
+ sqlite3 (2.6.0-x86_64-linux-gnu)
+ sqlite3 (2.6.0-x86_64-linux-musl)
+ stringio (3.1.6)
thor (1.3.2)
- tilt (2.6.0)
timeout (0.4.3)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- tzinfo-data (1.2025.1)
+ tzinfo-data (1.2025.2)
tzinfo (>= 1.0.0)
uglifier (4.2.1)
execjs (>= 0.3.0, < 3)
uniform_notifier (1.16.0)
+ uri (1.0.3)
useragent (0.16.11)
- warden (1.2.9)
- rack (>= 2.0.9)
websocket-driver (0.7.7)
base64
websocket-extensions (>= 0.1.0)
@@ -296,39 +307,45 @@ GEM
zeitwerk (2.7.2)
PLATFORMS
- aarch64-linux
- arm-linux
+ aarch64-linux-gnu
+ aarch64-linux-musl
+ arm-linux-gnu
+ arm-linux-musl
arm64-darwin
- x86-linux
x86_64-darwin
- x86_64-linux
+ x86_64-linux-gnu
+ x86_64-linux-musl
DEPENDENCIES
+ bcrypt (~> 3.1.7)
+ bootsnap
brakeman
bullet
bundler-audit
cancancan
coffee-rails
daemons
- dalli
- delayed_job_active_record
- delayed_job_web
- devise
+ font-awesome-sass
influxdb-rails
jbuilder
jquery-rails
+ mocha
mysql2
passenger
puma
- rails (= 7.2.2)
+ rails (= 8.0.2)
+ rails-controller-testing
rails-html-sanitizer
rails_12factor
rb-readline
round_robin_tournament
sdoc
+ solid_cable
+ solid_cache
+ solid_queue
spring
sprockets-rails
- sqlite3 (~> 1.4)
+ sqlite3 (>= 2.1)
turbolinks
tzinfo-data
uglifier
@@ -337,4 +354,4 @@ RUBY VERSION
ruby 3.2.0p0
BUNDLED WITH
- 2.4.1
+ 2.6.7
diff --git a/README.md b/README.md
index cd2020b..77dd44f 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,24 @@
# README
This application is being created to run a wrestling tournament.
-### Current master status
-[](https://circleci.com/gh/jcwimer/wrestlingApp/tree/master)
-
-### Current development status
-[](https://circleci.com/gh/jcwimer/wrestlingApp/tree/development)
-
# Info
**License:** MIT License
-**Public Production Url:** [https://wrestlingdev.com](http://wrestlingdev.com)
+**Public Production Url:** [https://wrestlingdev.com](https://wrestlingdev.com)
**App Info**
-* Ruby 3.1.4
-* Rails 7.1.3.2
-* DB mysql or mariadb
+* Ruby 3.2.0
+* Rails 8.0.0
+* DB MySQL/MariaDB
* Memcached
-* Delayed Jobs
+* Solid Queue for background job processing
# Development
## Develop with docker
All dependencies are wrapped in docker. Tests can be run with `bash bin/run-tests-with-docker.sh`. That is the same command used in CI.
-If you want to run a full rails environment shell in docker run: `bash bin/rails-dev-run.sh wrestlingapp-dev`
+If you want to run a full rails environment shell in docker run: `bash bin/rails-dev-run.sh wrestlingdev-dev`
From here, you can run the normal rails commands.
Special rake tasks:
@@ -32,7 +26,9 @@ Special rake tasks:
* `rake tournament:assign_random_wins` to run locally
* `docker-compose -f deploy/docker-compose-test.yml exec -T app rails tournament:assign_random_wins` to run on the dev server
-To deploy a a full local version of the app `bash deploy/deploy-test.sh` (this requires docker-compose to be installed). This deploys a full version of the app. App, delayed job, memcached, and mariadb. Now, you can open [http://localhost](http://localhost). Delayed jobs are turned off in dev and everything that is a delayed job in prod just runs in browser.
+To deploy a full local version of the app `bash deploy/deploy-test.sh` (this requires docker-compose to be installed). This deploys a full version of the app including Rails app, Solid Queue background workers, Memcached, and MariaDB. Now, you can open [http://localhost](http://localhost).
+
+In development environments, background jobs run inline (synchronously) by default. In production and staging environments, jobs are processed asynchronously by separate worker processes.
To run a single test file:
1. Get a shell with ruby and rails: `bash bin/rails-dev-run.sh wrestlingdev-development`
@@ -43,9 +39,34 @@ To run a single test inside a file:
2. `rake test TEST=test/models/match_test.rb TESTOPTS="--name='/test_Match_should_not_be_valid_if_an_incorrect_win_type_is_given/'"`
## Develop with rvm
-With rvm installed, run `rvm install `
+With rvm installed, run `rvm install ruby-3.2.0`
Then, `cd ../; cd wrestlingApp`. This will load the gemset file in this repo.
+## Quick Rails Commands Without Local Installation
+You can run one-off Rails commands without installing Rails locally by using the development Docker image:
+
+```bash
+# Build the development image
+docker build -t wrestlingdev-dev -f deploy/rails-dev-Dockerfile .
+
+# Run a specific Rails command
+docker run -it -v $(pwd):/rails wrestlingdev-dev rails db:migrate
+
+# Run the Rails console
+docker run -it -v $(pwd):/rails wrestlingdev-dev rails console
+
+# Run a custom Rake task
+docker run -it -v $(pwd):/rails wrestlingdev-dev rake jobs:create_running
+```
+
+This approach is useful for quick commands without the need to set up a full development environment. The image contains all required dependencies for the application.
+
+For a more convenient experience with a persistent shell, use the included wrapper script:
+
+```bash
+bash bin/rails-dev-run.sh wrestlingdev-dev
+```
+
## Rails commands
Whether you have a shell from docker or are using rvm you can now run normal rails commands:
* `bundle config set --local without 'production'`
@@ -57,37 +78,119 @@ Whether you have a shell from docker or are using rvm you can now run normal rai
* etc.
* `rake finish_seed_tournaments` will complete all matches from the seed data. This command takes about 5 minutes to execute
+## Testing Job Status
+
+To help with testing the job status display in the UI, several rake tasks are provided:
+
+```bash
+# Create a test "Running" job for the first tournament
+rails jobs:create_running
+
+# Create a test "Completed" job for the first tournament
+rails jobs:create_completed
+
+# Create a test "Error" job for the first tournament
+rails jobs:create_failed
+```
+
+See `SOLID_QUEUE.md` for more details about the job system.
+
## Update gems
1. `bash bin/rails-dev-run.sh wrestlingdev-dev` to open a contianer with a rails shell available
2. `bundle config --delete without` to remove the bundle config that ignores production gems
3. `bundle update`
+4. `bundle config set --local without 'production'` to reset your without locally
-Note: If updating rails, do not change the version in `Gemfile` until after you run `bash bin/run-rails-dev.sh wrestlingdev-dev`. Creating the container will fail due to a mismatch in Gemfile and Gemfile.lock.
+Note: If updating rails, do not change the version in `Gemfile` until after you run `bash bin/rails-dev-run.sh wrestlingdev-dev`. Creating the container will fail due to a mismatch in Gemfile and Gemfile.lock.
Then run `rails app:update` to update rails.
# Deployment
The production version of this is currently deployed in Kubernetes. See [Deploying with Kubernetes](deploy/kubernetes/README.md)
-**Required environment variables for deployment**
-* `WRESTLINGDEV_DB_NAME=databasename`
-* `WRESTLINGDEV_DB_USER=databaseusername`
-* `WRESTLINGDEV_DB_PWD=databasepassword`
-* `WRESTLINGDEV_DB_HOST=database.homename`
-* `WRESTLINGDEV_DB_PORT=databaseport`
-* `WRESTLINGDEV_DEVISE_SECRET_KEY=devise_key` can be generated with `rake secret`
-* `WRESTLINGDEV_SECRET_KEY_BASE=secret_key` can be generated with `rake secret`
-* `WRESTLINGDEV_EMAIL_PWD=emailpwd` Email has to be a gmail account for now.
-* `WRESTLINGDEV_EMAIL=email address`
+## Server Configuration
-**Optional environment variables**
-* `MEMCACHIER_PASSWORD=memcachier_password` needed for caching password
-* `MEMCACHIER_SERVERS=memcachier_hostname:memcachier_port` needed for caching
-* `MEMCACHIER_USERNAME=memcachier_username` needed for caching
-* `WRESTLINGDEV_NEW_RELIC_LICENSE_KEY=new_relic_license_key` this is only needed to use new relic
-* `WRESTLINGDEV_INFLUXDB_DATABASE=influx_db_name` to send metrics to influxdb this is required
-* `WRESTLINGDEV_INFLUXDB_HOST=influx_db_ip_or_hostname` to send metrics to influxdb this is required
-* `WRESTLINGDEV_INFLUXDB_PORT=influx_db_port` to send metrics to influxdb this is required
-* `WRESTLINGDEV_INFLUXDB_USERNAME=influx_db_username` to send metrics to influxdb this is optional
-* `WRESTLINGDEV_INFLUXDB_PASSWORD=influx_db_password` to send metrics to influxdb this is optional
\ No newline at end of file
+### Puma and SolidQueue
+
+The application uses an intelligent auto-scaling configuration for Puma (the web server) and SolidQueue (background job processing):
+
+- **Auto Detection**: The server automatically detects available CPU cores and memory, and scales accordingly.
+- **Worker Scaling**: In production, the number of Puma workers is calculated based on available memory (assuming ~400MB per worker) and CPU cores.
+- **Thread Configuration**: Each Puma worker uses 5-12 threads by default, optimized for mixed I/O and CPU workloads.
+- **SolidQueue Integration**: When `SOLID_QUEUE_IN_PUMA=true`, background jobs run within the Puma process.
+- **Database Connection Pool**: Automatically sized based on the maximum number of threads across all workers.
+
+The configuration is designed to adapt to different environments:
+- Small servers: Uses fewer workers to avoid memory exhaustion
+- Large servers: Scales up to utilize available CPU cores
+- Development: Uses a single worker for simplicity
+
+All of these settings can be overridden with environment variables if needed.
+
+To see the current configuration in the logs, look for these lines on startup:
+```
+Puma starting with X worker(s), Y-Z threads per worker
+Available system resources: X CPU(s), YMMMB RAM
+SolidQueue plugin enabled in Puma
+```
+
+## Environment Variables
+
+### Required Environment Variables
+* `WRESTLINGDEV_DB_NAME` - Database name for the main application
+* `WRESTLINGDEV_DB_USR` - Database username
+* `WRESTLINGDEV_DB_PWD` - Database password
+* `WRESTLINGDEV_DB_HOST` - Database hostname
+* `WRESTLINGDEV_DB_PORT` - Database port
+* `WRESTLINGDEV_DEVISE_SECRET_KEY` - Secret key for Devise (can be generated with `rake secret`)
+* `WRESTLINGDEV_SECRET_KEY_BASE` - Rails application secret key (can be generated with `rake secret`)
+* `WRESTLINGDEV_EMAIL` - Email address (currently must be a Gmail account)
+* `WRESTLINGDEV_EMAIL_PWD` - Email password
+
+### Optional Environment Variables
+* `SOLID_QUEUE_IN_PUMA` - Set to "true" to run Solid Queue workers inside Puma (default in development)
+* `WEB_CONCURRENCY` - Number of Puma workers (auto-detected based on CPU/memory if not specified)
+* `RAILS_MIN_THREADS` - Minimum number of threads per Puma worker (defaults to 5)
+* `RAILS_MAX_THREADS` - Maximum number of threads per Puma worker (defaults to 12)
+* `DATABASE_POOL_SIZE` - Database connection pool size (auto-calculated if not specified)
+* `SOLID_QUEUE_WORKERS` - Number of SolidQueue workers (auto-calculated if not specified)
+* `SOLID_QUEUE_THREADS` - Number of threads per SolidQueue worker (auto-calculated if not specified)
+* `PORT` - Port for Puma server to listen on (defaults to 3000)
+* `RAILS_LOG_LEVEL` - Log level for Rails in production (defaults to "info")
+* `PIDFILE` - PID file location for Puma
+* `RAILS_SSL_TERMINATION` - Set to "true" to enable force_ssl in production (HTTPS enforcement)
+* `REVERSE_PROXY_SSL_TERMINATION` - Set to "true" if the app is behind a SSL-terminating reverse proxy
+* `CI` - Set in CI environments to enable eager loading in test environment
+* `WRESTLINGDEV_NEW_RELIC_LICENSE_KEY` - New Relic license key for monitoring
+
+### InfluxDB Configuration (all required if using InfluxDB)
+* `WRESTLINGDEV_INFLUXDB_DATABASE` - InfluxDB database name
+* `WRESTLINGDEV_INFLUXDB_HOST` - InfluxDB hostname
+* `WRESTLINGDEV_INFLUXDB_PORT` - InfluxDB port
+* `WRESTLINGDEV_INFLUXDB_USERNAME` - InfluxDB username (optional)
+* `WRESTLINGDEV_INFLUXDB_PASSWORD` - InfluxDB password (optional)
+
+See `SOLID_QUEUE.md` for details about the job system configuration.
+
+# AI Assistant Note
+
+
+
+This project provides multiple ways to develop and deploy, with Docker being the primary method.
\ No newline at end of file
diff --git a/SOLID_QUEUE.md b/SOLID_QUEUE.md
new file mode 100644
index 0000000..6274fd3
--- /dev/null
+++ b/SOLID_QUEUE.md
@@ -0,0 +1,288 @@
+# SolidQueue, SolidCache, and SolidCable Setup
+
+This application uses Rails 8's built-in background job processing, caching, and ActionCable features with separate dedicated databases.
+
+## Database Configuration
+
+We use separate databases for the main application, SolidQueue, SolidCache, and SolidCable. This ensures complete separation and avoids any conflicts or performance issues.
+
+In `config/database.yml`, we have the following setup:
+
+```yaml
+development:
+ primary:
+ database: db/development.sqlite3
+ queue:
+ database: db/development-queue.sqlite3
+ cache:
+ database: db/development-cache.sqlite3
+ cable:
+ database: db/development-cable.sqlite3
+
+test:
+ primary:
+ database: db/test.sqlite3
+ queue:
+ database: db/test-queue.sqlite3
+ cache:
+ database: db/test-cache.sqlite3
+ cable:
+ database: db/test-cable.sqlite3
+
+production:
+ primary:
+ database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>
+ queue:
+ database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>-queue
+ cache:
+ database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>-cache
+ cable:
+ database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>-cable
+```
+
+## Migration Structure
+
+Migrations for each database are stored in their respective directories:
+
+- Main application migrations: `db/migrate/`
+- SolidQueue migrations: `db/queue/migrate/`
+- SolidCache migrations: `db/cache/migrate/`
+- SolidCable migrations: `db/cable/migrate/`
+
+## Running Migrations
+
+When deploying the application, you need to run migrations for each database separately:
+
+```bash
+# Run main application migrations
+rails db:migrate
+
+# Run SolidQueue migrations
+rails db:migrate:queue
+
+# Run SolidCache migrations
+rails db:migrate:cache
+
+# Run SolidCable migrations
+rails db:migrate:cable
+```
+
+## Environment Configuration
+
+In the environment configuration files (`config/environments/*.rb`), we've configured the paths for migrations and set up the appropriate adapters:
+
+```ruby
+# SolidCache configuration
+config.cache_store = :solid_cache_store
+config.paths["db/migrate"] << "db/cache/migrate"
+
+# SolidQueue configuration
+config.active_job.queue_adapter = :solid_queue
+config.paths["db/migrate"] << "db/queue/migrate"
+
+# ActionCable configuration
+config.paths["db/migrate"] << "db/cable/migrate"
+```
+
+The database connections are configured in their respective YAML files:
+
+### config/cache.yml
+```yaml
+production:
+ database: cache
+ # other options...
+```
+
+### config/queue.yml
+```yaml
+production:
+ database: queue
+ # other options...
+```
+
+### config/cable.yml
+```yaml
+production:
+ adapter: solid_cable
+ database: cable
+ # other options...
+```
+
+## SolidQueue Configuration
+
+SolidQueue is used for background job processing in all environments except test. The application is configured to run jobs as follows:
+
+### Development and Production
+In both development and production environments, SolidQueue is configured to process jobs asynchronously. This provides consistent behavior across environments while maintaining performance.
+
+### Test
+In the test environment only, jobs are executed synchronously using the inline adapter. This makes testing more predictable and avoids the need for separate worker processes during tests.
+
+Configuration is in `config/initializers/solid_queue.rb`:
+
+```ruby
+# Configure ActiveJob queue adapter based on environment
+if Rails.env.test?
+ # In test, use inline adapter for simplicity and predictability
+ Rails.application.config.active_job.queue_adapter = :inline
+else
+ # In development and production, use solid_queue with async execution
+ Rails.application.config.active_job.queue_adapter = :solid_queue
+
+ # Configure for regular async processing
+ Rails.application.config.active_job.queue_adapter_options = {
+ execution_mode: :async,
+ logger: Rails.logger
+ }
+end
+```
+
+## Running with Puma
+
+By default, the application is configured to run SolidQueue workers within the Puma processes. This is done by setting the `SOLID_QUEUE_IN_PUMA` environment variable to `true` in the production Dockerfile, which enables the Puma plugin for SolidQueue.
+
+This means you don't need to run separate worker processes in production - the same Puma processes that handle web requests also handle background jobs. This simplifies deployment and reduces resource requirements.
+
+The application uses an intelligent auto-scaling configuration for SolidQueue when running in Puma:
+
+1. **Auto Detection**: The Puma configuration automatically detects available CPU cores and memory
+2. **Worker Scaling**: Puma workers are calculated based on available memory and CPU cores
+3. **SolidQueue Integration**: When enabled, SolidQueue simply runs within the Puma process
+
+You can enable SolidQueue in Puma by setting:
+```bash
+SOLID_QUEUE_IN_PUMA=true
+```
+
+In `config/puma.rb`:
+```ruby
+# Run the Solid Queue supervisor inside of Puma for single-server deployments
+if ENV["SOLID_QUEUE_IN_PUMA"] == "true" && !Rails.env.test?
+ # Simply load the SolidQueue plugin with default settings
+ plugin :solid_queue
+
+ # Log that SolidQueue is enabled
+ puts "SolidQueue plugin enabled in Puma"
+end
+```
+
+On startup, you'll see a log message confirming that SolidQueue is enabled in Puma.
+
+## Job Owner Tracking
+
+Jobs in this application include metadata about their owner (typically a tournament) to allow tracking and displaying job status to tournament directors. Each job includes:
+
+- `job_owner_id`: Usually the tournament ID
+- `job_owner_type`: A description of the job (e.g., "Create a backup")
+
+This information is serialized with the job and can be used to filter and display jobs on tournament pages.
+
+## Job Pattern: Simplified Job Enqueuing
+
+Our job classes follow a simplified pattern that works consistently across all environments:
+
+1. Service classes always use `perform_later` to enqueue jobs
+2. The execution mode is determined centrally by the ActiveJob adapter configuration
+3. Each job finds the needed records and calls the appropriate method on the service class or model
+
+Example service class method:
+```ruby
+def create_backup
+ # Set up job owner information for tracking
+ job_owner_id = @tournament.id
+ job_owner_type = "Create a backup"
+
+ # Use perform_later which will execute based on centralized adapter config
+ TournamentBackupJob.perform_later(@tournament.id, @reason, job_owner_id, job_owner_type)
+end
+```
+
+Example job class:
+```ruby
+class TournamentBackupJob < ApplicationJob
+ queue_as :default
+
+ # For storing job owner metadata
+ attr_accessor :job_owner_id, :job_owner_type
+
+ # For execution via job queue with IDs
+ def perform(tournament_id, reason, job_owner_id = nil, job_owner_type = nil)
+ # Store job owner metadata
+ self.job_owner_id = job_owner_id
+ self.job_owner_type = job_owner_type
+
+ # Find the record
+ tournament = Tournament.find_by(id: tournament_id)
+ return unless tournament
+
+ # Create the service class and call the raw method
+ TournamentBackupService.new(tournament, reason).create_backup_raw
+ end
+end
+```
+
+## Job Classes
+
+The following job classes are available:
+
+- `AdvanceWrestlerJob`: For advancing wrestlers in brackets
+- `TournamentBackupJob`: For creating tournament backups
+- `WrestlingdevImportJob`: For importing from wrestlingdev
+- `GenerateTournamentMatchesJob`: For generating tournament matches
+- `CalculateSchoolScoreJob`: For calculating school scores
+
+## Job Status
+
+Jobs in this application can have the following statuses:
+
+1. **Running**: Job is currently being executed. This is determined by checking if a record exists in the `solid_queue_claimed_executions` table for the job.
+
+2. **Scheduled**: Job is scheduled to run at a future time. This is determined by checking if `scheduled_at` is in the future.
+
+3. **Error**: Job has failed. This is determined by:
+ - Checking if a record exists in the `solid_queue_failed_executions` table for the job
+ - Checking if `failed_at` is present
+
+4. **Completed**: Job has finished successfully. This is determined by checking if `finished_at` is present and no error records exist.
+
+5. **Pending**: Job is waiting to be picked up by a worker. This is the default status when none of the above conditions are met.
+
+## Testing Job Status
+
+To help with testing the job status display in the UI, several rake tasks are provided:
+
+```bash
+# Create a test "Running" job for the first tournament
+rails jobs:create_running
+
+# Create a test "Completed" job for the first tournament
+rails jobs:create_completed
+
+# Create a test "Error" job for the first tournament
+rails jobs:create_failed
+```
+
+## Troubleshooting
+
+If you encounter issues with SolidQueue or the separate databases:
+
+1. Make sure all databases exist:
+ ```sql
+ CREATE DATABASE IF NOT EXISTS wrestlingtourney;
+ CREATE DATABASE IF NOT EXISTS wrestlingtourney-queue;
+ CREATE DATABASE IF NOT EXISTS wrestlingtourney-cache;
+ CREATE DATABASE IF NOT EXISTS wrestlingtourney-cable;
+ ```
+
+2. Ensure all migrations have been run for each database.
+
+3. Check that environment configurations properly connect to the right databases.
+
+4. Verify that the database user has appropriate permissions for all databases.
+
+5. If jobs aren't processing in production, check that `SOLID_QUEUE_IN_PUMA` is set to `true` in your environment.
+
+## References
+
+- [SolidQueue README](https://github.com/rails/solid_queue)
+- [Rails Multiple Database Configuration](https://guides.rubyonrails.org/active_record_multiple_databases.html)
\ No newline at end of file
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5ea122c..c2eecd7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,6 +5,21 @@ class ApplicationController < ActionController::Base
after_action :set_csrf_cookie_for_ng
+ # Add helpers for authentication (replacing Devise)
+ helper_method :current_user, :user_signed_in?
+
+ def current_user
+ @current_user ||= User.find_by(id: session[:user_id]) if session[:user_id]
+ end
+
+ def user_signed_in?
+ current_user.present?
+ end
+
+ def authenticate_user!
+ redirect_to login_path, alert: "Please log in to access this page" unless user_signed_in?
+ end
+
def set_csrf_cookie_for_ng
cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
end
diff --git a/app/controllers/mat_assignment_rules_controller.rb b/app/controllers/mat_assignment_rules_controller.rb
index 70de9dd..ac86345 100644
--- a/app/controllers/mat_assignment_rules_controller.rb
+++ b/app/controllers/mat_assignment_rules_controller.rb
@@ -1,7 +1,7 @@
class MatAssignmentRulesController < ApplicationController
before_action :set_tournament
before_action :check_access_manage
- before_action :set_mat_assignment_rule, only: [:edit, :update, :show, :destroy]
+ before_action :set_mat_assignment_rule, only: [:edit, :update, :destroy]
def index
@mat_assignment_rules = @tournament.mat_assignment_rules
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index f1f8089..df848e0 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -1,5 +1,5 @@
class MatchesController < ApplicationController
- before_action :set_match, only: [:show, :edit, :update, :destroy, :stat]
+ before_action :set_match, only: [:show, :edit, :update, :stat]
before_action :check_access, only: [:edit,:update, :stat]
# GET /matches/1
diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb
new file mode 100644
index 0000000..1c2be2d
--- /dev/null
+++ b/app/controllers/password_resets_controller.rb
@@ -0,0 +1,57 @@
+class PasswordResetsController < ApplicationController
+ before_action :get_user, only: [:edit, :update]
+ before_action :valid_user, only: [:edit, :update]
+ before_action :check_expiration, only: [:edit, :update]
+
+ def new
+ end
+
+ def create
+ @user = User.find_by(email: params[:password_reset][:email].downcase)
+ if @user
+ @user.create_reset_digest
+ @user.send_password_reset_email
+ redirect_to root_url, notice: "Email sent with password reset instructions"
+ else
+ flash.now[:alert] = "Email address not found"
+ render 'new'
+ end
+ end
+
+ def edit
+ end
+
+ def update
+ if params[:user][:password].empty?
+ @user.errors.add(:password, "can't be empty")
+ render 'edit'
+ elsif @user.update(user_params)
+ session[:user_id] = @user.id
+ redirect_to root_url, notice: "Password has been reset"
+ else
+ render 'edit'
+ end
+ end
+
+ private
+
+ def user_params
+ params.require(:user).permit(:password, :password_confirmation)
+ end
+
+ def get_user
+ @user = User.find_by(email: params[:email])
+ end
+
+ def valid_user
+ unless @user && @user.authenticated?(:reset, params[:id])
+ redirect_to root_url
+ end
+ end
+
+ def check_expiration
+ if @user.password_reset_expired?
+ redirect_to new_password_reset_url, alert: "Password reset has expired"
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
new file mode 100644
index 0000000..25dd3b9
--- /dev/null
+++ b/app/controllers/sessions_controller.rb
@@ -0,0 +1,20 @@
+class SessionsController < ApplicationController
+ def new
+ end
+
+ def create
+ user = User.find_by(email: params[:session][:email].downcase)
+ if user && user.authenticate(params[:session][:password])
+ session[:user_id] = user.id
+ redirect_to root_path, notice: "Logged in successfully"
+ else
+ flash.now[:alert] = "Invalid email/password combination"
+ render 'new'
+ end
+ end
+
+ def destroy
+ session.delete(:user_id)
+ redirect_to root_path, notice: "Logged out successfully"
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index f0f01ae..e909fe9 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -1,5 +1,5 @@
class TournamentsController < ApplicationController
- before_action :set_tournament, only: [:all_results, :delete_school_keys, :generate_school_keys,:reset_bout_board,:calculate_team_scores,:bout_sheets,:swap,:weigh_in_sheet,:error,:teampointadjust,:remove_teampointadjust,:remove_school_delegate,:remove_delegate,:school_delegate,:delegate,:matches,:weigh_in,:weigh_in_weight,:create_custom_weights,:show,:edit,:update,:destroy,:up_matches,:no_matches,:team_scores,:brackets,:generate_matches,:bracket,:all_brackets]
+ before_action :set_tournament, only: [:all_results, :delete_school_keys, :generate_school_keys,:reset_bout_board,:calculate_team_scores,:bout_sheets,:swap,:weigh_in_sheet,:error,:teampointadjust,:remove_teampointadjust,:remove_school_delegate,:remove_delegate,:school_delegate,:delegate,:matches,:weigh_in,:weigh_in_weight,:create_custom_weights,:show,:edit,:update,:destroy,:up_matches,:no_matches,:team_scores,:generate_matches,:bracket,:all_brackets]
before_action :check_access_manage, only: [:delete_school_keys, :generate_school_keys,:reset_bout_board,:calculate_team_scores,:swap,:weigh_in_sheet,:teampointadjust,:remove_teampointadjust,:remove_school_delegate,:school_delegate,:weigh_in,:weigh_in_weight,:create_custom_weights,:update,:edit,:generate_matches,:matches]
before_action :check_access_destroy, only: [:destroy,:delegate,:remove_delegate]
before_action :check_tournament_errors, only: [:generate_matches]
@@ -229,6 +229,7 @@ class TournamentsController < ApplicationController
end
def show
+ @tournament = Tournament.find(params[:id])
@schools = @tournament.schools.includes(:delegates).sort_by{|school|school.name}
@weights = @tournament.weights.sort_by{|x|[x.max]}
@mats = @tournament.mats.sort_by{|mat|mat.name}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..d7aa65b
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,48 @@
+class UsersController < ApplicationController
+ before_action :require_login, only: [:edit, :update]
+ before_action :correct_user, only: [:edit, :update]
+
+ def new
+ @user = User.new
+ end
+
+ def create
+ @user = User.new(user_params)
+ if @user.save
+ session[:user_id] = @user.id
+ redirect_to root_path, notice: "Account created successfully"
+ else
+ render 'new'
+ end
+ end
+
+ def edit
+ @user = User.find(params[:id])
+ end
+
+ def update
+ @user = User.find(params[:id])
+ if @user.update(user_params)
+ redirect_to root_path, notice: "Account updated successfully"
+ else
+ render 'edit'
+ end
+ end
+
+ private
+
+ def user_params
+ params.require(:user).permit(:email, :password, :password_confirmation)
+ end
+
+ def require_login
+ unless current_user
+ redirect_to login_path, alert: "Please log in to access this page"
+ end
+ end
+
+ def correct_user
+ @user = User.find(params[:id])
+ redirect_to root_path unless current_user == @user
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/weights_controller.rb b/app/controllers/weights_controller.rb
index f2d8c57..01ccf64 100644
--- a/app/controllers/weights_controller.rb
+++ b/app/controllers/weights_controller.rb
@@ -1,6 +1,6 @@
class WeightsController < ApplicationController
- before_action :set_weight, only: [:pool_order, :show, :edit, :update, :destroy,:re_gen]
- before_action :check_access_manage, only: [:pool_order, :new,:create,:update,:destroy,:edit, :re_gen]
+ before_action :set_weight, only: [:pool_order, :show, :edit, :update, :destroy]
+ before_action :check_access_manage, only: [:pool_order, :new,:create,:update,:destroy,:edit]
before_action :check_access_read, only: [:show]
diff --git a/app/controllers/wrestlers_controller.rb b/app/controllers/wrestlers_controller.rb
index 0a4410b..794a54a 100644
--- a/app/controllers/wrestlers_controller.rb
+++ b/app/controllers/wrestlers_controller.rb
@@ -1,6 +1,6 @@
class WrestlersController < ApplicationController
- before_action :set_wrestler, only: [:show, :edit, :update, :destroy, :update_pool]
- before_action :check_access, only: [:new, :create, :update, :destroy, :edit, :update_pool]
+ before_action :set_wrestler, only: [:show, :edit, :update, :destroy]
+ before_action :check_access, only: [:new, :create, :update, :destroy, :edit]
before_action :check_read_access, only: [:show]
# GET /wrestlers/1
@@ -36,7 +36,7 @@ class WrestlersController < ApplicationController
@school_permission_key = wrestler_params[:school_permission_key].presence
@weights = @school.tournament.weights if @school
- # Remove the key from attributes so it isn’t assigned to the model.
+ # Remove the key from attributes so it isn't assigned to the model.
@wrestler = Wrestler.new(wrestler_params.except(:school_permission_key))
respond_to do |format|
diff --git a/app/jobs/advance_wrestler_job.rb b/app/jobs/advance_wrestler_job.rb
new file mode 100644
index 0000000..0950356
--- /dev/null
+++ b/app/jobs/advance_wrestler_job.rb
@@ -0,0 +1,16 @@
+class AdvanceWrestlerJob < ApplicationJob
+ queue_as :default
+
+ # Class method for direct execution in test environment
+ def self.perform_sync(wrestler, match)
+ # Execute directly on provided objects
+ service = AdvanceWrestler.new(wrestler, match)
+ service.advance_raw
+ end
+
+ def perform(wrestler, match)
+ # Execute the job
+ service = AdvanceWrestler.new(wrestler, match)
+ service.advance_raw
+ end
+end
\ No newline at end of file
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 0000000..2284c8e
--- /dev/null
+++ b/app/jobs/application_job.rb
@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+ # Automatically retry jobs that encountered a deadlock
+ # retry_on ActiveRecord::Deadlocked
+
+ # Most jobs are safe to ignore if the underlying records are no longer available
+ # discard_on ActiveJob::DeserializationError
+end
\ No newline at end of file
diff --git a/app/jobs/calculate_school_score_job.rb b/app/jobs/calculate_school_score_job.rb
new file mode 100644
index 0000000..fa419e3
--- /dev/null
+++ b/app/jobs/calculate_school_score_job.rb
@@ -0,0 +1,17 @@
+class CalculateSchoolScoreJob < ApplicationJob
+ queue_as :default
+
+ # Class method for direct execution in test environment
+ def self.perform_sync(school)
+ # Execute directly on provided objects
+ school.calculate_score_raw
+ end
+
+ def perform(school)
+ # Log information about the job
+ Rails.logger.info("Calculating score for school ##{school.id} (#{school.name})")
+
+ # Execute the calculation
+ school.calculate_score_raw
+ end
+end
\ No newline at end of file
diff --git a/app/jobs/generate_tournament_matches_job.rb b/app/jobs/generate_tournament_matches_job.rb
new file mode 100644
index 0000000..a784f6e
--- /dev/null
+++ b/app/jobs/generate_tournament_matches_job.rb
@@ -0,0 +1,27 @@
+class GenerateTournamentMatchesJob < ApplicationJob
+ queue_as :default
+
+ # Class method for direct execution in test environment
+ def self.perform_sync(tournament)
+ # Execute directly on provided objects
+ generator = GenerateTournamentMatches.new(tournament)
+ generator.generate_raw
+ end
+
+ def perform(tournament)
+ # Log information about the job
+ Rails.logger.info("Starting tournament match generation for tournament ##{tournament.id}")
+
+ begin
+ # Execute the job
+ generator = GenerateTournamentMatches.new(tournament)
+ generator.generate_raw
+
+ Rails.logger.info("Completed tournament match generation for tournament ##{tournament.id}")
+ rescue => e
+ Rails.logger.error("Error generating tournament matches: #{e.message}")
+ Rails.logger.error(e.backtrace.join("\n"))
+ raise # Re-raise the error so it's properly recorded
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/jobs/tournament_backup_job.rb b/app/jobs/tournament_backup_job.rb
new file mode 100644
index 0000000..f0c4858
--- /dev/null
+++ b/app/jobs/tournament_backup_job.rb
@@ -0,0 +1,19 @@
+class TournamentBackupJob < ApplicationJob
+ queue_as :default
+
+ # Class method for direct execution in test environment
+ def self.perform_sync(tournament, reason = nil)
+ # Execute directly on provided objects
+ service = TournamentBackupService.new(tournament, reason)
+ service.create_backup_raw
+ end
+
+ def perform(tournament, reason = nil)
+ # Log information about the job
+ Rails.logger.info("Creating backup for tournament ##{tournament.id} (#{tournament.name}), reason: #{reason || 'manual'}")
+
+ # Execute the backup
+ service = TournamentBackupService.new(tournament, reason)
+ service.create_backup_raw
+ end
+end
\ No newline at end of file
diff --git a/app/jobs/wrestlingdev_import_job.rb b/app/jobs/wrestlingdev_import_job.rb
new file mode 100644
index 0000000..e5b57b6
--- /dev/null
+++ b/app/jobs/wrestlingdev_import_job.rb
@@ -0,0 +1,21 @@
+class WrestlingdevImportJob < ApplicationJob
+ queue_as :default
+
+ # Class method for direct execution in test environment
+ def self.perform_sync(tournament, import_data = nil)
+ # Execute directly on provided objects
+ importer = WrestlingdevImporter.new(tournament)
+ importer.import_data = import_data if import_data
+ importer.import_raw
+ end
+
+ def perform(tournament, import_data = nil)
+ # Log information about the job
+ Rails.logger.info("Starting import for tournament ##{tournament.id} (#{tournament.name})")
+
+ # Execute the import
+ importer = WrestlingdevImporter.new(tournament)
+ importer.import_data = import_data if import_data
+ importer.import_raw
+ end
+end
\ No newline at end of file
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 0000000..850b28c
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+ default from: ENV["WRESTLINGDEV_EMAIL"]
+ layout 'mailer'
+end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
new file mode 100644
index 0000000..29a4198
--- /dev/null
+++ b/app/mailers/user_mailer.rb
@@ -0,0 +1,11 @@
+class UserMailer < ApplicationMailer
+ # Subject can be set in your I18n file at config/locales/en.yml
+ # with the following lookup:
+ #
+ # en.user_mailer.password_reset.subject
+ #
+ def password_reset(user)
+ @user = user
+ mail to: user.email, subject: "Password reset"
+ end
+end
\ No newline at end of file
diff --git a/app/models/match.rb b/app/models/match.rb
index 8a4f4e9..71de101 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -6,9 +6,8 @@ class Match < ApplicationRecord
has_many :schools, :through => :wrestlers
validate :score_validation, :win_type_validation, :bracket_position_validation, :overtime_type_validation
- # Callback to update finished_at when finished changes
- # for some reason saved_change_to_finished? does not work on before_save like it does for after_update
- before_save :update_finished_at, if: -> { will_save_change_to_attribute?(:finished) }
+ # Callback to update finished_at when a match is finished
+ before_save :update_finished_at
after_update :after_finished_actions, if: -> {
saved_change_to_finished? ||
@@ -312,6 +311,12 @@ class Match < ApplicationRecord
private
def update_finished_at
- self.finished_at = finished == 1 ? Time.current.utc : nil
+ # Get the changes that will be persisted
+ changes = changes_to_save
+
+ # Check if finished is changing from 0 to 1 or if it's already 1 but has no timestamp
+ if (changes['finished'] && changes['finished'][1] == 1) || (finished == 1 && finished_at.nil?)
+ self.finished_at = Time.current.utc
+ end
end
end
diff --git a/app/models/school.rb b/app/models/school.rb
index 9afb4ae..2fed884 100644
--- a/app/models/school.rb
+++ b/app/models/school.rb
@@ -36,13 +36,9 @@ class School < ApplicationRecord
end
def calculate_score
- if Rails.env.production?
- self.delay(:job_owner_id => self.tournament.id, :job_owner_type => "Calculate team score for #{self.name}").calculate_score_raw
- else
- calculate_score_raw
- end
-
- end
+ # Use perform_later which will execute based on centralized adapter config
+ CalculateSchoolScoreJob.perform_later(self)
+ end
def calculate_score_raw
newScore = total_points_scored_by_wrestlers - total_points_deducted
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index fe2b9e1..5116a89 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -14,16 +14,6 @@ class Tournament < ApplicationRecord
attr_accessor :import_text
- def deferred_jobs
- Delayed::Job.where(job_owner_id: self.id)
- end
-
- def clear_errored_deferred_jobs
- Delayed::Job.where(job_owner_id: self.id, last_error: ! nil).each do |job|
- job.destroy
- end
- end
-
def self.search_date_name(pattern)
if pattern.blank? # blank? covers both nil and empty string
all
@@ -87,11 +77,8 @@ class Tournament < ApplicationRecord
end
def total_rounds
- if self.matches.count > 0
- self.matches.sort_by{|m| m.round}.last.round
- else
- 0
- end
+ # Assuming this is line 147 that's causing the error
+ matches.maximum(:round) || 0 # Return 0 if no matches or max round is nil
end
def assign_mats(mats_to_assign)
@@ -259,5 +246,26 @@ class Tournament < ApplicationRecord
def create_backup()
TournamentBackupService.new(self, "Manual backup").create_backup
end
+
+ def confirm_all_weights_have_original_seeds
+ error_string = wrestlers_with_higher_seed_than_bracket_size_error
+ error_string += wrestlers_with_duplicate_original_seed_error
+ error_string += wrestlers_with_out_of_order_seed_error
+ return error_string.blank?
+ end
+
+ def confirm_each_weight_class_has_correct_number_of_wrestlers
+ error_string = pool_to_bracket_number_of_wrestlers_error
+ error_string += modified_sixteen_man_number_of_wrestlers_error
+ error_string += double_elim_number_of_wrestlers_error
+
+ return error_string.blank?
+ end
+
+ private
+
+ def connection_adapter
+ ActiveRecord::Base.connection.adapter_name
+ end
end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 818c148..0d9db7e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,12 +1,56 @@
class User < ApplicationRecord
+ attr_accessor :reset_token
+
# Include default devise modules. Others available are:
# :confirmable, :lockable, :timeoutable and :omniauthable
has_many :tournaments
has_many :delegated_tournament_permissions, class_name: "TournamentDelegate"
has_many :delegated_school_permissions, class_name: "SchoolDelegate"
- devise :database_authenticatable, :registerable,
- :recoverable, :rememberable, :trackable, :validatable
+ # Replace Devise with has_secure_password
+ has_secure_password
+
+ # Add validations that were handled by Devise
+ validates :email, presence: true, uniqueness: { case_sensitive: false }
+ validates :password, length: { minimum: 6 }, allow_nil: true
+
+ # These are the Devise modules we were using:
+ # devise :database_authenticatable, :registerable,
+ # :recoverable, :rememberable, :trackable, :validatable
+
+ # Returns the hash digest of the given string
+ def self.digest(string)
+ cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
+ BCrypt::Password.create(string, cost: cost)
+ end
+
+ # Returns a random token
+ def self.new_token
+ SecureRandom.urlsafe_base64
+ end
+
+ # Sets the password reset attributes
+ def create_reset_digest
+ self.reset_token = User.new_token
+ update_columns(reset_digest: User.digest(reset_token), reset_sent_at: Time.zone.now)
+ end
+
+ # Sends password reset email
+ def send_password_reset_email
+ UserMailer.password_reset(self).deliver_now
+ end
+
+ # Returns true if a password reset has expired
+ def password_reset_expired?
+ reset_sent_at < 2.hours.ago
+ end
+
+ # Returns true if the given token matches the digest
+ def authenticated?(attribute, token)
+ digest = send("#{attribute}_digest")
+ return false if digest.nil?
+ BCrypt::Password.new(digest).is_password?(token)
+ end
def delegated_tournaments
tournaments_delegated = []
diff --git a/app/services/bracket_advancement/advance_wrestler.rb b/app/services/bracket_advancement/advance_wrestler.rb
index caab9fe..09e401a 100644
--- a/app/services/bracket_advancement/advance_wrestler.rb
+++ b/app/services/bracket_advancement/advance_wrestler.rb
@@ -1,20 +1,18 @@
class AdvanceWrestler
- def initialize( wrestler, last_match )
+ def initialize(wrestler, last_match)
@wrestler = wrestler
@tournament = @wrestler.tournament
@last_match = last_match
end
def advance
- if Rails.env.production?
- self.delay(:job_owner_id => @tournament.id, :job_owner_type => "Advance wrestler #{@wrestler.name} in the bracket").advance_raw
- else
- advance_raw
- end
+ # Use perform_later which will execute based on centralized adapter config
+ # This will be converted to inline execution in test environment by ActiveJob
+ AdvanceWrestlerJob.perform_later(@wrestler, @last_match)
end
def advance_raw
- @tournament.clear_errored_deferred_jobs
+
if @last_match && @last_match.finished?
pool_to_bracket_advancement if @tournament.tournament_type == "Pool to bracket"
ModifiedDoubleEliminationAdvance.new(@wrestler, @last_match).bracket_advancement if @tournament.tournament_type.include? "Modified 16 Man Double Elimination"
diff --git a/app/services/tournament_services/generate_tournament_matches.rb b/app/services/tournament_services/generate_tournament_matches.rb
index 85b17c8..a5cc291 100644
--- a/app/services/tournament_services/generate_tournament_matches.rb
+++ b/app/services/tournament_services/generate_tournament_matches.rb
@@ -4,11 +4,8 @@ class GenerateTournamentMatches
end
def generate
- if Rails.env.production?
- self.delay(:job_owner_id => @tournament.id, :job_owner_type => "Generate matches for all weights").generate_raw
- else
- self.generate_raw
- end
+ # Use perform_later which will execute based on centralized adapter config
+ GenerateTournamentMatchesJob.perform_later(@tournament)
end
def generate_raw
diff --git a/app/services/tournament_services/tournament_backup_service.rb b/app/services/tournament_services/tournament_backup_service.rb
index 3c1ca13..88b7f62 100644
--- a/app/services/tournament_services/tournament_backup_service.rb
+++ b/app/services/tournament_services/tournament_backup_service.rb
@@ -5,11 +5,8 @@ class TournamentBackupService
end
def create_backup
- if Rails.env.production?
- self.delay(:job_owner_id => @tournament.id, :job_owner_type => "Create a backup").create_backup_raw
- else
- self.create_backup_raw
- end
+ # Use perform_later which will execute based on centralized adapter config
+ TournamentBackupJob.perform_later(@tournament, @reason)
end
def create_backup_raw
diff --git a/app/services/tournament_services/wrestlingdev_importer.rb b/app/services/tournament_services/wrestlingdev_importer.rb
index ded9a4f..0a1778d 100644
--- a/app/services/tournament_services/wrestlingdev_importer.rb
+++ b/app/services/tournament_services/wrestlingdev_importer.rb
@@ -1,19 +1,24 @@
class WrestlingdevImporter
-
##### Note, the json contains id's for each row in the tables as well as its associations
##### this ignores those ids and uses this tournament id and then looks up associations based on name
##### and this tournament id
- def initialize(tournament, backup)
+ attr_accessor :import_data
+
+ # Support both parameter styles for backward compatibility
+ # Old: initialize(tournament, backup)
+ # New: initialize(tournament) with import_data setter
+ def initialize(tournament, backup = nil)
@tournament = tournament
- @import_data = JSON.parse(Base64.decode64(backup.backup_data))
+
+ # Handle the old style where backup was passed directly
+ if backup.present?
+ @import_data = JSON.parse(Base64.decode64(backup.backup_data)) rescue nil
+ end
end
def import
- if Rails.env.production?
- self.delay(job_owner_id: @tournament.id, job_owner_type: "Importing a backup").import_raw
- else
- import_raw
- end
+ # Use perform_later which will execute based on centralized adapter config
+ WrestlingdevImportJob.perform_later(@tournament, @import_data)
end
def import_raw
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
deleted file mode 100644
index 9c27eb7..0000000
--- a/app/views/devise/confirmations/new.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Resend confirmation instructions
-
-<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= devise_error_messages! %>
-
- <%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
-
- <%= f.submit "Resend confirmation instructions" %>
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
deleted file mode 100644
index 36670f9..0000000
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-Welcome <%= @email %>!
-
-You can confirm your account email through the link below:
-
-<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
deleted file mode 100644
index 93de6d0..0000000
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password. You can do this through the link below.
-
-<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
deleted file mode 100644
index f59615f..0000000
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-Hello <%= @resource.email %>!
-
-Your account has been locked due to an excessive number of unsuccessful sign in attempts.
-
-Click the link below to unlock your account:
-
-<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
deleted file mode 100644
index a982bc3..0000000
--- a/app/views/devise/passwords/edit.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-Change your password
-
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= devise_error_messages! %>
- <%= f.hidden_field :reset_password_token %>
-
- <%= f.label :password, "New password" %>
- <%= f.password_field :password, :autofocus => true %>
-
- <%= f.label :password_confirmation, "Confirm new password" %>
- <%= f.password_field :password_confirmation %>
-
- <%= f.submit "Change my password", :class=>"btn btn-success"%>
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
deleted file mode 100644
index 497a199..0000000
--- a/app/views/devise/passwords/new.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Forgot your password?
-
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= devise_error_messages! %>
-
- <%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
-
- <%= f.submit "Send me reset password instructions",:class=>"btn btn-success" %>
-<% end %>
-
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
deleted file mode 100644
index 62b0c16..0000000
--- a/app/views/devise/registrations/edit.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-Edit <%= resource_name.to_s.humanize %>
-
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= devise_error_messages! %>
-
- <%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
-
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
- Currently waiting confirmation for: <%= resource.unconfirmed_email %>
- <% end %>
-
- <%= f.label :password %> (leave blank if you don't want to change it)
- <%= f.password_field :password, :autocomplete => "off" %>
-
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
-
- <%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password %>
-
- <%= f.submit "Update",:class=>"btn btn-success" %>
-<% end %>
-
-Cancel my account
-
-Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete, :class=>"btn btn-danger" %>
-
-
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
deleted file mode 100644
index 67e15e9..0000000
--- a/app/views/devise/registrations/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-Sign up
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
- <%= devise_error_messages! %>
-
- <%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
-
- <%= f.label :password %>
- <%= f.password_field :password %>
-
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
-
- <%= f.submit "Sign up" %>
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
deleted file mode 100644
index 87df9d2..0000000
--- a/app/views/devise/sessions/new.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
- <%= f.label :email ,:class=>"sr-only"%>
- <%= f.email_field :email, :autofocus => true,:class=>"form-control",:placeholder=>"Email Address" %>
-
- <%= f.label :password,:class=>"sr-only" %>
- <%= f.password_field :password,:class=>"form-control",:placeholder=>"Password" %>
-
- <% if devise_mapping.rememberable? -%>
- <%= f.check_box :remember_me %> <%= f.label :remember_me %>
- <% end -%>
-
- <%= f.submit "Sign in" ,:class=>"btn btn-lg btn-primary btn-block" %>
-<% end %>
-
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
deleted file mode 100644
index d84bdde..0000000
--- a/app/views/devise/shared/_links.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
- <%= link_to "Sign up", new_registration_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
- <%= link_to "Forgot your password?", new_password_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
- <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
- <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
- <%- resource_class.omniauth_providers.each do |provider| %>
- <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%>
-<% end -%>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
deleted file mode 100644
index 020787f..0000000
--- a/app/views/devise/unlocks/new.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Resend unlock instructions
-
-<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= devise_error_messages! %>
-
- <%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
-
- <%= f.submit "Resend unlock instructions" %>
-<% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 9ccd9f0..403947a 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -19,13 +19,13 @@
<%= current_user.email %>
<% else %>
- <%= link_to "Log In" , new_user_session_path %>
+ <%= link_to "Log In", login_path %>
<% end %>
diff --git a/app/views/password_resets/edit.html.erb b/app/views/password_resets/edit.html.erb
new file mode 100644
index 0000000..215c3a4
--- /dev/null
+++ b/app/views/password_resets/edit.html.erb
@@ -0,0 +1,34 @@
+Reset password
+
+
+
+ <%= form_with(model: @user, url: password_reset_path(params[:id]), local: true) do |f| %>
+ <% if @user.errors.any? %>
+
+
+ The form contains <%= pluralize(@user.errors.count, "error") %>.
+
+
+ <% @user.errors.full_messages.each do |msg| %>
+ - <%= msg %>
+ <% end %>
+
+
+ <% end %>
+
+ <%= hidden_field_tag :email, @user.email %>
+
+
+ <%= f.label :password %>
+ <%= f.password_field :password, class: 'form-control' %>
+
+
+
+ <%= f.label :password_confirmation, "Confirmation" %>
+ <%= f.password_field :password_confirmation, class: 'form-control' %>
+
+
+ <%= f.submit "Update password", class: "btn btn-primary" %>
+ <% end %>
+
+
Forgot password
+
+
+
+ <%= form_with(url: password_resets_path, scope: :password_reset, local: true) do |f| %>
+
+ <%= f.label :email %>
+ <%= f.email_field :email, class: 'form-control' %>
+
+
+ <%= f.submit "Submit", class: "btn btn-primary" %>
+ <% end %>
+
+
Log in
+
+
+
+ <%= form_with(url: login_path, scope: :session, local: true) do |f| %>
+
+ <%= f.label :email %>
+ <%= f.email_field :email, class: 'form-control' %>
+
+
+
+ <%= f.label :password %>
+ <%= f.password_field :password, class: 'form-control' %>
+
+
+ <%= f.submit "Log in", class: "btn btn-primary" %>
+ <% end %>
+
+
New user? <%= link_to "Sign up now!", signup_path %>
+
+
Info
+
+<% if (can? :manage, @tournament) && @tournament.curently_generating_matches == 1 %>
+
+
Match Generation In Progress
+
Tournament bracket generation is currently running. Please refresh the page to check progress.
+
Address:
<%= @tournament.address %>
@@ -118,34 +126,4 @@
<% end %>
-<% if can? :manage, @tournament %>
-
-
Background Jobs
-This is a list of queued or running background jobs. Match generation, bracket advancement, team score calculation, etc.
-
-
-
- | Name of Job |
- Job Status |
-
-
-
-
- <% @tournament.deferred_jobs.each do |job| %>
-
- | <%= job.job_owner_type %> |
-
- <% if job.locked_at %>
- Running
- <% elsif job.last_error %>
- Error
- <% elsif job.attempts == 0 and !job.locked_at %>
- Pending
- <% end %>
- |
-
- <% end %>
-
-
-<% end %>
diff --git a/app/views/user_mailer/password_reset.html.erb b/app/views/user_mailer/password_reset.html.erb
new file mode 100644
index 0000000..d2bad6d
--- /dev/null
+++ b/app/views/user_mailer/password_reset.html.erb
@@ -0,0 +1,12 @@
+Password reset
+
+To reset your password click the link below:
+
+<%= link_to "Reset password", edit_password_reset_url(@user.reset_token, email: @user.email) %>
+
+This link will expire in two hours.
+
+
+If you did not request your password to be reset, please ignore this email and
+your password will stay as it is.
+
\ No newline at end of file
diff --git a/app/views/user_mailer/password_reset.text.erb b/app/views/user_mailer/password_reset.text.erb
new file mode 100644
index 0000000..068470c
--- /dev/null
+++ b/app/views/user_mailer/password_reset.text.erb
@@ -0,0 +1,8 @@
+To reset your password click the link below:
+
+<%= edit_password_reset_url(@user.reset_token, email: @user.email) %>
+
+This link will expire in two hours.
+
+If you did not request your password to be reset, please ignore this email and
+your password will stay as it is.
\ No newline at end of file
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 0000000..289fb8d
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,38 @@
+Edit profile
+
+
+
+ <%= form_with(model: @user, local: true) do |f| %>
+ <% if @user.errors.any? %>
+
+
+ The form contains <%= pluralize(@user.errors.count, "error") %>.
+
+
+ <% @user.errors.full_messages.each do |msg| %>
+ - <%= msg %>
+ <% end %>
+
+
+ <% end %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, class: 'form-control' %>
+
+
+
+ <%= f.label :password %>
+ <%= f.password_field :password, class: 'form-control' %>
+ Leave blank if you don't want to change it
+
+
+
+ <%= f.label :password_confirmation, "Confirmation" %>
+ <%= f.password_field :password_confirmation, class: 'form-control' %>
+
+
+ <%= f.submit "Save changes", class: "btn btn-primary" %>
+ <% end %>
+
+
Sign up
+
+
+
+ <%= form_with(model: @user, url: signup_path, local: true) do |f| %>
+ <% if @user.errors.any? %>
+
+
+ The form contains <%= pluralize(@user.errors.count, "error") %>.
+
+
+ <% @user.errors.full_messages.each do |msg| %>
+ - <%= msg %>
+ <% end %>
+
+
+ <% end %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, class: 'form-control' %>
+
+
+
+ <%= f.label :password %>
+ <%= f.password_field :password, class: 'form-control' %>
+
+
+
+ <%= f.label :password_confirmation, "Confirmation" %>
+ <%= f.password_field :password_confirmation, class: 'form-control' %>
+
+
+ <%= f.submit "Create account", class: "btn btn-primary" %>
+ <% end %>
+
+
Already have an account? <%= link_to "Log in", login_path %>
+
+
The server cannot process the request due to a client error. Please check the request and try again. If you’re the application owner check the logs for more information.
+
+
+
+
+
+
diff --git a/public/404.html b/public/404.html
index a0daa0c..c0670bc 100644
--- a/public/404.html
+++ b/public/404.html
@@ -1,58 +1,114 @@
-
-
-
- The page you were looking for doesn't exist (404)
-
-
+ The page you were looking for doesn’t exist (404 Not found)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The page you were looking for doesn’t exist. You may have mistyped the address or the page may have moved. If you’re the application owner check the logs for more information.
+
+
+
+
-
-
-
-
The page you were looking for doesn't exist.
-
You may have mistyped the address or the page may have moved.
-
If you are the application owner check the logs for more information.
-