Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 barbie-bot
|
3019f0fbec | ||
 cryptogopher
|
33004f62bd | ||
|
cryptogopher
|
687e6fcdff |
+1
-5
@@ -15,9 +15,6 @@
|
||||
/config/master.key
|
||||
/config/puma.rb
|
||||
|
||||
# Ignore test database.
|
||||
/db/test.sqlite3
|
||||
|
||||
# Ignore all logfiles and tempfiles.
|
||||
/log/*
|
||||
/tmp/*
|
||||
@@ -33,7 +30,7 @@
|
||||
|
||||
/tmp/restart.txt
|
||||
|
||||
# Ignore user files.
|
||||
# Ignore user files
|
||||
/.bash_history
|
||||
/.byebug_history
|
||||
/.config
|
||||
@@ -41,7 +38,6 @@
|
||||
/.lesshst
|
||||
/.local
|
||||
/.mysql_history
|
||||
/.sqlite_history
|
||||
/.ssh
|
||||
/.vim
|
||||
/.viminfo
|
||||
|
||||
@@ -22,55 +22,13 @@ whenever a change is considered, to avoid regressions.
|
||||
and scale approximately half of that - 9,
|
||||
* double precision floating point guarantees 15 digits of precision, which
|
||||
is more than enough for all expected use cases,
|
||||
* if a decimal string with at most 15 significant digits is converted to
|
||||
the IEEE 754 double-precision format, giving a normal number, and then
|
||||
converted back to a decimal string with the same number of digits, the
|
||||
final result should match the original string,
|
||||
* if an IEEE 754 double-precision number is converted to a decimal
|
||||
string with at least 17 significant digits, and then converted back to
|
||||
double-precision representation, the final result must match the
|
||||
original number,
|
||||
* single precision floating point only guarntees 6 digits of precision,
|
||||
which is estimated to be too low for some use cases (e.g. storing
|
||||
latitude/longitude with a resolution grater than 100m),
|
||||
latitude/longitude with a resolution grater than 100m)
|
||||
* double precision floating point (IEEE 754) is a standard that ensures
|
||||
compatibility with majority of database engines,
|
||||
compatibility with all database engines,
|
||||
* the same data format is used internally by Ruby as a `Float`; it
|
||||
guarantees no conversions between storage and computation,
|
||||
* as a standard with hardware implementations ensures both: computing
|
||||
efficiency and hardware/3rd party library compatibility as opposed to Ruby
|
||||
custom `BigDecimal` type,
|
||||
* at present, only normalized numbers are used and considered sufficient, in
|
||||
order to avoid potential issues with the cross-platform compatibility of
|
||||
subnormal (denormal) numbers,
|
||||
* in the future, the IEEE 754 decimal64 data type may be considered once it is
|
||||
supported by database engines.
|
||||
|
||||
### Database layer vs application layer data model constraints
|
||||
|
||||
* database constraints are the final guard against data integrity corruption,
|
||||
* they should safeguard against data referential integrity loss under _all_
|
||||
data (not schema) manipulation scenarios, including application level
|
||||
logic errors and direct data manipulation (e.g. through `dbconsole`),
|
||||
* application constraints can be as restrictive as database constraints or more,
|
||||
but not less, as it doesn't serve any use case,
|
||||
* proper application level constraints should prevent unhandled database
|
||||
exception occurences, e.g `ActiveRecord::InvalidForeignKey` for operations
|
||||
performed through Models (i.e. not `#delete_all` etc.)
|
||||
|
||||
### User interface
|
||||
* values provided by user have to be exactly preserved, avoiding any precision
|
||||
loss due to e.g. type casting
|
||||
* when it's not possible to store value without information loss, feedback has to
|
||||
be given at the time of entering value
|
||||
* values can be received using either:
|
||||
* `input[number]` - validates: number format, value against `[min]` and
|
||||
`[max]` attributes; cannot validate precision (no `[pattern]` support);
|
||||
or
|
||||
* `input[text]` - can validate number format and precision with
|
||||
`[pattern]`; cannot validate range (no `[min]`/`[max]` support),
|
||||
* none of the above prevents misinterpretation of values between 0 and
|
||||
Float::MIN as 0.0 - this has to be checked manually,
|
||||
* assuming that user input with _precision > DIG_ is as rare as in
|
||||
the range _(0, MIN)_, the decision is to choose input which requires
|
||||
the least/simplest additional code.
|
||||
custom `BigDecimal` type
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
source "https://rubygems.org"
|
||||
|
||||
# The requirement for the Ruby version comes from Rails.
|
||||
gem "rails", "~> 8.1.4"
|
||||
# The requirement for the Ruby version comes from Rails
|
||||
gem "rails", "~> 7.2.3"
|
||||
gem "sprockets-rails"
|
||||
gem "puma", "~> 6.0"
|
||||
gem "sassc-rails"
|
||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||
gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
|
||||
|
||||
# TODO: select db gems automatically?
|
||||
# TODO: select db gems automatically
|
||||
# database_config = ERB.new(File.read("config/database.yml")).result
|
||||
# YAML.load(database_config, aliases: true).values.map { |env| env["adapter"] }.uniq
|
||||
group :mysql, optional: true do
|
||||
@@ -21,7 +21,7 @@ group :sqlite, optional: true do
|
||||
gem "sqlite3", "~> 2.7"
|
||||
end
|
||||
|
||||
gem "devise", "~> 5.0.4"
|
||||
gem "devise"
|
||||
|
||||
gem "importmap-rails"
|
||||
gem "turbo-rails", "~> 2.0"
|
||||
@@ -42,8 +42,11 @@ group :test do
|
||||
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
|
||||
gem "capybara"
|
||||
gem "selenium-webdriver"
|
||||
end
|
||||
|
||||
# TODO: remove after upgrade to next version containing PR:
|
||||
# https://github.com/ruby-i18n/i18n/pull/755
|
||||
gem "i18n", git: "https://github.com/ruby-i18n/i18n", branch: "delegate-missing-interpolation-handler"
|
||||
# Remove minitest version restriction after error fixed:
|
||||
# railties-7.2.3/lib/rails/test_unit/line_filtering.rb:7:in `run':
|
||||
# wrong number of arguments (given 3, expected 1..2) (ArgumentError)
|
||||
# from /var/www/.gem/ruby/3.3.0/gems/minitest-6.0.2/lib/minitest.rb:473:in
|
||||
# `block (2 levels) in run_suite'
|
||||
gem "minitest", "< 6"
|
||||
end
|
||||
|
||||
+144
-150
@@ -1,93 +1,85 @@
|
||||
GIT
|
||||
remote: https://github.com/ruby-i18n/i18n
|
||||
revision: 8850d979a3a32453123ed744b943ead8751ba73b
|
||||
branch: delegate-missing-interpolation-handler
|
||||
specs:
|
||||
i18n (1.15.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
action_text-trix (2.1.19)
|
||||
railties
|
||||
actioncable (8.1.4)
|
||||
actionpack (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
actioncable (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
zeitwerk (~> 2.6)
|
||||
actionmailbox (8.1.4)
|
||||
actionpack (= 8.1.4)
|
||||
activejob (= 8.1.4)
|
||||
activerecord (= 8.1.4)
|
||||
activestorage (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
actionmailbox (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activestorage (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
mail (>= 2.8.0)
|
||||
actionmailer (8.1.4)
|
||||
actionpack (= 8.1.4)
|
||||
actionview (= 8.1.4)
|
||||
activejob (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
actionmailer (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
actionview (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
mail (>= 2.8.0)
|
||||
rails-dom-testing (~> 2.2)
|
||||
actionpack (8.1.4)
|
||||
actionview (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
actionpack (7.2.3)
|
||||
actionview (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
cgi
|
||||
nokogiri (>= 1.8.5)
|
||||
rack (>= 2.2.4)
|
||||
racc
|
||||
rack (>= 2.2.4, < 3.3)
|
||||
rack-session (>= 1.0.1)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.2)
|
||||
rails-html-sanitizer (~> 1.6)
|
||||
useragent (~> 0.16)
|
||||
actiontext (8.1.4)
|
||||
action_text-trix (~> 2.1.15)
|
||||
actionpack (= 8.1.4)
|
||||
activerecord (= 8.1.4)
|
||||
activestorage (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
actiontext (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activestorage (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
actionview (7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
builder (~> 3.1)
|
||||
cgi
|
||||
erubi (~> 1.11)
|
||||
rails-dom-testing (~> 2.2)
|
||||
rails-html-sanitizer (~> 1.6)
|
||||
activejob (8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
activejob (7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
activerecord (8.1.4)
|
||||
activemodel (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
activemodel (7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
activerecord (7.2.3)
|
||||
activemodel (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
timeout (>= 0.4.0)
|
||||
activestorage (8.1.4)
|
||||
actionpack (= 8.1.4)
|
||||
activejob (= 8.1.4)
|
||||
activerecord (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
activestorage (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
marcel (~> 1.0)
|
||||
activesupport (8.1.4)
|
||||
activesupport (7.2.3)
|
||||
base64
|
||||
benchmark (>= 0.3)
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.3.1)
|
||||
connection_pool (>= 2.2.5)
|
||||
drb
|
||||
i18n (>= 1.6, < 2)
|
||||
json
|
||||
logger (>= 1.4.2)
|
||||
minitest (>= 5.1)
|
||||
securerandom (>= 0.3)
|
||||
tzinfo (~> 2.0, >= 2.0.5)
|
||||
uri (>= 0.13.1)
|
||||
addressable (2.9.0)
|
||||
addressable (2.8.8)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
base64 (0.3.0)
|
||||
bcrypt (3.1.22)
|
||||
bigdecimal (4.1.3)
|
||||
bcrypt (3.1.21)
|
||||
benchmark (0.5.0)
|
||||
bigdecimal (4.0.1)
|
||||
bindex (0.8.1)
|
||||
builder (3.3.0)
|
||||
byebug (13.0.0)
|
||||
@@ -101,155 +93,155 @@ GEM
|
||||
rack-test (>= 0.6.3)
|
||||
regexp_parser (>= 1.5, < 3.0)
|
||||
xpath (~> 3.2)
|
||||
concurrent-ruby (1.3.8)
|
||||
cgi (0.5.1)
|
||||
concurrent-ruby (1.3.6)
|
||||
connection_pool (3.0.2)
|
||||
crass (1.0.7)
|
||||
crass (1.0.6)
|
||||
date (3.5.1)
|
||||
devise (5.0.4)
|
||||
devise (5.0.2)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 7.0)
|
||||
responders
|
||||
warden (~> 1.2.3)
|
||||
drb (2.2.3)
|
||||
erb (6.0.7)
|
||||
erb (6.0.2)
|
||||
erubi (1.13.1)
|
||||
ffi (1.17.4-aarch64-linux-gnu)
|
||||
ffi (1.17.4-aarch64-linux-musl)
|
||||
ffi (1.17.4-arm-linux-gnu)
|
||||
ffi (1.17.4-arm-linux-musl)
|
||||
ffi (1.17.4-arm64-darwin)
|
||||
ffi (1.17.4-x86_64-darwin)
|
||||
ffi (1.17.4-x86_64-linux-gnu)
|
||||
ffi (1.17.4-x86_64-linux-musl)
|
||||
globalid (1.4.0)
|
||||
ffi (1.17.3-aarch64-linux-gnu)
|
||||
ffi (1.17.3-aarch64-linux-musl)
|
||||
ffi (1.17.3-arm-linux-gnu)
|
||||
ffi (1.17.3-arm-linux-musl)
|
||||
ffi (1.17.3-arm64-darwin)
|
||||
ffi (1.17.3-x86_64-darwin)
|
||||
ffi (1.17.3-x86_64-linux-gnu)
|
||||
ffi (1.17.3-x86_64-linux-musl)
|
||||
globalid (1.3.0)
|
||||
activesupport (>= 6.1)
|
||||
i18n (1.14.8)
|
||||
concurrent-ruby (~> 1.0)
|
||||
importmap-rails (2.2.3)
|
||||
actionpack (>= 6.0.0)
|
||||
activesupport (>= 6.0.0)
|
||||
railties (>= 6.0.0)
|
||||
io-console (0.9.4)
|
||||
irb (1.18.0)
|
||||
io-console (0.8.2)
|
||||
irb (1.17.0)
|
||||
pp (>= 0.6.0)
|
||||
prism (>= 1.3.0)
|
||||
rdoc (>= 4.0.0)
|
||||
reline (>= 0.4.2)
|
||||
json (3.0.2)
|
||||
logger (1.7.0)
|
||||
loofah (2.25.2)
|
||||
loofah (2.25.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
mail (2.9.1)
|
||||
mail (2.9.0)
|
||||
logger
|
||||
mini_mime (>= 0.1.1)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
marcel (1.2.1)
|
||||
marcel (1.1.0)
|
||||
matrix (0.4.3)
|
||||
mini_mime (1.1.5)
|
||||
minitest (6.0.6)
|
||||
drb (~> 2.0)
|
||||
prism (~> 1.5)
|
||||
minitest (5.27.0)
|
||||
mysql2 (0.5.7)
|
||||
bigdecimal
|
||||
net-imap (0.6.7)
|
||||
net-imap (0.6.3)
|
||||
date
|
||||
net-protocol
|
||||
net-pop (0.1.2)
|
||||
net-protocol
|
||||
net-protocol (0.4.0)
|
||||
net-protocol (0.2.2)
|
||||
timeout
|
||||
net-smtp (0.5.2)
|
||||
net-smtp (0.5.1)
|
||||
net-protocol
|
||||
nio4r (2.7.5)
|
||||
nokogiri (1.19.4-aarch64-linux-gnu)
|
||||
nokogiri (1.19.1-aarch64-linux-gnu)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.19.4-aarch64-linux-musl)
|
||||
nokogiri (1.19.1-aarch64-linux-musl)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.19.4-arm-linux-gnu)
|
||||
nokogiri (1.19.1-arm-linux-gnu)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.19.4-arm-linux-musl)
|
||||
nokogiri (1.19.1-arm-linux-musl)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.19.4-arm64-darwin)
|
||||
nokogiri (1.19.1-arm64-darwin)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.19.4-x86_64-darwin)
|
||||
nokogiri (1.19.1-x86_64-darwin)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.19.4-x86_64-linux-gnu)
|
||||
nokogiri (1.19.1-x86_64-linux-gnu)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.19.4-x86_64-linux-musl)
|
||||
nokogiri (1.19.1-x86_64-linux-musl)
|
||||
racc (~> 1.4)
|
||||
orm_adapter (0.5.0)
|
||||
pg (1.7.0)
|
||||
pg (1.7.0-aarch64-linux)
|
||||
pg (1.7.0-aarch64-linux-musl)
|
||||
pg (1.7.0-arm64-darwin)
|
||||
pg (1.7.0-x86_64-darwin)
|
||||
pg (1.7.0-x86_64-linux)
|
||||
pg (1.7.0-x86_64-linux-musl)
|
||||
pp (0.6.4)
|
||||
pg (1.6.3)
|
||||
pg (1.6.3-aarch64-linux)
|
||||
pg (1.6.3-aarch64-linux-musl)
|
||||
pg (1.6.3-arm64-darwin)
|
||||
pg (1.6.3-x86_64-darwin)
|
||||
pg (1.6.3-x86_64-linux)
|
||||
pg (1.6.3-x86_64-linux-musl)
|
||||
pp (0.6.3)
|
||||
prettyprint
|
||||
prettyprint (0.2.0)
|
||||
prism (1.9.0)
|
||||
public_suffix (7.0.5)
|
||||
psych (5.3.1)
|
||||
date
|
||||
stringio
|
||||
public_suffix (7.0.2)
|
||||
puma (6.6.1)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.8.1)
|
||||
rack (3.2.7)
|
||||
rack-session (2.1.2)
|
||||
rack (3.2.5)
|
||||
rack-session (2.1.1)
|
||||
base64 (>= 0.1.0)
|
||||
rack (>= 3.0.0)
|
||||
rack-test (2.2.0)
|
||||
rack (>= 1.3)
|
||||
rackup (2.3.1)
|
||||
rack (>= 3)
|
||||
rails (8.1.4)
|
||||
actioncable (= 8.1.4)
|
||||
actionmailbox (= 8.1.4)
|
||||
actionmailer (= 8.1.4)
|
||||
actionpack (= 8.1.4)
|
||||
actiontext (= 8.1.4)
|
||||
actionview (= 8.1.4)
|
||||
activejob (= 8.1.4)
|
||||
activemodel (= 8.1.4)
|
||||
activerecord (= 8.1.4)
|
||||
activestorage (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
rails (7.2.3)
|
||||
actioncable (= 7.2.3)
|
||||
actionmailbox (= 7.2.3)
|
||||
actionmailer (= 7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
actiontext (= 7.2.3)
|
||||
actionview (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activemodel (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activestorage (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 8.1.4)
|
||||
railties (= 7.2.3)
|
||||
rails-dom-testing (2.3.0)
|
||||
activesupport (>= 5.0.0)
|
||||
minitest
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.7.1)
|
||||
loofah (~> 2.25, >= 2.25.2)
|
||||
rails-html-sanitizer (1.7.0)
|
||||
loofah (~> 2.25)
|
||||
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
|
||||
railties (8.1.4)
|
||||
actionpack (= 8.1.4)
|
||||
activesupport (= 8.1.4)
|
||||
railties (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
cgi
|
||||
irb (~> 1.13)
|
||||
rackup (>= 1.0.0)
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0, >= 1.2.2)
|
||||
tsort (>= 0.2)
|
||||
zeitwerk (~> 2.6)
|
||||
rake (13.4.2)
|
||||
rbs (4.2.0)
|
||||
logger
|
||||
prism (>= 1.6.0)
|
||||
tsort
|
||||
rdoc (8.1.0)
|
||||
rake (13.3.1)
|
||||
rdoc (7.2.0)
|
||||
erb
|
||||
prism (>= 1.6.0)
|
||||
rbs (>= 4.0.0)
|
||||
psych (>= 4.0.0)
|
||||
tsort
|
||||
regexp_parser (2.13.1)
|
||||
reline (0.7.0)
|
||||
regexp_parser (2.11.3)
|
||||
reline (0.6.3)
|
||||
io-console (~> 0.5)
|
||||
responders (3.2.1)
|
||||
responders (3.2.0)
|
||||
actionpack (>= 7.0)
|
||||
railties (>= 7.0)
|
||||
rubyzip (3.7.0)
|
||||
rexml (3.4.4)
|
||||
rubyzip (3.2.2)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
sassc-rails (2.1.2)
|
||||
@@ -259,52 +251,54 @@ GEM
|
||||
sprockets-rails
|
||||
tilt
|
||||
securerandom (0.4.1)
|
||||
selenium-webdriver (4.50.0)
|
||||
selenium-webdriver (4.41.0)
|
||||
base64 (~> 0.2)
|
||||
logger (~> 1.4)
|
||||
rexml (~> 3.2, >= 3.2.5)
|
||||
rubyzip (>= 1.2.2, < 4.0)
|
||||
websocket (~> 1.0)
|
||||
sprockets (4.4.1)
|
||||
concurrent-ruby (~> 1.1)
|
||||
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)
|
||||
sqlite3 (2.9.6-aarch64-linux-gnu)
|
||||
sqlite3 (2.9.6-aarch64-linux-musl)
|
||||
sqlite3 (2.9.6-arm-linux-gnu)
|
||||
sqlite3 (2.9.6-arm-linux-musl)
|
||||
sqlite3 (2.9.6-arm64-darwin)
|
||||
sqlite3 (2.9.6-x86_64-darwin)
|
||||
sqlite3 (2.9.6-x86_64-linux-gnu)
|
||||
sqlite3 (2.9.6-x86_64-linux-musl)
|
||||
sqlite3 (2.9.0-aarch64-linux-gnu)
|
||||
sqlite3 (2.9.0-aarch64-linux-musl)
|
||||
sqlite3 (2.9.0-arm-linux-gnu)
|
||||
sqlite3 (2.9.0-arm-linux-musl)
|
||||
sqlite3 (2.9.0-arm64-darwin)
|
||||
sqlite3 (2.9.0-x86_64-darwin)
|
||||
sqlite3 (2.9.0-x86_64-linux-gnu)
|
||||
sqlite3 (2.9.0-x86_64-linux-musl)
|
||||
stringio (3.2.0)
|
||||
thor (1.5.0)
|
||||
tilt (2.9.0)
|
||||
timeout (0.6.1)
|
||||
tilt (2.7.0)
|
||||
timeout (0.6.0)
|
||||
tsort (0.2.0)
|
||||
turbo-rails (2.0.23)
|
||||
actionpack (>= 7.1.0)
|
||||
railties (>= 7.1.0)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uri (1.1.1)
|
||||
useragent (0.16.11)
|
||||
warden (1.2.9)
|
||||
rack (>= 2.0.9)
|
||||
web-console (4.3.0)
|
||||
actionview (>= 8.0.0)
|
||||
web-console (4.2.1)
|
||||
actionview (>= 6.0.0)
|
||||
activemodel (>= 6.0.0)
|
||||
bindex (>= 0.4.0)
|
||||
railties (>= 8.0.0)
|
||||
railties (>= 6.0.0)
|
||||
websocket (1.2.11)
|
||||
websocket-driver (0.8.2)
|
||||
websocket-driver (0.8.0)
|
||||
base64
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.5)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
zeitwerk (2.8.3)
|
||||
zeitwerk (2.7.5)
|
||||
|
||||
PLATFORMS
|
||||
aarch64-linux-gnu
|
||||
@@ -319,13 +313,13 @@ PLATFORMS
|
||||
DEPENDENCIES
|
||||
byebug
|
||||
capybara
|
||||
devise (~> 5.0.4)
|
||||
i18n!
|
||||
devise
|
||||
importmap-rails
|
||||
minitest (< 6)
|
||||
mysql2 (~> 0.5)
|
||||
pg (~> 1.5)
|
||||
puma (~> 6.0)
|
||||
rails (~> 8.1.4)
|
||||
rails (~> 7.2.3)
|
||||
sassc-rails
|
||||
selenium-webdriver
|
||||
sprockets-rails
|
||||
|
||||
@@ -16,10 +16,14 @@ environment, see the _Contributing_ section below.
|
||||
* Server side:
|
||||
* Ruby interpreter, depending on the version of Rails used (see _Gemfile_),
|
||||
* https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#ruby-versions
|
||||
* database (e.g. SQLite, MySQL >= 8.0) supporting:
|
||||
* database (e.g. MySQL >= 8.0) supporting:
|
||||
* recursive Common Table Expressions (CTE) for SELECT/UPDATE/DELETE,
|
||||
* MariaDB does not support CTE for UPDATE/DELETE
|
||||
(https://jira.mariadb.org/browse/MDEV-18511)
|
||||
* decimal datatype with precision of at least 30,
|
||||
* SQLite3 _flexible typing_ decimal will work, but precision
|
||||
will be limited to 16, making it practical mostly for testing
|
||||
purposes
|
||||
* for testing: browser as specified in _Client side_ requirements
|
||||
* Client side:
|
||||
* browser (e.g. Firefox >= 121) supporting:
|
||||
@@ -85,10 +89,14 @@ Running
|
||||
|
||||
### Standalone Rails server + Apache proxy
|
||||
|
||||
Copy and customize Puma config template if required:
|
||||
Customize Puma config template:
|
||||
|
||||
cp -a config/puma.rb.dist config/puma.rb
|
||||
|
||||
and specify server IP/port, either with `port` or `bind`, e.g.:
|
||||
|
||||
bind 'tcp://0.0.0.0:3000'
|
||||
|
||||
#### (option 1) Start server manually
|
||||
|
||||
bundle exec rails s -e production
|
||||
@@ -115,26 +123,9 @@ Contributing
|
||||
|
||||
### Gems
|
||||
|
||||
Install development and testing gems, including at least MySQL and SQLite
|
||||
database adapters:
|
||||
Apart from database adapter, install development and testing gems:
|
||||
|
||||
bundle config --local with development test mysql sqlite
|
||||
|
||||
#### Using gems from local git repos
|
||||
|
||||
When working on gem PRs, it may be useful to work with proposed changes locally
|
||||
until PRs get accepted upstream. To add gem hosted in local git repository:
|
||||
|
||||
bundle config set local.capybara /var/www/tmp/capybara
|
||||
|
||||
Add gem to `Gemfile`:
|
||||
|
||||
gem "capybara", git: "https://github.com/teamcapybara/capybara", branch: "branch-name"
|
||||
|
||||
and install:
|
||||
|
||||
bundle install
|
||||
bundle show capybara
|
||||
bundle config --local with mysql development test
|
||||
|
||||
### Configuration
|
||||
|
||||
@@ -147,29 +138,20 @@ assets.
|
||||
|
||||
### Database
|
||||
|
||||
Grant database user privileges for development and test environments. Example
|
||||
below shows how to grant privileges to all databases which names start with
|
||||
`fixinme-` on MySQL:
|
||||
Grant database user privileges for development and test environments,
|
||||
possibly with different Ruby versions:
|
||||
|
||||
> mysql -p
|
||||
mysql> create user `fixinme-dev`@localhost identified by '<some password>';
|
||||
mysql> grant all privileges on `fixinme-%`.* to `fixinme-dev`@localhost;
|
||||
mysql> flush privileges;
|
||||
|
||||
Dumping development data before database reset:
|
||||
|
||||
mysqldump -h <address> -u <user> -p --no-create-info --no-tablespaces --complete-insert <database> > tmp/data.sql
|
||||
|
||||
### Development environment
|
||||
|
||||
Starting application server in development environment:
|
||||
|
||||
bundle exec rails s -e development
|
||||
|
||||
Accessing database console when more than one test db is present:
|
||||
|
||||
bundle exec rails dbconsole -e test --db sqlite3
|
||||
|
||||
For running rake tasks, prepend command with environment:
|
||||
|
||||
RAILS_ENV=development bundle exec rails ...
|
||||
@@ -182,22 +164,14 @@ Tests need to be run from within toplevel application directory:
|
||||
|
||||
bundle exec rails test:system
|
||||
|
||||
* system test(s) with seed or test name specified:
|
||||
* system test(s) with seed/test name specified:
|
||||
|
||||
bundle exec rails test:system --include test_add_unit --seed 64690
|
||||
bundle exec rails test:system --seed 64690 --name test_add_unit
|
||||
|
||||
* all tests from one file, optionally with seed:
|
||||
* all tests from one file, with optional seed:
|
||||
|
||||
bundle exec rails test test/system/users_test.rb --seed 1234
|
||||
|
||||
* system tests for selected database configuration (if multiple present):
|
||||
|
||||
bundle exec rails test:system --include /^test_sqlite3_/
|
||||
|
||||
* single system test for all database configurations (if multiple present):
|
||||
|
||||
bundle exec rails test:system --include /^test_\\w+_add_unit$/
|
||||
|
||||
### Icons
|
||||
|
||||
Pictogrammers Material Design Icons: https://pictogrammers.com/library/mdi/
|
||||
|
||||
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 432 B |
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 432 B |
|
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 524 B |
|
Before Width: | Height: | Size: 618 B After Width: | Height: | Size: 618 B |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 152 B |
|
Before Width: | Height: | Size: 151 B After Width: | Height: | Size: 151 B |
|
Before Width: | Height: | Size: 236 B After Width: | Height: | Size: 236 B |
|
Before Width: | Height: | Size: 603 B After Width: | Height: | Size: 603 B |
|
Before Width: | Height: | Size: 278 B After Width: | Height: | Size: 278 B |
|
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 231 B |
|
Before Width: | Height: | Size: 148 B After Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 382 B |
|
Before Width: | Height: | Size: 330 B After Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 350 B After Width: | Height: | Size: 350 B |
|
Before Width: | Height: | Size: 189 B After Width: | Height: | Size: 189 B |
|
Before Width: | Height: | Size: 192 B After Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 174 B |
|
Before Width: | Height: | Size: 597 B After Width: | Height: | Size: 597 B |
|
Before Width: | Height: | Size: 216 B After Width: | Height: | Size: 216 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 771 B After Width: | Height: | Size: 771 B |
|
Before Width: | Height: | Size: 671 B After Width: | Height: | Size: 671 B |
|
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 220 B |
|
Before Width: | Height: | Size: 218 B After Width: | Height: | Size: 218 B |
|
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 316 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 165 B |
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 242 B |
|
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 423 B |
|
Before Width: | Height: | Size: 173 B After Width: | Height: | Size: 173 B |
|
Before Width: | Height: | Size: 475 B After Width: | Height: | Size: 475 B |
@@ -18,13 +18,14 @@
|
||||
/* Strive for simplicity:
|
||||
* * style elements/tags only - if possible,
|
||||
* * replace element/tag name with class name - if element has to be styled
|
||||
* differently depending on context (e.g. <form>, <table>, <a> as link/button),
|
||||
* differently depending on context (e.g. <form>; <a> as link/button),
|
||||
* * styles with multiple selectors should have all selectors with same
|
||||
* specificity, to allow proper rule specificity vs order management.
|
||||
*
|
||||
* NOTE: style in a modular way, similar to how CSS @scope would be used,
|
||||
* to make transition easier once @scope is widely available. */
|
||||
/* TODO: change :root -> <html> ? */
|
||||
/* TODO: review styles with multiple selectors and try to convert them to the same
|
||||
* specificity. */
|
||||
:root {
|
||||
--color-focus-gray: #f3f3f3;
|
||||
--color-border-gray: #dddddd;
|
||||
@@ -56,13 +57,8 @@
|
||||
:focus-visible {
|
||||
outline: none;
|
||||
}
|
||||
/* NOTE: move to higher priority layer instead of using !important?; add CSS
|
||||
* @layer requirements in README */
|
||||
/* Disable elements with:
|
||||
* `[aria-disabled=true]` - non-form elements (e.g. links),
|
||||
* `[disabled]` - form controls, that may be enabled conditionally,
|
||||
* `[readonly]` - form controls, that stay disabled for form lifetime. */
|
||||
[aria-disabled=true],
|
||||
/* NOTE: move to higher priority layer instead of using !important? */
|
||||
/* TODO: add CSS @layer requirements in README */
|
||||
[disabled] {
|
||||
border-color: var(--color-border-gray) !important;
|
||||
color: var(--color-border-gray) !important;
|
||||
@@ -84,13 +80,10 @@
|
||||
* gray - target for interaction with keyboard,
|
||||
* red - destructive, non-undoable action.
|
||||
*/
|
||||
/* TODO: merge selectors using :is() */
|
||||
a,
|
||||
button,
|
||||
details,
|
||||
input,
|
||||
select,
|
||||
summary,
|
||||
textarea {
|
||||
background-color: inherit;
|
||||
font: inherit;
|
||||
@@ -108,14 +101,7 @@ textarea {
|
||||
border-radius: 0.25em;
|
||||
padding: 0.2em 0.4em;
|
||||
}
|
||||
svg {
|
||||
height: 1.4em;
|
||||
margin: 0 0.2em 0 0;
|
||||
width: 1.4em;
|
||||
}
|
||||
svg:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
svg,
|
||||
textarea {
|
||||
margin: 0;
|
||||
}
|
||||
@@ -167,12 +153,7 @@ table form summary,
|
||||
table form textarea {
|
||||
color: inherit;
|
||||
}
|
||||
table svg:not(:only-child) {
|
||||
height: 1.25em;
|
||||
width: 1.25em;
|
||||
}
|
||||
input:focus-visible,
|
||||
/* TODO: select:focus-visible is redundant with -within? */
|
||||
select:focus-visible,
|
||||
select:focus-within,
|
||||
/* TODO: how to achieve `summary:focus-within` for `::details-content`? */
|
||||
@@ -206,10 +187,6 @@ textarea:invalid {
|
||||
border-color: var(--color-red);
|
||||
outline-color: var(--color-red);
|
||||
}
|
||||
pre {
|
||||
display: inline;
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
/* `.button`: button-styled <a>, <button>, <input type=submit>.
|
||||
* `.link`: any other <a>.
|
||||
@@ -237,21 +214,20 @@ pre {
|
||||
padding: 0.6em 0.5em;
|
||||
width: fit-content;
|
||||
}
|
||||
.link {
|
||||
color: inherit;
|
||||
text-decoration: underline 1px var(--color-border-gray);
|
||||
text-underline-offset: 0.25em;
|
||||
}
|
||||
[name=cancel],
|
||||
.auxiliary {
|
||||
border-color: var(--color-nav-gray);
|
||||
border-color: var(--color-border-gray);
|
||||
color: var(--color-nav-gray);
|
||||
fill: var(--color-nav-gray);
|
||||
}
|
||||
table .button {
|
||||
border-color: var(--color-border-gray);
|
||||
font-weight: normal;
|
||||
height: 100%;
|
||||
padding: 0.4em;
|
||||
.button > svg,
|
||||
.tab > svg {
|
||||
height: 1.4em;
|
||||
width: 1.4em;
|
||||
}
|
||||
.button > svg:not(:last-child),
|
||||
.tab > svg:not(:last-child) {
|
||||
margin-right: 0.2em;
|
||||
}
|
||||
.button:focus-visible,
|
||||
.tab:focus-visible,
|
||||
@@ -268,12 +244,21 @@ table .button {
|
||||
background-color: var(--color-red);
|
||||
border-color: var(--color-red);
|
||||
}
|
||||
.link:focus-visible {
|
||||
text-decoration-color: var(--color-gray);
|
||||
table .button {
|
||||
border-color: var(--color-border-gray);
|
||||
color: var(--color-table-gray);
|
||||
font-weight: normal;
|
||||
height: 100%;
|
||||
padding: 0.4em;
|
||||
}
|
||||
.link:hover {
|
||||
color: var(--color-blue);
|
||||
text-decoration-color: var(--color-blue);
|
||||
/* TODO: move normal, non-button links (<a>:hover/:focus) styling here (i.e.
|
||||
* page-wide, top-level) and remove from `table.items` - as the style should be
|
||||
* same everywhere. */
|
||||
/* TODO: apply link class to non-button/-tab links. Add light underscore for links? */
|
||||
input[type=text]:read-only,
|
||||
textarea:read-only {
|
||||
border: none;
|
||||
padding-inline: 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -286,16 +271,16 @@ body {
|
||||
grid-template-areas:
|
||||
"header header header"
|
||||
"nav nav nav"
|
||||
"leftside topside rightside"
|
||||
"leftside main rightside";
|
||||
grid-template-columns: 1fr minmax(max-content, 2fr) 1fr;
|
||||
font-family: system-ui;
|
||||
margin: 0.4em;
|
||||
}
|
||||
body:has(> .topside-area) {
|
||||
body:not(:has(.topside-area)) {
|
||||
grid-template-areas:
|
||||
"header header header"
|
||||
"nav nav nav"
|
||||
"leftside topside rightside"
|
||||
"leftside main rightside";
|
||||
}
|
||||
|
||||
@@ -303,7 +288,6 @@ header {
|
||||
grid-area: header;
|
||||
}
|
||||
|
||||
/* TODO: change .navigation -> <nav> ? */
|
||||
.navigation {
|
||||
display: flex;
|
||||
grid-area: nav;
|
||||
@@ -370,21 +354,21 @@ header {
|
||||
line-height: 2.2em;
|
||||
pointer-events: auto;
|
||||
}
|
||||
.flash::before {
|
||||
filter: invert(1);
|
||||
.flash:before {
|
||||
filter: invert();
|
||||
height: 1.4em;
|
||||
margin: 0 0.5em;
|
||||
width: 1.4em;
|
||||
}
|
||||
.flash.alert::before {
|
||||
content: url('alert-outline.svg');
|
||||
.flash.alert:before {
|
||||
content: url('pictograms/alert-outline.svg');
|
||||
}
|
||||
.flash.alert {
|
||||
border-color: var(--color-red);
|
||||
background-color: var(--color-red);
|
||||
}
|
||||
.flash.notice::before {
|
||||
content: url('check-circle-outline.svg');
|
||||
.flash.notice:before {
|
||||
content: url('pictograms/check-circle-outline.svg');
|
||||
}
|
||||
.flash.notice {
|
||||
border-color: var(--color-blue);
|
||||
@@ -447,81 +431,85 @@ header {
|
||||
|
||||
.tabular-form table {
|
||||
border: none;
|
||||
border-spacing: 0;
|
||||
}
|
||||
.tabular-form table td {
|
||||
border: none;
|
||||
padding-inline-start: 0.4em;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.tabular-form table td:first-child {
|
||||
padding-inline-start: 0;
|
||||
}
|
||||
.tabular-form table td:last-child {
|
||||
padding-inline-end: 0;
|
||||
}
|
||||
.tabular-form table :is(form, input, select, textarea):only-child {
|
||||
margin-inline-start: 0;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
|
||||
.items-table {
|
||||
border: none;
|
||||
border-radius: 0.25em;
|
||||
border-spacing: 0;
|
||||
border: 1px solid var(--color-border-gray);
|
||||
border-radius: 0.25em;
|
||||
font-size: 0.85rem;
|
||||
text-align: left;
|
||||
}
|
||||
.items-table:has(tbody > tr > td) {
|
||||
border: 1px solid var(--color-border-gray);
|
||||
.items-table thead {
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
.items-table:has(tbody > tr > td) caption {
|
||||
display: none;
|
||||
}
|
||||
.items-table tbody:not(:has(tr > td)){
|
||||
visibility: collapse;
|
||||
}
|
||||
.items-table th,
|
||||
.items-table tr:where(:hover) {
|
||||
.items-table thead,
|
||||
.items-table tbody tr:hover {
|
||||
background-color: var(--color-focus-gray);
|
||||
}
|
||||
.items-table th {
|
||||
font-size: 0.8rem;
|
||||
padding: 0.75em 0 0.75em 1em;
|
||||
padding-block: 0.75em;
|
||||
text-align: center;
|
||||
}
|
||||
.items-table th,
|
||||
.items-table td {
|
||||
padding-inline: 1em 0;
|
||||
}
|
||||
/* For <a> to fill <td> completely, we use an `::after` pseudoelement. */
|
||||
.items-table td.link {
|
||||
padding: 0;
|
||||
position: relative;
|
||||
}
|
||||
.items-table td.link a {
|
||||
color: inherit;
|
||||
font: inherit;
|
||||
}
|
||||
.items-table td.link a::after {
|
||||
content: '';
|
||||
inset: 0;
|
||||
position: absolute;
|
||||
}
|
||||
.items-table td:first-child {
|
||||
padding-inline-start: calc(1em + var(--depth) * 0.8em);
|
||||
}
|
||||
.items-table td:has(input, select, textarea) {
|
||||
padding-inline-start: calc(0.6em - 0.9px);
|
||||
}
|
||||
.items-table td:first-child:has(input, select, textarea) {
|
||||
padding-inline-start: calc(0.6em + var(--depth) * 0.8em - 0.9px);
|
||||
}
|
||||
.items-table th:last-child {
|
||||
padding-inline-end: 0.4em;
|
||||
}
|
||||
.items-table td {
|
||||
border-top: 1px solid var(--color-border-gray);
|
||||
height: 2.4em;
|
||||
padding: 0.1em 0 0.1em calc(1em + var(--depth) * 0.8em);
|
||||
}
|
||||
.items-table td:last-child {
|
||||
padding-inline-end: 0.1em;
|
||||
}
|
||||
.items-table :is(form, input, select, textarea):only-child {
|
||||
margin-inline-start: calc(-0.4em - 0.9px);
|
||||
.items-table td {
|
||||
border-top: 1px solid var(--color-border-gray);
|
||||
height: 2.4em;
|
||||
padding-block: 0.1em;
|
||||
}
|
||||
/* For <a> to fill table cell completely, we use an `::after` pseudoelement. */
|
||||
/* TODO: expand to whole row? will require adjusting z-index on inputs/buttons */
|
||||
.items-table td:has(> .link) {
|
||||
position: relative;
|
||||
}
|
||||
.items-table .link::after {
|
||||
content: '';
|
||||
inset: -1px 0 0 0;
|
||||
position: absolute;
|
||||
}
|
||||
.items-table .flex {
|
||||
.items-table .actions {
|
||||
display: flex;
|
||||
gap: 0.4em;
|
||||
justify-content: end;
|
||||
}
|
||||
.items-table .dropzone {
|
||||
.items-table .actions.centered {
|
||||
justify-content: center;
|
||||
}
|
||||
.items-table tr.dropzone {
|
||||
position: relative;
|
||||
}
|
||||
.items-table .dropzone::after {
|
||||
.items-table tr.dropzone::after {
|
||||
content: '';
|
||||
inset: 1px 0 0 0;
|
||||
position: absolute;
|
||||
@@ -529,37 +517,72 @@ header {
|
||||
outline-offset: -1px;
|
||||
z-index: var(--z-index-table-row-outline);
|
||||
}
|
||||
.items-table .handle {
|
||||
cursor: grab;
|
||||
.items-table td.handle {
|
||||
cursor: move;
|
||||
}
|
||||
.items-table .form td {
|
||||
.items-table tr.form td {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
/* TODO: replace `:hover:focus-visible` combos with proper LOVE style order. */
|
||||
/* TODO: update table styling: simplify selectors, deduplicate, remove non-font rem. */
|
||||
.items-table td.link a:hover,
|
||||
.items-table td.link a:focus-visible,
|
||||
.items-table td.link a:hover:focus-visible {
|
||||
text-decoration: underline;
|
||||
text-decoration-thickness: 0.05rem;
|
||||
text-underline-offset: 0.2rem;
|
||||
}
|
||||
.items-table td.link a:hover {
|
||||
color: var(--color-blue);
|
||||
}
|
||||
.items-table td.link a:focus-visible {
|
||||
text-decoration-color: var(--color-gray);
|
||||
}
|
||||
.items-table td.link a:hover:focus-visible {
|
||||
color: var(--color-dark-blue);
|
||||
}
|
||||
|
||||
.items-table td:not(:first-child),
|
||||
.grayed {
|
||||
color: var(--color-table-gray);
|
||||
fill: var(--color-gray);
|
||||
fill: var(--color-table-gray);
|
||||
}
|
||||
.items-table td:has(> svg:only-child) {
|
||||
.items-table svg {
|
||||
height: 1rem;
|
||||
vertical-align: middle;
|
||||
width: 1rem;
|
||||
}
|
||||
.items-table svg:last-child {
|
||||
height: 1.2rem;
|
||||
width: 1.2rem;
|
||||
}
|
||||
.items-table td.svg {
|
||||
text-align: center;
|
||||
}
|
||||
.items-table td.number {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
|
||||
.center {
|
||||
.centered {
|
||||
margin: 0 auto;
|
||||
}
|
||||
.extendedright {
|
||||
margin-right: auto;
|
||||
}
|
||||
.hexpand {
|
||||
width: 100%;
|
||||
}
|
||||
.flex {
|
||||
.hflex {
|
||||
display: flex;
|
||||
gap: 0.8em;
|
||||
}
|
||||
.flex.reverse {
|
||||
.hflex.reverse {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
.flex.vertical {
|
||||
flex-direction: column;
|
||||
.hflex.centered {
|
||||
justify-content: center;
|
||||
}
|
||||
.hint {
|
||||
color: var(--color-table-gray);
|
||||
@@ -570,29 +593,14 @@ header {
|
||||
.hmin50 {
|
||||
min-width: 50%;
|
||||
}
|
||||
.hminnumber {
|
||||
min-width: 5em;
|
||||
}
|
||||
.hmintext {
|
||||
min-width: 6em;
|
||||
}
|
||||
.hstretch {
|
||||
/* `width` conflicts with <input>/<textarea> size defined by [size]/[cols]
|
||||
* attributes. It's best to not use these attributes (e.g. set them to 1) when
|
||||
* setting width through stylesheet. */
|
||||
/* NOTE: `field-sizing` can be considered after upgrade do FF >=152 */
|
||||
width: -moz-available;
|
||||
width: stretch;
|
||||
}
|
||||
.italic {
|
||||
color: var(--color-gray);
|
||||
font-style: italic;
|
||||
}
|
||||
.ralign {
|
||||
text-align: right;
|
||||
}
|
||||
.rextend {
|
||||
margin-right: auto;
|
||||
.vflex {
|
||||
display: flex;
|
||||
gap: 0.8em;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
|
||||
@@ -612,7 +620,7 @@ summary::before {
|
||||
background-color: currentColor;
|
||||
content: "";
|
||||
height: 1em;
|
||||
mask-image: url('chevron-down.svg');
|
||||
mask-image: url('pictograms/chevron-down.svg');
|
||||
mask-size: cover;
|
||||
width: 1em;
|
||||
}
|
||||
@@ -639,7 +647,7 @@ summary::marker {
|
||||
}
|
||||
/* NOTE: use `details[open]::details-content` once widely available. */
|
||||
details[open] ul {
|
||||
background-color: white;
|
||||
background: white;
|
||||
border: 1px solid var(--color-border-gray);
|
||||
border-radius: 0.25em;
|
||||
box-shadow: 1px 1px 3px var(--color-border-gray);
|
||||
@@ -662,6 +670,11 @@ li input[type=checkbox] {
|
||||
li::marker {
|
||||
content: '';
|
||||
}
|
||||
|
||||
#measurement_form {
|
||||
min-width: 66%;
|
||||
width: max-content;
|
||||
}
|
||||
/*
|
||||
* TODO:
|
||||
* * disable <label> containing disabled checkbox: `label:has(input[disabled])`,
|
||||
@@ -669,8 +682,3 @@ li::marker {
|
||||
* * focused label styling (currently only checkbox has focus),
|
||||
* * disabled checkbox blue square focus removal.
|
||||
* */
|
||||
|
||||
#measurement_form {
|
||||
min-width: 66%;
|
||||
width: max-content;
|
||||
}
|
||||
|
||||
@@ -55,9 +55,9 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
private
|
||||
|
||||
def render_errors(record)
|
||||
target = record.new_record? ? [:new, record.parent || record.class] : [:edit, record]
|
||||
render 'errors', assigns: {record: record, target: target}
|
||||
def render_no_content(record)
|
||||
helpers.render_errors(record)
|
||||
render html: nil, layout: true
|
||||
end
|
||||
|
||||
def rescue_turbo(exception)
|
||||
|
||||
@@ -17,7 +17,7 @@ class Default::UnitsController < ApplicationController
|
||||
|
||||
def import
|
||||
@unit.port!(current_user)
|
||||
flash.now.notice = t('.success', unit: @unit)
|
||||
flash.now[:notice] = t('.success', unit: @unit)
|
||||
ensure
|
||||
run_and_render :index
|
||||
end
|
||||
@@ -30,14 +30,14 @@ class Default::UnitsController < ApplicationController
|
||||
|
||||
def export
|
||||
@unit.port!(nil)
|
||||
flash.now.notice = t('.success', unit: @unit)
|
||||
flash.now[:notice] = t('.success', unit: @unit)
|
||||
ensure
|
||||
run_and_render :index
|
||||
end
|
||||
|
||||
def destroy
|
||||
@unit.destroy!
|
||||
flash.now.notice = t('.success', unit: @unit)
|
||||
flash.now[:notice] = t('.success', unit: @unit)
|
||||
ensure
|
||||
run_and_render :index
|
||||
end
|
||||
|
||||
@@ -19,9 +19,9 @@ class QuantitiesController < ApplicationController
|
||||
def create
|
||||
@quantity = current_user.quantities.new(quantity_params)
|
||||
if @quantity.save
|
||||
@before = @quantity.succeeding
|
||||
@before = @quantity.successive
|
||||
@ancestors = @quantity.ancestors
|
||||
flash.now.notice = t('.success', quantity: @quantity)
|
||||
flash.now[:notice] = t('.success', quantity: @quantity)
|
||||
else
|
||||
render :new
|
||||
end
|
||||
@@ -33,7 +33,7 @@ class QuantitiesController < ApplicationController
|
||||
def update
|
||||
if @quantity.update(quantity_params.except(:parent_id))
|
||||
@ancestors = @quantity.ancestors
|
||||
flash.now.notice = t('.success', quantity: @quantity)
|
||||
flash.now[:notice] = t('.success', quantity: @quantity)
|
||||
else
|
||||
render :edit
|
||||
end
|
||||
@@ -43,22 +43,18 @@ class QuantitiesController < ApplicationController
|
||||
permitted = params.require(:quantity).permit(:parent_id)
|
||||
@previous_ancestors = @quantity.ancestors
|
||||
|
||||
if @quantity.update(permitted)
|
||||
@ancestors = @quantity.ancestors
|
||||
# TODO: simplify into 1 query (see #succeeding comment)
|
||||
@quantities = @quantity.with_progenies
|
||||
@before = @quantities.last.succeeding
|
||||
else
|
||||
# Until UI blocks all disallowed reparents, render error messages if present.
|
||||
flash.now.alert = @quantity.errors.full_messages
|
||||
render :nothing
|
||||
end
|
||||
# Until UI blocks all disallowed reparents, render error messages if present
|
||||
render_no_content(@quantity) unless @quantity.update(permitted)
|
||||
|
||||
@ancestors = @quantity.ancestors
|
||||
@self_and_progenies = @quantity.with_progenies
|
||||
@before = @self_and_progenies.last.successive
|
||||
end
|
||||
|
||||
def destroy
|
||||
@quantity.destroy!
|
||||
@ancestors = @quantity.ancestors
|
||||
flash.now.notice = t('.success', quantity: @quantity)
|
||||
flash.now[:notice] = t('.success', quantity: @quantity)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -6,7 +6,7 @@ class ReadoutsController < ApplicationController
|
||||
def new
|
||||
@quantities -= @prev_quantities
|
||||
# TODO: raise ParameterInvalid if new_quantities.empty?
|
||||
@readouts = @quantities.map { |q| q.readouts.build }
|
||||
@readouts = current_user.readouts.build(@quantities.map { |q| {quantity: q} })
|
||||
|
||||
@user_units = current_user.units.ordered
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
class UnitsController < ApplicationController
|
||||
before_action ->{ @unit = current_user.units.find_by!(id: params[:id]) },
|
||||
only: [:new, :edit, :update, :rebase, :destroy],
|
||||
unless: ->{ action_name == "new" && params[:id].nil? }
|
||||
before_action only: :new do
|
||||
find_unit if params[:id].present?
|
||||
end
|
||||
before_action :find_unit, only: [:edit, :update, :rebase, :destroy]
|
||||
|
||||
before_action except: [:index] do
|
||||
before_action except: :index do
|
||||
raise AccessForbidden unless current_user.at_least(:active)
|
||||
end
|
||||
|
||||
@@ -16,12 +17,12 @@ class UnitsController < ApplicationController
|
||||
end
|
||||
|
||||
def create
|
||||
@unit = current_user.units.new(params.expect(Unit::ATTRIBUTES))
|
||||
@unit = current_user.units.new(unit_params)
|
||||
if @unit.save
|
||||
@before = @unit.succeeding
|
||||
flash.now.notice = t('.success', unit: @unit)
|
||||
@before = @unit.successive
|
||||
flash.now[:notice] = t('.success', unit: @unit)
|
||||
else
|
||||
render_errors @unit
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
@@ -29,32 +30,40 @@ class UnitsController < ApplicationController
|
||||
end
|
||||
|
||||
def update
|
||||
if @unit.update(params.except(:base_id).expect(Unit::ATTRIBUTES))
|
||||
flash.now.notice = t('.success', unit: @unit)
|
||||
if @unit.update(unit_params.except(:base_id))
|
||||
flash.now[:notice] = t('.success', unit: @unit)
|
||||
else
|
||||
render_errors @unit
|
||||
render :edit
|
||||
end
|
||||
end
|
||||
|
||||
# TODO: Avoid double table width change by first un-hiding table header,
|
||||
# then displaying index, e.g. by re-displaying header in index
|
||||
def rebase
|
||||
unit_params = params.expect(unit: :base_id)
|
||||
unit_params.merge!(multiplier: 1.0) if unit_params[:base_id].blank?
|
||||
permitted = params.require(:unit).permit(:base_id)
|
||||
permitted.merge!(multiplier: 1) if permitted[:base_id].blank? && @unit.multiplier != 1
|
||||
|
||||
@previous_base = @unit.base
|
||||
@unit.update!(unit_params)
|
||||
@unit.update!(permitted)
|
||||
|
||||
@before = @unit.succeeding
|
||||
@before = @unit.successive
|
||||
if @unit.multiplier_previously_changed?
|
||||
flash.now.notice = t(".multiplier_reset", unit: @unit)
|
||||
flash.now[:notice] = t(".multiplier_reset", unit: @unit)
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
@unit.destroy!
|
||||
flash.now.notice = t('.success', unit: @unit)
|
||||
flash.now[:notice] = t('.success', unit: @unit)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def unit_params
|
||||
params.require(:unit).permit(Unit::ATTRIBUTES)
|
||||
end
|
||||
|
||||
def find_unit
|
||||
@unit = current_user.units.find_by!(id: params[:id])
|
||||
end
|
||||
end
|
||||
|
||||
@@ -40,7 +40,7 @@ module ApplicationHelper
|
||||
# controller.action.* => helpers.label.model.* => activerecord.attributes.model.*
|
||||
# First 2 levels are translated recursively.
|
||||
label(method, class: classes) do |builder|
|
||||
translation = I18n.with(**handler) { deep_translate(method, **options) }
|
||||
translation = I18n.config.with(**handler) { deep_translate(method, **options) }
|
||||
translation.presence || "#{builder.translation}:"
|
||||
end
|
||||
end
|
||||
@@ -91,25 +91,28 @@ module ApplicationHelper
|
||||
[:text_field, :password_field, :text_area].each do |selector|
|
||||
class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
|
||||
def #{selector}(method, options = {})
|
||||
options[:maxlength] ||= object.type_for_attribute(method).limit
|
||||
# If [cols]/[size] is not set, minimum field width is controlled with
|
||||
# stylesheet. To prevent browser estimating missing [cols]/[size]
|
||||
# based on e.g. [maxlength], set it to 1.
|
||||
options[:#{selector == :text_area ? :cols : :size}] ||= 1
|
||||
options[:maxlength] ||= object.class.type_for_attribute(method).limit
|
||||
if object.errors.include?(method)
|
||||
options[:pattern] = except_pattern(object.public_send(method), options[:pattern])
|
||||
end
|
||||
super
|
||||
end
|
||||
RUBY_EVAL
|
||||
end
|
||||
|
||||
def number_field(method, options = {})
|
||||
case object.type_for_attribute(method).type
|
||||
when :float, :double
|
||||
options[:min] ||= Float::MIN_15.to_scientific
|
||||
options[:max] ||= Float::MAX_15.to_scientific
|
||||
options[:oninput] = 'numberValidate(event)'
|
||||
options[:size] ||= options[:class]&.split&.include?('hstretch') ? 1 : 6
|
||||
options[:step] ||= :any
|
||||
options[:value] = object.public_send("#{method}_before_type_cast")
|
||||
attr_type = object.type_for_attribute(method)
|
||||
case attr_type.type
|
||||
when :decimal
|
||||
options[:value] = object.public_send(method)&.to_scientific
|
||||
options[:step] ||= BigDecimal(10).power(-attr_type.scale)
|
||||
options[:max] ||= BigDecimal(10).power(attr_type.precision - attr_type.scale) -
|
||||
options[:step]
|
||||
options[:min] = options[:min] == :step ? options[:step] : options[:min]
|
||||
options[:min] ||= -options[:max]
|
||||
options[:size] ||= attr_type.precision / 2
|
||||
when :float
|
||||
options[:size] ||= 6
|
||||
end
|
||||
super
|
||||
end
|
||||
@@ -128,7 +131,11 @@ module ApplicationHelper
|
||||
|
||||
def submit_default_value
|
||||
svg_name = object ? (object.persisted? ? 'update' : 'plus-circle-outline') : ''
|
||||
@template.svg_tag(svg_name, super)
|
||||
@template.svg_tag("pictograms/#{svg_name}", super)
|
||||
end
|
||||
|
||||
def except_pattern(value, pattern = nil)
|
||||
"(?!^#{Regexp.escape(value)}$)" + (pattern || ".*")
|
||||
end
|
||||
end
|
||||
|
||||
@@ -139,6 +146,8 @@ module ApplicationHelper
|
||||
record_object, options = nil, record_object if record_object.is_a?(Hash)
|
||||
extra_options = {builder: TabularFormBuilder, skip_default_ids: true}
|
||||
options = merge_attributes(options, extra_options)
|
||||
# TODO: set error message with setCustomValidity instead of rendering to flash?
|
||||
render_errors(record_object || record_name)
|
||||
fields_for(record_name, record_object, **options, &block)
|
||||
end
|
||||
|
||||
@@ -151,7 +160,7 @@ module ApplicationHelper
|
||||
def svg_tag(source, label = nil, options = {})
|
||||
label, options = nil, label if label.is_a? Hash
|
||||
svg_tag = tag.svg(**options) do
|
||||
tag.use(href: image_path("#{source}.svg") + '#icon')
|
||||
tag.use(href: "#{image_path(source + ".svg")}#icon")
|
||||
end
|
||||
label.blank? ? svg_tag : svg_tag + tag.span(label)
|
||||
end
|
||||
@@ -167,7 +176,7 @@ module ApplicationHelper
|
||||
|
||||
menu_tabs.map do |name, image, status, css_class|
|
||||
if current_user.at_least(status)
|
||||
link_to svg_tag(image, t("#{name}.navigation")),
|
||||
link_to svg_tag("pictograms/#{image}", t("#{name}.navigation")),
|
||||
{controller: "/#{name}", action: "index"},
|
||||
class: class_names('tab', css_class, active: name == current_tab)
|
||||
end
|
||||
@@ -199,19 +208,28 @@ module ApplicationHelper
|
||||
|
||||
def image_link_to_unless_current(name, image = nil, options = nil, html_options = {})
|
||||
name, html_options = link_or_button_options(:link, name, image, html_options)
|
||||
if current_page?(options, method: [:get, :post])
|
||||
# NOTE: Starting from Rails 8.1.0, below condition can be replaced with:
|
||||
# current_page?(options, method: [:get, :post])
|
||||
if request.path == url_for(options)
|
||||
html_options = html_options.deep_merge DISABLED_ATTRIBUTES
|
||||
end
|
||||
link_to name, options, html_options
|
||||
end
|
||||
|
||||
def render_flash
|
||||
def render_errors(records)
|
||||
# Conversion of flash to Array only required because of Devise
|
||||
# TODO: override Devise message setting to Array()?
|
||||
flash[:alert] = Array(flash[:alert])
|
||||
Array(records).each { |record| flash[:alert] += record.errors.full_messages }
|
||||
end
|
||||
|
||||
def render_flash_messages
|
||||
flash.map do |entry, messages|
|
||||
# Conversion of flash to Array only required because of Devise.
|
||||
# Conversion of flash to Array only required because of Devise
|
||||
Array(messages).map do |message|
|
||||
tag.div class: "flash #{entry}" do
|
||||
tag.span(sanitize(message)) +
|
||||
svg_tag('close-outline', {onclick: "this.parentElement.remove()"})
|
||||
svg_tag('pictograms/close-outline', {onclick: "this.parentElement.remove()"})
|
||||
end
|
||||
end
|
||||
end.join.html_safe
|
||||
@@ -243,7 +261,7 @@ module ApplicationHelper
|
||||
link_is_local = html_options[:onclick] || html_options.dig(:data, :turbo_stream)
|
||||
name = name.to_s
|
||||
name += '...' if type == :link && !link_is_local
|
||||
name = svg_tag(image, name) if image
|
||||
name = svg_tag("pictograms/#{image}", name) if image
|
||||
|
||||
[name, html_options]
|
||||
end
|
||||
|
||||
@@ -1,19 +1,14 @@
|
||||
// Configure your import map in config/importmap.rb. Read more:
|
||||
// https://github.com/rails/importmap-rails
|
||||
import "@hotwired/turbo-rails"
|
||||
import "./turbo_actions.js"
|
||||
// TODO: access `data-` attributes through
|
||||
// `keyname in`/`dataset.keyname`/`delete dataset.keyname`
|
||||
|
||||
|
||||
// Show page if hidden for testing purposes.
|
||||
/* Hide page before loaded for testing purposes */
|
||||
function showPage(event) {
|
||||
document.documentElement.style.visibility="visible"
|
||||
}
|
||||
document.addEventListener('turbo:load', showPage)
|
||||
|
||||
|
||||
// <details> event handlers.
|
||||
function detailsChange(event) {
|
||||
var target = event.currentTarget
|
||||
var count = target.querySelectorAll('input:checked:not([disabled])').length
|
||||
@@ -29,7 +24,7 @@ function detailsChange(event) {
|
||||
}
|
||||
window.detailsChange = detailsChange
|
||||
|
||||
// Close open <details> when focus lost.
|
||||
/* Close open <details> when focus lost */
|
||||
function detailsClose(event) {
|
||||
if (!event.relatedTarget ||
|
||||
event.relatedTarget.closest("details") != event.currentTarget) {
|
||||
@@ -42,8 +37,6 @@ window.detailsObserver = new MutationObserver((mutations) => {
|
||||
mutations[0].target.dispatchEvent(new Event('change', {bubbles: true}))
|
||||
});
|
||||
|
||||
|
||||
// Validation of multiple-submit forms with different field requirements.
|
||||
function formValidate(event) {
|
||||
var id = event.submitter.getAttribute("data-validate")
|
||||
if (!id) return;
|
||||
@@ -56,35 +49,74 @@ function formValidate(event) {
|
||||
}
|
||||
window.formValidate = formValidate
|
||||
|
||||
// Pattern for number precision verification. Should accept all number formats
|
||||
// accepted by Kernel#Float. Lookahead checks the number of significant digits
|
||||
// in mantissa, following expression makes sure there is only one dot.
|
||||
const numberRegExp = /^\-?(?=(?:\.?0)*(?:\.?\d){1,15}?(?:\.?0)*\.?(?:[eE]|$))(?<mantissa>\d*\.?\d+|\d+\.)(?:[eE]\-?\d{1,3})?$/
|
||||
|
||||
// Validation of input[type=number] value precision.
|
||||
function numberValidate(event) {
|
||||
var input = event.target
|
||||
|
||||
input.setCustomValidity("")
|
||||
if (!input.validity.valid) return
|
||||
|
||||
var match = numberRegExp.exec(input.value)
|
||||
if (!match ||
|
||||
(parseFloat(input.value) == 0.0 && match.groups['mantissa'].match(/[1-9]/))) {
|
||||
// TODO: move message to locales
|
||||
input.setCustomValidity("Please select a value within range of double precision floating-point format.")
|
||||
}
|
||||
/* Turbo stream actions */
|
||||
Turbo.StreamElement.prototype.disableElement = function(element) {
|
||||
element.setAttribute("disabled", "disabled")
|
||||
element.setAttribute("aria-disabled", "true")
|
||||
element.setAttribute("tabindex", "-1")
|
||||
}
|
||||
Turbo.StreamActions.disable = function() {
|
||||
this.targetElements.forEach((e) => { this.disableElement(e) })
|
||||
}
|
||||
window.numberValidate = numberValidate
|
||||
|
||||
Turbo.StreamElement.prototype.enableElement = function(element) {
|
||||
element.removeAttribute("disabled")
|
||||
element.removeAttribute("aria-disabled")
|
||||
// Assume 'tabindex' is not used explicitly, so removing it is safe
|
||||
element.removeAttribute("tabindex")
|
||||
}
|
||||
Turbo.StreamActions.enable = function() {
|
||||
this.targetElements.forEach((e) => { this.enableElement(e) })
|
||||
}
|
||||
|
||||
/* TODO: change to visibility = collapse to avoid width change? */
|
||||
Turbo.StreamActions.hide = function() {
|
||||
this.targetElements.forEach((e) => { e.style.display = "none" })
|
||||
}
|
||||
|
||||
Turbo.StreamActions.show = function() {
|
||||
this.targetElements.forEach((e) => { e.style.removeProperty("display") })
|
||||
}
|
||||
|
||||
/*
|
||||
Turbo.StreamActions.collapse = function() {
|
||||
this.targetElements.forEach((e) => { e.style.visibility = "collapse" })
|
||||
}
|
||||
*/
|
||||
|
||||
Turbo.StreamActions.close_form = function() {
|
||||
this.targetElements.forEach((e) => {
|
||||
/* Move focus if there's no focus or focus inside form being closed */
|
||||
const focused = document.activeElement
|
||||
if (!focused || (focused == document.body) || e.contains(focused)) {
|
||||
let nextForm = e.parentElement.querySelector(`#${e.id} ~ tr:has([autofocus])`)
|
||||
nextForm ??= e.parentElement.querySelector("tr:has([autofocus])")
|
||||
nextForm?.querySelector("[autofocus]").focus()
|
||||
}
|
||||
document.getElementById(e.getAttribute("data-form")).remove()
|
||||
if (e.hasAttribute("data-link")) {
|
||||
this.enableElement(document.getElementById(e.getAttribute("data-link")))
|
||||
}
|
||||
if (e.hasAttribute("data-hidden-row")) {
|
||||
document.getElementById(e.getAttribute("data-hidden-row")).removeAttribute("style")
|
||||
}
|
||||
e.remove()
|
||||
})
|
||||
}
|
||||
|
||||
Turbo.StreamActions.unselect = function() {
|
||||
this.targetElements.forEach((e) => {
|
||||
e.checked = false
|
||||
this.enableElement(e)
|
||||
})
|
||||
}
|
||||
|
||||
// Keyboard event processing handlers.
|
||||
function formProcessKey(event) {
|
||||
switch (event.key) {
|
||||
case "Escape":
|
||||
event.currentTarget.querySelector("a[name=cancel]").click()
|
||||
break
|
||||
// TODO: allow new line inside <textarea> (submit with ctrl-enter?)
|
||||
case "Enter":
|
||||
event.currentTarget.querySelector("button[name=button]").click()
|
||||
event.preventDefault()
|
||||
@@ -106,7 +138,7 @@ function detailsProcessKey(event) {
|
||||
var button = event.currentTarget.querySelector("button:not([disabled])")
|
||||
if (button) {
|
||||
button.click()
|
||||
// Autofocus won't be respected unless target is blurred.
|
||||
// Autofocus won't be respected unless target is blurred
|
||||
event.target.blur()
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
@@ -116,8 +148,7 @@ function detailsProcessKey(event) {
|
||||
}
|
||||
window.detailsProcessKey = detailsProcessKey;
|
||||
|
||||
|
||||
// Items table drag and drop support.
|
||||
/* Items table drag and drop support */
|
||||
var lastEnterTime
|
||||
function dragStart(event) {
|
||||
lastEnterTime = event.timeStamp
|
||||
@@ -127,8 +158,7 @@ function dragStart(event) {
|
||||
})
|
||||
event.dataTransfer.setData("text/plain", row.getAttribute("data-drag-path"))
|
||||
var rowRectangle = row.getBoundingClientRect()
|
||||
event.dataTransfer.setDragImage(row, event.x - rowRectangle.left,
|
||||
event.y - rowRectangle.top)
|
||||
event.dataTransfer.setDragImage(row, event.x - rowRectangle.left, event.y - rowRectangle.top)
|
||||
event.dataTransfer.dropEffect = "move"
|
||||
}
|
||||
window.dragStart = dragStart
|
||||
@@ -138,11 +168,9 @@ window.dragStart = dragStart
|
||||
* * Enter/Leave events at the same timeStamp may not be logically ordered
|
||||
* (e.g. E -> E -> L, not E -> L -> E),
|
||||
* * not every Enter event has corresponding Leave event, especially during
|
||||
* rapid pointer moves.
|
||||
* rapid pointer moves
|
||||
* NOTE: sometimes Leave is not emitted when pointer goes fast over table
|
||||
* and outside. This should probably be fixed in browser, than patched here.
|
||||
* TODO: replace Leave table with Enter document?
|
||||
* https://www.quirksmode.org/js/events_order.html#link4
|
||||
*/
|
||||
function dragEnter(event) {
|
||||
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
||||
@@ -160,7 +188,7 @@ window.dragOver = dragOver
|
||||
|
||||
function dragLeave(event) {
|
||||
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
||||
// Leave has been accounted for by Enter at the same timestamp, processed earlier.
|
||||
// Leave has been accounted for by Enter at the same timestamp, processed earlier
|
||||
if (event.timeStamp <= lastEnterTime) return
|
||||
event.currentTarget.closest("table").querySelectorAll(".dropzone").forEach((tr) => {
|
||||
tr.classList.remove("dropzone")
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
// Turbo Streams actions.
|
||||
|
||||
const FORM_CONTROLS = ["BUTTON", "FIELDSET", "INPUT", "OPTGROUP", "OPTION", "SELECT",
|
||||
"TEXTAREA"]
|
||||
|
||||
Object.assign(Turbo.StreamElement.prototype, {
|
||||
disableElement(element) {
|
||||
if (FORM_CONTROLS.includes(element.tagName)) {
|
||||
element.setAttribute("disabled", "disabled")
|
||||
} else {
|
||||
element.setAttribute("aria-disabled", "true")
|
||||
// NOTE: tabindex should not be disabled?
|
||||
element.setAttribute("tabindex", "-1")
|
||||
}
|
||||
},
|
||||
|
||||
enableElement(element) {
|
||||
if (FORM_CONTROLS.includes(element.tagName)) {
|
||||
element.removeAttribute("disabled")
|
||||
} else {
|
||||
element.removeAttribute("aria-disabled")
|
||||
// Assume 'tabindex' is not used explicitly, so removing it is safe.
|
||||
element.removeAttribute("tabindex")
|
||||
}
|
||||
},
|
||||
|
||||
showElement(element) { element.style.visibility = "visible" }
|
||||
})
|
||||
|
||||
Object.assign(Turbo.StreamActions, {
|
||||
disable() {
|
||||
this.targetElements.forEach((e) => { this.disableElement(e) })
|
||||
},
|
||||
|
||||
enable() {
|
||||
this.targetElements.forEach((e) => { this.enableElement(e) })
|
||||
},
|
||||
|
||||
hide() {
|
||||
this.targetElements.forEach((e) => { e.style.visibility = "collapse" })
|
||||
},
|
||||
|
||||
show() {
|
||||
this.targetElements.forEach((e) => { this.showElement(e) })
|
||||
},
|
||||
|
||||
unselect() {
|
||||
this.targetElements.forEach((e) => { e.checked = false; this.enableElement(e) })
|
||||
},
|
||||
|
||||
validate_form() {
|
||||
this.targetElements.forEach((form) => {
|
||||
this.templateContent.querySelectorAll("span").forEach((span) => {
|
||||
var control = document.querySelector(
|
||||
`[form="${form.id}"][name="${span.dataset.name}"]`
|
||||
)
|
||||
control.setCustomValidity(span.textContent)
|
||||
// Add event listener in capture phase to clear custom validity before
|
||||
// `[oninput]` or any other bubble phase handler is invoked.
|
||||
// https://www.quirksmode.org/js/events_order.html
|
||||
// TODO: keep invalidating current value whenever user re-enters it. Store
|
||||
// invalid value and validation message in `[data-invalid-message/value]`
|
||||
// and check input value on "input" event (below) (using `[pattern]` may not
|
||||
// be suitable due to inability to customize validtion message; also
|
||||
// pattern may be used for other, conflicting purposes).
|
||||
// After user executes any other action (while form is open), remove `[data-]`
|
||||
// attributes and custom validation, as value may no longer be invalid.
|
||||
control.addEventListener(
|
||||
"input",
|
||||
function(event) { event.target.setCustomValidity("") },
|
||||
{capture: true, once: true}
|
||||
)
|
||||
})
|
||||
form.reportValidity()
|
||||
})
|
||||
},
|
||||
|
||||
close_form() {
|
||||
this.targetElements.forEach((e) => {
|
||||
// Move focus if there's no focus or focus inside form being closed.
|
||||
const focused = document.activeElement
|
||||
if (!focused || (focused == document.body) || e.contains(focused)) {
|
||||
let nextForm = e.parentElement.querySelector(`#${e.id} ~ tr:has([autofocus])`)
|
||||
nextForm ??= e.parentElement.querySelector("tr:has([autofocus])")
|
||||
nextForm?.querySelector("[autofocus]").focus()
|
||||
}
|
||||
document.getElementById(e.dataset.form).remove()
|
||||
if ('link' in e.dataset) {
|
||||
this.enableElement(document.getElementById(e.dataset.link))
|
||||
}
|
||||
if ('hiddenRow' in e.dataset) {
|
||||
this.showElement(document.getElementById(e.dataset.hiddenRow))
|
||||
}
|
||||
e.remove()
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -1,6 +1,4 @@
|
||||
class ApplicationRecord < ActiveRecord::Base
|
||||
include ActionView::Helpers::TagHelper
|
||||
|
||||
class << self
|
||||
# Cached attribute has non-user assignable value calculated from other
|
||||
# attributes' values on create/update. This simplifies and speeds up
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
class Note < ApplicationRecord
|
||||
ATTRIBUTES = [:text]
|
||||
end
|
||||
+23
-46
@@ -6,21 +6,16 @@ class Quantity < ApplicationRecord
|
||||
belongs_to :parent, optional: true, class_name: "Quantity"
|
||||
has_many :subquantities, ->{ order(:name) }, class_name: "Quantity",
|
||||
inverse_of: :parent, dependent: :restrict_with_error
|
||||
has_many :readouts, dependent: :restrict_with_error
|
||||
|
||||
validate if: ->{ parent.present? } do
|
||||
errors.add(:parent, :user_mismatch) unless user_id == parent.user_id
|
||||
errors.add(:parent, :self_reference) if id == parent_id
|
||||
end
|
||||
validate if: ->{ parent.present? }, on: :update do
|
||||
# TODO: should not report error for (parent == self)
|
||||
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
||||
end
|
||||
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
||||
length: {maximum: type_for_attribute(:name).limit}
|
||||
# FIXME: length validation for :text type column is probably wrong; reported
|
||||
# limit is in bytes (at least for MySQL) and check is for #length (i.e.
|
||||
# characters); this doesn't seem to apply to :string (implemented as varchar)
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||
|
||||
# Update :depths of progenies after parent change
|
||||
@@ -65,42 +60,26 @@ class Quantity < ApplicationRecord
|
||||
scope :defaults, ->{ where(user: nil) }
|
||||
|
||||
# Return: ordered [sub]hierarchy
|
||||
scope :ordered, ->(**kwargs) {
|
||||
with_path(**kwargs).order(arel_table[:path])
|
||||
}
|
||||
scope :ordered, ->(root: nil, include_root: true) {
|
||||
numbered = Arel::Table.new('numbered')
|
||||
|
||||
# TODO: sort recursive CTE using ORDER BY; it's supported by SQLite, so
|
||||
# drop MySQL until it is available (?)
|
||||
# Only ORDER BY allows proper i.e. not placing limits on user data and
|
||||
# efficient with regard to paging (LIMIT/OFFSET) depth-first search.
|
||||
# Sorting based on numbering is less elegant/efficient (MySQL: ROW_NUMBER cannot
|
||||
# be used inside recursive CTE and needs separate SELECT,
|
||||
# https://bugs.mysql.com/bug.php?id=96538).
|
||||
# Sorting based on pathname requires I) padding to maximum column length or
|
||||
# II) delimiter which a) cannot be used in sorted column and b) sorts before
|
||||
# anything else (this adds complexity; NULL cannot be used when sorting).
|
||||
# Sorting based on ARRAY is only available on PostgreSQL.
|
||||
scope :with_path, ->(root: nil, include_root: true) {
|
||||
with_number = Arel::Table.new('with_number')
|
||||
|
||||
self.model.with(with_number: with_number(:parent_id, :name))
|
||||
.with_recursive(arel_table.name => [
|
||||
with_number.project(
|
||||
with_number[Arel.star],
|
||||
with_number.cast(with_number[:number], 'BINARY').as('path')
|
||||
).where(with_number[root && include_root ? :id : :parent_id].eq(root)),
|
||||
with_number.project(
|
||||
with_number[Arel.star],
|
||||
arel_table[:path].concat(with_number[:number])
|
||||
).join(arel_table).on(with_number[:parent_id].eq(arel_table[:id]))
|
||||
])
|
||||
self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(arel_table.name => [
|
||||
numbered.project(
|
||||
numbered[Arel.star],
|
||||
numbered.cast(numbered[:child_number], 'BINARY').as('path')
|
||||
).where(numbered[root && include_root ? :id : :parent_id].eq(root)),
|
||||
numbered.project(
|
||||
numbered[Arel.star],
|
||||
arel_table[:path].concat(numbered[:child_number])
|
||||
).join(arel_table).on(numbered[:parent_id].eq(arel_table[:id]))
|
||||
]).order(arel_table[:path])
|
||||
}
|
||||
|
||||
# TODO: extract named functions to custom Arel extension
|
||||
# NOTE: once recursive queries allow use of window functions, this scope can
|
||||
# be merged with :ordered
|
||||
# https://gist.github.com/ProGM/c6df08da14708dcc28b5ca325df37ceb#extending-arel
|
||||
scope :with_number, ->(parent_column, order_column) {
|
||||
scope :numbered, ->(parent_column, order_column) {
|
||||
select(
|
||||
arel_table[Arel.star],
|
||||
Arel::Nodes::NamedFunction.new(
|
||||
@@ -113,12 +92,12 @@ class Quantity < ApplicationRecord
|
||||
).from(arel_table),
|
||||
Arel::Nodes.build_quoted('0')
|
||||
],
|
||||
).as('number')
|
||||
).as('child_number')
|
||||
)
|
||||
}
|
||||
|
||||
def to_s
|
||||
tag.pre name
|
||||
name
|
||||
end
|
||||
|
||||
def to_s_with_depth
|
||||
@@ -151,17 +130,15 @@ class Quantity < ApplicationRecord
|
||||
.order(arel_table[:depth].desc)
|
||||
}
|
||||
|
||||
# Return: succeeding record in order of appearance, used for partial view reload.
|
||||
# TODO: add scope returning succeeding element for multiple records
|
||||
def succeeding
|
||||
# Return: successive record in order of appearance; used for partial view reload
|
||||
def successive
|
||||
quantities = Quantity.arel_table
|
||||
Quantity.with(lagging_quantities: user.quantities.with_path.select(
|
||||
quantities[Arel.star],
|
||||
# For SQLite 'OVER () ORDER BY x' is not equivalent to 'OVER (ORDER BY x)'.
|
||||
Arel::Nodes::NamedFunction.new('LAG', [quantities[:id]])
|
||||
.over(Arel::Nodes::Window.new.order(Quantity.ordered.order_values)).as('lag_id')
|
||||
)).from(Arel::Table.new(:lagging_quantities).as(:quantities))
|
||||
.where(quantities[:lag_id].eq(id)).take
|
||||
Quantity.with(
|
||||
quantities: user.quantities.ordered.select(
|
||||
quantities[Arel.star],
|
||||
Arel::Nodes::NamedFunction.new('LAG', [quantities[:id]]).over.as('lag_id')
|
||||
)
|
||||
).where(quantities[:lag_id].eq(id)).first
|
||||
end
|
||||
|
||||
def with_progenies
|
||||
|
||||
@@ -4,6 +4,4 @@ class Readout < ApplicationRecord
|
||||
belongs_to :user
|
||||
belongs_to :quantity
|
||||
belongs_to :unit
|
||||
|
||||
# TODO: validate quantity.user_id == unit.user_id != NULL
|
||||
end
|
||||
|
||||
+21
-21
@@ -1,10 +1,8 @@
|
||||
class Unit < ApplicationRecord
|
||||
ATTRIBUTES = {unit: [:symbol, :description, :multiplier, :base_id]}
|
||||
ATTRIBUTES = [:symbol, :description, :multiplier, :base_id]
|
||||
|
||||
belongs_to :user, optional: true
|
||||
belongs_to :base, optional: true, class_name: "Unit"
|
||||
# TODO: use #alias_attribute after Rails upgrade?
|
||||
alias_method :parent, :base
|
||||
has_many :subunits, class_name: "Unit", inverse_of: :base,
|
||||
dependent: :restrict_with_error
|
||||
|
||||
@@ -16,8 +14,8 @@ class Unit < ApplicationRecord
|
||||
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
||||
length: {maximum: type_for_attribute(:symbol).limit}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||
validates :multiplier, numericality: {equal_to: 1.0}, unless: :base
|
||||
validates :multiplier, numericality: {greater_than: 0.0}, if: :base
|
||||
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
||||
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
||||
|
||||
scope :defaults, ->{ where(user: nil) }
|
||||
scope :defaults_diff, ->{
|
||||
@@ -79,21 +77,23 @@ class Unit < ApplicationRecord
|
||||
.from(units).group(:base_id, :symbol)
|
||||
}
|
||||
scope :ordered, ->{
|
||||
left_outer_joins(:base).order([
|
||||
arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
||||
arel_table[:base_id].not_eq(nil),
|
||||
arel_table[:multiplier],
|
||||
arel_table[:symbol]
|
||||
])
|
||||
left_outer_joins(:base).order(ordering)
|
||||
}
|
||||
|
||||
def self.ordering
|
||||
[arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
||||
arel_table[:base_id].not_eq(nil),
|
||||
:multiplier,
|
||||
:symbol]
|
||||
end
|
||||
|
||||
before_destroy do
|
||||
# TODO: disallow destruction if any object depends on this unit
|
||||
nil
|
||||
end
|
||||
|
||||
def to_s
|
||||
tag.pre symbol
|
||||
symbol
|
||||
end
|
||||
|
||||
def movable?
|
||||
@@ -104,21 +104,21 @@ class Unit < ApplicationRecord
|
||||
user_id.nil?
|
||||
end
|
||||
|
||||
# Should only by invoked on Units returned from #defaults_diff which are #portable.
|
||||
# Should only by invoked on Units returned from #defaults_diff which are #portable
|
||||
def port!(recipient)
|
||||
recipient_base = base && Unit.find_by!(symbol: base.symbol, user: recipient)
|
||||
params = slice(ATTRIBUTES[:unit] - [:symbol, :base_id])
|
||||
params = slice(ATTRIBUTES - [:symbol, :base_id])
|
||||
Unit.find_or_initialize_by(user: recipient, symbol: symbol)
|
||||
.update!(base: recipient_base, **params)
|
||||
end
|
||||
|
||||
def succeeding
|
||||
def successive
|
||||
units = Unit.arel_table
|
||||
Unit.with(lagging_units: user.units.left_outer_joins(:base).select(
|
||||
units[Arel.star],
|
||||
Arel::Nodes::NamedFunction.new('LAG', [units[:id]])
|
||||
.over(Arel::Nodes::Window.new.order(Unit.ordered.order_values)).as('lag_id')
|
||||
)).from(Arel::Table.new(:lagging_units).as(:units))
|
||||
.where(units[:lag_id].eq(id)).take
|
||||
lead = Arel::Nodes::NamedFunction.new('LAG', [units[:id]])
|
||||
window = Arel::Nodes::Window.new.order(*Unit.ordering)
|
||||
lag_id = lead.over(window).as('lag_id')
|
||||
Unit.with(
|
||||
units: user.units.left_outer_joins(:base).select(units[Arel.star], lag_id)
|
||||
).where(units[:lag_id].eq(id)).first
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
<%= turbo_stream.validate_form dom_target(*@target, :form) do %>
|
||||
<% @record.errors.attribute_names.map do |attr| %>
|
||||
<%= tag.span data: {name: field_name(dom_class(@record), attr)} do %>
|
||||
<%- @record.errors.full_messages_for(attr).map { |m| m + '.' }.join(' ') %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
@@ -5,7 +5,7 @@
|
||||
</td>
|
||||
|
||||
<% if current_user.at_least(:active) %>
|
||||
<td class="flex">
|
||||
<td class="actions">
|
||||
<% unless unit.portable.nil? %>
|
||||
<% if unit.default? %>
|
||||
<%= image_button_to_if unit.portable?, t('.import'), 'download-outline',
|
||||
|
||||
@@ -23,10 +23,10 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header class="flex">
|
||||
<header class="hflex">
|
||||
<%= image_link_to t(".source_code"), "code-braces", source_code_url %>
|
||||
<%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url,
|
||||
class: "rextend" %>
|
||||
class: "extendedright" %>
|
||||
<% if user_signed_in? %>
|
||||
<%= image_link_to_unless_current(current_user, "account-wrench-outline",
|
||||
edit_user_registration_path) %>
|
||||
@@ -44,7 +44,7 @@
|
||||
</header>
|
||||
|
||||
<div id="flashes">
|
||||
<%= render_flash %>
|
||||
<%= render_flash_messages %>
|
||||
</div>
|
||||
|
||||
<%# Allows overwriting/clearing navigation menu for some views %>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<%# Render unconditionally, to clear previous flash messages. %>
|
||||
<%= turbo_stream.update :flashes do %>
|
||||
<%= render_flash %>
|
||||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
|
||||
<%# Some views may convert ActiveRecord errors to flashes, render at the end. %>
|
||||
<%= turbo_stream.update :flashes do %>
|
||||
<%= render_flash_messages %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<%= tabular_form_with model: Measurement.new, id: :measurement_form,
|
||||
class: 'topside-area flex vertical center',
|
||||
class: 'topside-area vflex centered',
|
||||
html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
||||
|
||||
<table class="items-table center">
|
||||
<table class="items-table centered">
|
||||
<tbody id="readouts">
|
||||
<%= tabular_fields_for @measurement do |form| %>
|
||||
<tr class="italic">
|
||||
<td class="hexpand hmin50"><%= t '.taken_at_html' %></td>
|
||||
<td colspan="3" class="ralign">
|
||||
<td colspan="3" class="number">
|
||||
<%= form.datetime_field :taken_at, required: true %>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -16,11 +16,10 @@
|
||||
</table>
|
||||
|
||||
<%# TODO: right-click selection; unnecessary with hierarchical tags? %>
|
||||
<details id="quantity_select" class="center hexpand" open
|
||||
<details id="quantity_select" class="centered hexpand" open
|
||||
onkeydown="detailsProcessKey(event)">
|
||||
<summary autofocus>
|
||||
<%# TODO: Set content with CSS when span empty to avoid duplication; or
|
||||
change to disabled input with prompt %>
|
||||
<!-- TODO: Set content with CSS when span empty to avoid duplication -->
|
||||
<span data-prompt="<%= t('.select_quantity') %>">
|
||||
<%= t('.select_quantity') %>
|
||||
</span>
|
||||
@@ -31,10 +30,10 @@
|
||||
<ul><%= quantities_check_boxes(@quantities) %></ul>
|
||||
</details>
|
||||
|
||||
<div class="flex reverse">
|
||||
<div class="hflex reverse">
|
||||
<%= form.button id: :create_measurement_button, disabled: true -%>
|
||||
<%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
|
||||
class: 'auxiliary dangerous', onclick: render_turbo_stream('form_close') %>
|
||||
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
|
||||
@@ -3,14 +3,17 @@
|
||||
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
||||
|
||||
<td style="--depth:<%= @quantity.depth %>">
|
||||
<%= form.text_field :name, autofocus: true, class: 'hstretch', required: true %>
|
||||
<td><%= form.text_area :description, class: 'hstretch', escape: false, rows: 1 %>
|
||||
|
||||
<td class="flex">
|
||||
<%= form.button %>
|
||||
<%= image_link_to t(:cancel), "close-outline", quantities_path,
|
||||
class: 'dangerous', name: :cancel,
|
||||
onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||
<%= form.text_field :name, required: true, autofocus: true, size: 20 %>
|
||||
</td>
|
||||
<td>
|
||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||
</td>
|
||||
|
||||
<td class="actions">
|
||||
<%= form.button %>
|
||||
<%= image_link_to t(:cancel), "close-outline", quantities_path, class: 'dangerous',
|
||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||
</td>
|
||||
<td></td>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
<tr id="<%= dom_target(quantity) %>"
|
||||
ondragstart="dragStart(event)" ondragend="dragEnd(event)"
|
||||
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||
data-drag-path="<%= reparent_quantity_path(quantity) %>"
|
||||
data-drop-id="<%= dom_target(quantity) %>"
|
||||
data-drop-id-param="<%= field_name(:quantity, :parent_id) %>">
|
||||
<%= tag.tr id: dom_id(quantity),
|
||||
ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
|
||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||
data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
|
||||
drop_id_param: "quantity[parent_id]"} do %>
|
||||
|
||||
<td style="--depth:<%= quantity.depth %>">
|
||||
<%= link_to quantity, edit_quantity_path(quantity), class: 'link',
|
||||
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
<td><%= quantity.description %>
|
||||
<td class="link" style="--depth:<%= quantity.depth %>">
|
||||
<%= link_to quantity, edit_quantity_path(quantity), onclick: 'this.blur();',
|
||||
data: {turbo_stream: true} %>
|
||||
</td>
|
||||
<td><%= quantity.description %></td>
|
||||
|
||||
<% if current_user.at_least(:active) %>
|
||||
<td class="flex">
|
||||
<%= image_link_to t('.new_subquantity'), 'plus-outline',
|
||||
new_quantity_path(quantity), id: dom_target(:new, quantity, :link),
|
||||
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
<td class="actions">
|
||||
<%= image_link_to t('.new_subquantity'), 'plus-outline', new_quantity_path(quantity),
|
||||
id: dom_id(quantity, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
|
||||
<%= image_button_to_if quantity.destroyable?, t('.destroy'), 'delete-outline',
|
||||
quantity_path(quantity), method: :delete %>
|
||||
|
||||
<td class="handle" draggable="true">⠿
|
||||
</td>
|
||||
<td class="handle" draggable="true">⠿</td>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<%= turbo_stream.close_form dom_target(:new, @quantity.parent || :quantity) %>
|
||||
<%= turbo_stream.close_form dom_id(@quantity.parent || Quantity, :new) %>
|
||||
<%= turbo_stream.remove :no_items %>
|
||||
<% @ancestors.each do |ancestor| %>
|
||||
<%= turbo_stream.replace ancestor %>
|
||||
<% end %>
|
||||
<%= turbo_stream.before @before || :endmark, @quantity %>
|
||||
<%= @before ? turbo_stream.before(@before, @quantity) :
|
||||
turbo_stream.append(:quantities, @quantity) %>
|
||||
|
||||
@@ -2,3 +2,4 @@
|
||||
<%= turbo_stream.replace ancestor %>
|
||||
<% end %>
|
||||
<%= turbo_stream.remove @quantity %>
|
||||
<%= turbo_stream.append(:quantities, render_no_items) if current_user.quantities.empty? %>
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
<% ids = {row: dom_target(:edit, @quantity),
|
||||
hidden_row: dom_target(@quantity),
|
||||
<% ids = {row: dom_id(@quantity, :edit),
|
||||
hidden_row: dom_id(@quantity),
|
||||
link: nil,
|
||||
form_tag: dom_target(:edit, @quantity, :form)} %>
|
||||
form_tag: dom_id(@quantity, :edit, :form)} %>
|
||||
|
||||
<%= turbo_stream.append_all 'body' do %>
|
||||
<%= turbo_stream.append :quantity_form do %>
|
||||
<%- tabular_form_with model: @quantity, html: {id: ids[:form_tag]} do %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= turbo_stream.hide ids[:hidden_row] %>
|
||||
<%= turbo_stream.remove ids[:row] %>
|
||||
<%= turbo_stream.after @quantity, partial: 'form', locals: ids -%>
|
||||
|
||||
@@ -1,31 +1,34 @@
|
||||
<div class="rightside-area buttongrid">
|
||||
<% if current_user.at_least(:active) %>
|
||||
<%= image_link_to t('.new_quantity'), 'plus-outline', new_quantity_path,
|
||||
id: :new_quantity_link, onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
id: dom_id(Quantity, :new, :link), onclick: 'this.blur();',
|
||||
data: {turbo_stream: true} %>
|
||||
<% end %>
|
||||
<%#= image_link_to t('.import_quantities'), 'download-outline',
|
||||
default_quantities_path, class: 'tools-area' %>
|
||||
<%#= image_link_to t('.import_quantities'), 'download-outline', default_quantities_path,
|
||||
class: 'tools-area' %>
|
||||
</div>
|
||||
|
||||
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
||||
<%= tag.div class: 'main-area', id: :quantity_form %>
|
||||
|
||||
<table class="main-area items-table">
|
||||
<caption class="hint"><%= t '.no_items' %></caption>
|
||||
|
||||
<tbody>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="hmintext"><%= Quantity.human_attribute_name(:name) %>
|
||||
<th class="hexpand"><%= Quantity.human_attribute_name(:description) %>
|
||||
<% if current_user.at_least(:active) %>
|
||||
<th><%= t :actions %>
|
||||
<th>
|
||||
|
||||
<tr id="quantity_" hidden
|
||||
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||
data-drop-id="quantity_"
|
||||
data-drop-id-param="<%= field_name(:quantity, :parent_id) %>">
|
||||
<th colspan="4"><%= t '.top_level_drop' %>
|
||||
<th><%= Quantity.human_attribute_name(:name) %></th>
|
||||
<th><%= Quantity.human_attribute_name(:description) %></th>
|
||||
<% if current_user.at_least(:active) %>
|
||||
<th><%= t :actions %></th>
|
||||
<th></th>
|
||||
<% end %>
|
||||
</tr>
|
||||
<%= tag.tr id: "quantity_", hidden: true,
|
||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||
data: {drop_id: "quantity_", drop_id_param: "quantity[parent_id]"} do %>
|
||||
<th colspan="4"><%= t '.top_level_drop' %></th>
|
||||
<% end %>
|
||||
|
||||
<%= render @quantities %>
|
||||
<tr id="endmark" hidden>
|
||||
</thead>
|
||||
<tbody id="quantities">
|
||||
<%= render(@quantities) || render_no_items %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
<% target_id = dom_target(:new, @quantity.parent || :quantity) %>
|
||||
<% ids = {row: target_id,
|
||||
<% dom_obj = @quantity.parent || @quantity %>
|
||||
<% ids = {row: dom_id(dom_obj, :new),
|
||||
hidden_row: nil,
|
||||
link: dom_target(target_id, :link),
|
||||
form_tag: dom_target(target_id, :form)} %>
|
||||
link: dom_id(dom_obj, :new, :link),
|
||||
form_tag: dom_id(dom_obj, :new, :form)} %>
|
||||
|
||||
<%= turbo_stream.disable ids[:link] -%>
|
||||
|
||||
<%= turbo_stream.append_all 'body' do %>
|
||||
<%= turbo_stream.append :quantity_form do %>
|
||||
<%- tabular_form_with model: @quantity, html: {id: ids[:form_tag]} do |form| %>
|
||||
<%= form.hidden_field :parent_id if @quantity.parent_id? %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= turbo_stream.after @quantity.parent || :quantity_, partial: 'form', locals: ids %>
|
||||
<% if @quantity.parent_id? %>
|
||||
<%= turbo_stream.remove ids[:row] %>
|
||||
<%= turbo_stream.after @quantity.parent, partial: 'form', locals: ids %>
|
||||
<% else %>
|
||||
<%= turbo_stream.prepend :quantities, partial: 'form', locals: ids %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
<% @self_and_progenies.each do |q| %>
|
||||
<%= turbo_stream.remove q %>
|
||||
<% end %>
|
||||
<% @previous_ancestors.union(@ancestors).each do |ancestor| %>
|
||||
<%= turbo_stream.replace ancestor %>
|
||||
<% end %>
|
||||
<% @quantities.each do |quantity| %>
|
||||
<%= turbo_stream.remove quantity %>
|
||||
<%= turbo_stream.before @before || :endmark, quantity %>
|
||||
<% @self_and_progenies.each do |q| %>
|
||||
<%= @before ? turbo_stream.before(@before, q) : turbo_stream.append(:quantities, q) %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= turbo_stream.close_form dom_target(:edit, @quantity) %>
|
||||
<%= turbo_stream.close_form dom_id(@quantity, :edit) %>
|
||||
<% @ancestors.push(@quantity).each do |ancestor| %>
|
||||
<%= turbo_stream.replace ancestor %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
<%# TODO: add readout reordering by dragging %>
|
||||
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
||||
<%- tag.tr id: dom_target(:new, readout.quantity, :readout) do %>
|
||||
<%- tag.tr id: dom_id(readout.quantity, :new, :readout) do %>
|
||||
<td>
|
||||
<%# TODO: add grayed readout index (in separate column?) %>
|
||||
<%= readout.quantity.relative_pathname(@superquantity) %>
|
||||
<%= form.hidden_field :quantity_id %>
|
||||
</td>
|
||||
<td>
|
||||
<%= form.number_field :value, required: true, autofocus: readout_counter == 0 %>
|
||||
</td>
|
||||
<td>
|
||||
<%= form.hidden_field :quantity_id %>
|
||||
<%= form.collection_select :unit_id, @user_units, :id,
|
||||
->(u){ sanitize(' ' * (u.base_id ? 1 : 0) + u.symbol) },
|
||||
{prompt: '', disabled: '', selected: ''}, required: true %>
|
||||
</td>
|
||||
<td class="flex">
|
||||
<td class="actions">
|
||||
<%# TODO: change to _link_ after giving up displaying relative paths %>
|
||||
<%= image_button_tag '', 'delete-outline', class: 'dangerous', name: nil,
|
||||
formaction: discard_readouts_path(readout.quantity),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<%= turbo_stream.update(:measurement_form_legend) { @superquantity&.pathname } %>
|
||||
|
||||
<% @prev_quantities.each do |pq| %>
|
||||
<%= turbo_stream.update dom_target(pq, :pathname) do %>
|
||||
<%= turbo_stream.update dom_id(pq, nil, :pathname) do %>
|
||||
<%= pq.relative_pathname(@superquantity) %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= turbo_stream.disable :create_measurement_button if @prev_quantities.one? %>
|
||||
<%= turbo_stream.remove dom_target(:new, @quantity, :readout) %>
|
||||
<%= turbo_stream.remove dom_id(@quantity, :new, :readout) %>
|
||||
<%= render partial: 'form_repath' %>
|
||||
<%= turbo_stream.unselect dom_target(@quantity) %>
|
||||
<%= turbo_stream.unselect dom_id(@quantity) %>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<% @readouts.each do |r| %>
|
||||
<%= turbo_stream.disable dom_target(r.quantity) %>
|
||||
<%= turbo_stream.disable dom_id(r.quantity) %>
|
||||
<% end %>
|
||||
<%= render partial: 'form_repath' %>
|
||||
<%= turbo_stream.append :readouts do %>
|
||||
|
||||
@@ -3,17 +3,20 @@
|
||||
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
||||
|
||||
<td style="--depth:<%= @unit.base_id? ? 1 : 0 %>">
|
||||
<%= form.text_field :symbol, autofocus: true, class: 'hstretch', required: true %>
|
||||
<%= form.text_field :symbol, required: true, autofocus: true, size: 12 %>
|
||||
</td>
|
||||
<td>
|
||||
<% if @unit.base_id? %>
|
||||
<%= form.number_field :multiplier, class: 'hstretch', required: true %>
|
||||
<% end %>
|
||||
<td><%= form.text_area :description, class: 'hstretch', escape: false, rows: 1 %>
|
||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||
</td>
|
||||
<td class="number">
|
||||
<%= form.number_field :multiplier, required: true, size: 10, min: :step if @unit.base_id? %>
|
||||
</td>
|
||||
|
||||
<td class="flex">
|
||||
<td class="actions">
|
||||
<%= form.button %>
|
||||
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||
<td>
|
||||
</td>
|
||||
<td></td>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,32 +1,31 @@
|
||||
<tr id="<%= dom_target(unit) %>"
|
||||
ondragstart="dragStart(event)" ondragend="dragEnd(event)"
|
||||
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||
data-drag-path="<%= rebase_unit_path(unit) %>"
|
||||
data-drop-id="<%= dom_target(unit.base || unit) %>"
|
||||
data-drop-id-param="<%= field_name(:unit, :base_id) %>">
|
||||
<%= tag.tr id: dom_id(unit),
|
||||
ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
|
||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||
data: {drag_path: rebase_unit_path(unit),
|
||||
drop_id: dom_id(unit.base || unit),
|
||||
drop_id_param: "unit[base_id]"} do %>
|
||||
|
||||
<td style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
||||
<%= link_to unit, edit_unit_path(unit), class: 'link', onclick: 'this.blur();',
|
||||
data: {turbo_stream: true} %>
|
||||
<%# Closing <td> tag required to avoid whitespace inclusion for testing. %>
|
||||
<td class="ralign"><%= unit.multiplier.to_html if unit.base_id? %></td>
|
||||
<td><%= unit.description %>
|
||||
<td class="link" style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
||||
<%= link_to unit, edit_unit_path(unit), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
</td>
|
||||
<td><%= unit.description %></td>
|
||||
<td class="number"><%= unit.multiplier.to_html %></td>
|
||||
|
||||
<% if current_user.at_least(:active) %>
|
||||
<td class="flex">
|
||||
<td class="actions">
|
||||
<% unless unit.base_id? %>
|
||||
<%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
|
||||
id: dom_target(:new, unit, :link), onclick: 'this.blur();',
|
||||
data: {turbo_stream: true} %>
|
||||
id: dom_id(unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
<% end %>
|
||||
|
||||
<%= image_button_to_if unit.movable?, t('.destroy'), 'delete-outline',
|
||||
unit_path(unit), method: :delete %>
|
||||
|
||||
<%= image_button_to_if unit.movable?, t('.destroy'), 'delete-outline', unit_path(unit),
|
||||
method: :delete %>
|
||||
</td>
|
||||
<% if unit.movable? %>
|
||||
<td class="handle" draggable="true">⠿
|
||||
<td class="handle" draggable="true">⠿</td>
|
||||
<% else %>
|
||||
<td>
|
||||
<td></td>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<%= turbo_stream.close_form dom_target(:new, @unit.base || :unit) %>
|
||||
<%= turbo_stream.close_form dom_id(@unit.base || Unit, :new) %>
|
||||
<%= turbo_stream.remove :no_items %>
|
||||
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
||||
<%= turbo_stream.before @before || :endmark, @unit %>
|
||||
<%= @before ? turbo_stream.before(@before, @unit) : turbo_stream.append(:units, @unit) %>
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
||||
<%= turbo_stream.remove @unit %>
|
||||
<%= turbo_stream.append(:units, render_no_items) if current_user.units.empty? %>
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
<% ids = {row: dom_target(:edit, @unit),
|
||||
hidden_row: dom_target(@unit),
|
||||
<% ids = {row: dom_id(@unit, :edit),
|
||||
hidden_row: dom_id(@unit),
|
||||
link: nil,
|
||||
form_tag: dom_target(:edit, @unit, :form)} %>
|
||||
form_tag: dom_id(@unit, :edit, :form)} %>
|
||||
|
||||
<%= turbo_stream.append_all 'body' do %>
|
||||
<%= turbo_stream.append :unit_form do %>
|
||||
<%- tabular_form_with model: @unit, html: {id: ids[:form_tag]} do %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= turbo_stream.hide ids[:hidden_row] %>
|
||||
<%= turbo_stream.remove ids[:row] %>
|
||||
<%= turbo_stream.after @unit, partial: 'form', locals: ids -%>
|
||||
|
||||
@@ -1,33 +1,34 @@
|
||||
<div class="rightside-area buttongrid">
|
||||
<% if current_user.at_least(:active) %>
|
||||
<%= image_link_to t('.new_unit'), 'plus-outline', new_unit_path,
|
||||
id: :new_unit_link, onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
id: dom_id(Unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
<% end %>
|
||||
<%= image_link_to t('.import_units'), 'download-outline', default_units_path,
|
||||
class: 'tools-area' %>
|
||||
</div>
|
||||
|
||||
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
||||
<%= tag.div id: :unit_form %>
|
||||
|
||||
<table class="main-area items-table">
|
||||
<caption class="hint"><%= t '.no_items' %></caption>
|
||||
|
||||
<tbody>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="hmintext"><%= Unit.human_attribute_name(:symbol) %>
|
||||
<th class="hminnumber"><%= Unit.human_attribute_name(:multiplier) %>
|
||||
<th class="hexpand"><%= Unit.human_attribute_name(:description) %>
|
||||
<% if current_user.at_least(:active) %>
|
||||
<th><%= t :actions %>
|
||||
<th>
|
||||
|
||||
<tr id="unit_" hidden
|
||||
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||
data-drop-id="unit_" data-drop-id-param="<%= field_name(:unit, :base_id) %>">
|
||||
<th colspan="5"><%= t '.top_level_drop' %>
|
||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
||||
<th><%= Unit.human_attribute_name(:description) %></th>
|
||||
<th><%= Unit.human_attribute_name(:multiplier) %></th>
|
||||
<% if current_user.at_least(:active) %>
|
||||
<th><%= t :actions %></th>
|
||||
<th></th>
|
||||
<% end %>
|
||||
</tr>
|
||||
<%= tag.tr id: "unit_", hidden: true,
|
||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||
data: {drop_id: "unit_", drop_id_param: "unit[base_id]"} do %>
|
||||
<th colspan="5"><%= t '.top_level_drop' %></th>
|
||||
<% end %>
|
||||
|
||||
<%= render @units %>
|
||||
<%# Hidden rows with IDs allow simplier row insertion by using only
|
||||
turbo_stream #after/#before instead of #after + #prepend/#before + #append. %>
|
||||
<tr id="endmark" hidden>
|
||||
</thead>
|
||||
<tbody id="units">
|
||||
<%= render(@units) || render_no_items %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
<% target_id = dom_target(:new, @unit.base || :unit) %>
|
||||
<% ids = {row: target_id,
|
||||
<% dom_obj = @unit.base || @unit %>
|
||||
<% ids = {row: dom_id(dom_obj, :new),
|
||||
hidden_row: nil,
|
||||
link: dom_target(target_id, :link),
|
||||
form_tag: dom_target(target_id, :form)} %>
|
||||
link: dom_id(dom_obj, :new, :link),
|
||||
form_tag: dom_id(dom_obj, :new, :form)} %>
|
||||
|
||||
<%= turbo_stream.disable ids[:link] -%>
|
||||
|
||||
<%= turbo_stream.append_all 'body' do %>
|
||||
<%= turbo_stream.append :unit_form do %>
|
||||
<%- tabular_form_with model: @unit, html: {id: ids[:form_tag]} do |form| %>
|
||||
<%= form.hidden_field :base_id if @unit.base_id? %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= turbo_stream.after @unit.base || :unit_, partial: 'form', locals: ids %>
|
||||
<% if @unit.base_id? %>
|
||||
<%= turbo_stream.remove ids[:row] %>
|
||||
<%= turbo_stream.after @unit.base, partial: 'form', locals: ids %>
|
||||
<% else %>
|
||||
<%= turbo_stream.prepend :units, partial: 'form', locals: ids %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<% [@previous_base, @unit.base].uniq.compact.each do |unit| %>
|
||||
<%= turbo_stream.replace unit %>
|
||||
<% end %>
|
||||
<%= turbo_stream.remove @unit %>
|
||||
<%= turbo_stream.before @before || :endmark, @unit %>
|
||||
<%= turbo_stream.replace @previous_base if @previous_base %>
|
||||
<%= turbo_stream.replace @unit.base if @unit.base_id? && (@previous_base.id != @unit.base_id) %>
|
||||
<%= @before ? turbo_stream.before(@before, @unit) : turbo_stream.append(:units, @unit) %>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<%= turbo_stream.close_form dom_target(:edit, @unit) %>
|
||||
<%= turbo_stream.close_form dom_id(@unit, :edit) %>
|
||||
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
||||
<%= turbo_stream.replace @unit %>
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
<th><%= User.human_attribute_name(:email) %></th>
|
||||
<th><%= User.human_attribute_name(:status) %></th>
|
||||
<th><%= User.human_attribute_name(:confirmed_at) %></th>
|
||||
<th><pre><%= User.human_attribute_name(:created_at) %> <sup>(UTC)</sup></pre></th>
|
||||
<th><%= User.human_attribute_name(:created_at) %> <sup>(UTC)</sup></th>
|
||||
<th><%= t :actions %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @users.each do |user| %>
|
||||
<tr>
|
||||
<td><%= link_to user, user_path(user), class: 'link' %></td>
|
||||
<td class="link"><%= link_to user, user_path(user) %></td>
|
||||
<td>
|
||||
<% if user == current_user %>
|
||||
<%= user.status %>
|
||||
@@ -22,9 +22,11 @@
|
||||
<% end %>
|
||||
<% end %>
|
||||
</td>
|
||||
<td><%= svg_tag 'checkbox-marked-outline' if user.confirmed_at.present? %></td>
|
||||
<td><pre><%= l user.created_at, format: :without_tz %></pre></td>
|
||||
<td class="flex">
|
||||
<td class="svg">
|
||||
<%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %>
|
||||
</td>
|
||||
<td><%= l user.created_at, format: :without_tz %></td>
|
||||
<td class="actions">
|
||||
<% if allow_disguise?(user) %>
|
||||
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
||||
<% end %>
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
<%# For some reason flash messages are duplicated in bot flash and flash.now %>
|
||||
<% flash.discard %>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<% content_for :navigation, flush: true do %>
|
||||
<%= link_to svg_tag('arrow-left-bold-outline', t(:back)),
|
||||
<%= link_to svg_tag('pictograms/arrow-left-bold-outline', t(:back)),
|
||||
request.referer.present? ? :back : root_path, class: 'tab' %>
|
||||
<% end %>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<% content_for :navigation, flush: true do %>
|
||||
<%= link_to svg_tag('arrow-left-bold-outline', t(:back)), users_path, class: 'tab' %>
|
||||
<%= link_to svg_tag('pictograms/arrow-left-bold-outline', t(:back)), users_path,
|
||||
class: 'tab' %>
|
||||
<% end %>
|
||||
|
||||
<%= labeled_form_for @user, html: {class: 'main-area'} do |f| %>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
|
||||
</div>
|
||||
|
||||
<div class="flex">
|
||||
<div class="actions">
|
||||
<%= f.submit "Resend unlock instructions" %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/usr/bin/env ruby
|
||||
require_relative "../config/boot"
|
||||
require "active_support/continuous_integration"
|
||||
|
||||
CI = ActiveSupport::ContinuousIntegration
|
||||
require_relative "../config/ci.rb"
|
||||
Executable → Regular
@@ -1,29 +0,0 @@
|
||||
#!/usr/bin/ruby33
|
||||
#
|
||||
# This file was generated by RubyGems.
|
||||
#
|
||||
# The application 'nokogiri' is installed as part of a gem, and
|
||||
# this file is here to facilitate running it.
|
||||
#
|
||||
|
||||
require 'rubygems'
|
||||
|
||||
Gem.use_gemdeps
|
||||
|
||||
version = ">= 0.a"
|
||||
|
||||
str = ARGV.first
|
||||
if str
|
||||
str = str.b[/\A_(.*)_\z/, 1]
|
||||
if str and Gem::Version.correct?(str)
|
||||
version = str
|
||||
ARGV.shift
|
||||
end
|
||||
end
|
||||
|
||||
if Gem.respond_to?(:activate_bin_path)
|
||||
load Gem.activate_bin_path('nokogiri', 'nokogiri', version)
|
||||
else
|
||||
gem "nokogiri", version
|
||||
load Gem.bin_path("nokogiri", "nokogiri", version)
|
||||
end
|
||||
@@ -1,10 +1,11 @@
|
||||
#!/usr/bin/env ruby
|
||||
require "fileutils"
|
||||
|
||||
# path to your application root.
|
||||
APP_ROOT = File.expand_path("..", __dir__)
|
||||
|
||||
def system!(*args)
|
||||
system(*args, exception: true)
|
||||
system(*args) || abort("\n== Command #{args} failed ==")
|
||||
end
|
||||
|
||||
FileUtils.chdir APP_ROOT do
|
||||
@@ -13,6 +14,7 @@ FileUtils.chdir APP_ROOT do
|
||||
# Add necessary setup steps to this file.
|
||||
|
||||
puts "== Installing dependencies =="
|
||||
system! "gem install bundler --conservative"
|
||||
system("bundle check") || system!("bundle install")
|
||||
|
||||
# puts "\n== Copying sample files =="
|
||||
@@ -22,14 +24,10 @@ FileUtils.chdir APP_ROOT do
|
||||
|
||||
puts "\n== Preparing database =="
|
||||
system! "bin/rails db:prepare"
|
||||
system! "bin/rails db:reset" if ARGV.include?("--reset")
|
||||
|
||||
puts "\n== Removing old logs and tempfiles =="
|
||||
system! "bin/rails log:clear tmp:clear"
|
||||
|
||||
unless ARGV.include?("--skip-server")
|
||||
puts "\n== Starting development server =="
|
||||
STDOUT.flush # flush the output before exec(2) so that it displays
|
||||
exec "bin/dev"
|
||||
end
|
||||
puts "\n== Restarting application server =="
|
||||
system! "bin/rails restart"
|
||||
end
|
||||
|
||||
@@ -18,17 +18,14 @@ require "rails/test_unit/railtie"
|
||||
# you've limited to :test, :development, or :production.
|
||||
Bundler.require(*Rails.groups)
|
||||
|
||||
require_relative '../lib/default_settings_strategy'
|
||||
|
||||
module FixinMe
|
||||
class Application < Rails::Application
|
||||
# Initialize configuration defaults for originally generated Rails version.
|
||||
config.load_defaults 8.1
|
||||
config.load_defaults 7.0
|
||||
|
||||
# Please, add to the `ignore` list any other `lib` subdirectories that do
|
||||
# not contain `.rb` files, or that should not be reloaded or eager loaded.
|
||||
# Common ones are `templates`, `generators`, or `middleware`, for example.
|
||||
config.autoload_lib(ignore: %w[assets tasks])
|
||||
# Autoload lib/, required e.g. for core library extensions.
|
||||
# https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#config-autoload-lib-ignore.
|
||||
config.autoload_lib(ignore: %w(assets tasks))
|
||||
|
||||
# Configuration for the application, engines, and railties goes here.
|
||||
#
|
||||
@@ -41,19 +38,16 @@ module FixinMe
|
||||
config.action_dispatch.rescue_responses['ApplicationController::AccessForbidden'] = :forbidden
|
||||
config.action_dispatch.rescue_responses['ApplicationController::ParameterInvalid'] = :unprocessable_entity
|
||||
|
||||
# Set default migrations parameters.
|
||||
config.active_record.migration_strategy = DefaultSettingsStrategy
|
||||
|
||||
# SETUP: Below settings need to be updated on a per-installation basis.
|
||||
#
|
||||
# Set host to be used by links generated in mailer templates.
|
||||
config.action_mailer.default_url_options = {host: 'localhost', protocol: 'https'}
|
||||
# URL to use in sent e-mails.
|
||||
config.action_mailer.default_url_options = {host: 'localhost', :protocol => 'https'}
|
||||
# https://guides.rubyonrails.org/configuring.html#config-action-mailer-delivery-method
|
||||
config.action_mailer.delivery_method = :sendmail
|
||||
|
||||
# List of hosts this app is available at.
|
||||
# https://guides.rubyonrails.org/configuring.html#actiondispatch-hostauthorization
|
||||
config.hosts |= ['localhost']
|
||||
config.hosts += ['localhost', 'example.com', IPAddr.new('1.2.3.4/32')]
|
||||
|
||||
# Email address of admin account
|
||||
config.admin = 'admin@localhost'
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
# Run using bin/ci
|
||||
|
||||
CI.run do
|
||||
step "Setup", "bin/setup --skip-server"
|
||||
|
||||
step "Security: Importmap vulnerability audit", "bin/importmap audit"
|
||||
step "Tests: Rails", "bin/rails test"
|
||||
step "Tests: Seeds", "env RAILS_ENV=test bin/rails db:seed:replant"
|
||||
|
||||
# Optional: Run system tests
|
||||
# step "Tests: System", "bin/rails test:system"
|
||||
|
||||
# Optional: set a green GitHub commit status to unblock PR merge.
|
||||
# Requires the `gh` CLI and `gh extension install basecamp/gh-signoff`.
|
||||
# if success?
|
||||
# step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff"
|
||||
# else
|
||||
# failure "Signoff: CI failed. Do not merge or deploy.", "Fix the issues and try again."
|
||||
# end
|
||||
end
|
||||
+12
-30
@@ -24,45 +24,27 @@
|
||||
# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
|
||||
# for a full overview on how database connection configuration can be specified.
|
||||
default: &default
|
||||
pool: <%= ENV.fetch('RAILS_MAX_THREADS', 3) %>
|
||||
|
||||
#mysql_default: &mysql_default
|
||||
# <<: *default
|
||||
# username: fixinme
|
||||
# password: Some-password1%
|
||||
# host: 127.0.0.1
|
||||
# encoding: utf8mb4
|
||||
# collation: utf8mb4_0900_as_ci
|
||||
adapter: mysql2
|
||||
encoding: utf8mb4
|
||||
collation: utf8mb4_0900_as_ci
|
||||
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
|
||||
username: fixinme
|
||||
password: Some-password1%
|
||||
socket: /run/mysqld/mysqld.sock
|
||||
|
||||
production:
|
||||
<<: *default
|
||||
adapter: sqlite3
|
||||
database: db/production.sqlite3
|
||||
database: fixinme
|
||||
|
||||
# Unless you're planning on developing the application, you can skip/remove
|
||||
# Unless you're planning on developing the application, you can skip
|
||||
# configurations for development and test databases altogether.
|
||||
#development:
|
||||
# <<: *mysql_default
|
||||
# adapter: mysql2
|
||||
# <<: *default
|
||||
# database: fixinme_dev
|
||||
|
||||
# Warning: The database(s) defined as "test" will be erased and
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
# Do not set this db to the same as development or production.
|
||||
#test:
|
||||
# <<: *mysql_default
|
||||
# adapter: mysql2
|
||||
# <<: *default
|
||||
# database: fixinme_test
|
||||
|
||||
# Multiple test databases can be provided. When more than one test db is
|
||||
# present, every test task (test, test:models, test:system, etc.) runs against
|
||||
# all of them.
|
||||
#test:
|
||||
# mysql2:
|
||||
# <<: *mysql_default
|
||||
# adapter: mysql2
|
||||
# database: fixinme_test
|
||||
# sqlite3:
|
||||
# <<: *default
|
||||
# adapter: sqlite3
|
||||
# database: db/test.sqlite3
|
||||
|
||||
@@ -3,8 +3,10 @@ require "active_support/core_ext/integer/time"
|
||||
Rails.application.configure do
|
||||
# Settings specified here will take precedence over those in config/application.rb.
|
||||
|
||||
# Make code changes take effect immediately without server restart.
|
||||
config.enable_reloading = true
|
||||
# In the development environment your application's code is reloaded any time
|
||||
# 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
|
||||
|
||||
# Do not eager load code on boot.
|
||||
config.eager_load = false
|
||||
@@ -12,52 +14,54 @@ Rails.application.configure do
|
||||
# Show full error reports.
|
||||
config.consider_all_requests_local = true
|
||||
|
||||
# Enable server timing.
|
||||
# Enable server timing
|
||||
config.server_timing = true
|
||||
|
||||
# Enable/disable Action Controller caching. By default Action Controller caching is disabled.
|
||||
# Run rails dev:cache to toggle Action Controller caching.
|
||||
# Enable/disable caching. By default caching is disabled.
|
||||
# Run rails dev:cache to toggle caching.
|
||||
if Rails.root.join("tmp/caching-dev.txt").exist?
|
||||
config.action_controller.perform_caching = true
|
||||
config.action_controller.enable_fragment_cache_logging = true
|
||||
config.public_file_server.headers = { "cache-control" => "public, max-age=#{2.days.to_i}" }
|
||||
|
||||
config.cache_store = :memory_store
|
||||
config.public_file_server.headers = {
|
||||
"Cache-Control" => "public, max-age=#{2.days.to_i}"
|
||||
}
|
||||
else
|
||||
config.action_controller.perform_caching = false
|
||||
end
|
||||
|
||||
# Change to :null_store to avoid any caching.
|
||||
config.cache_store = :memory_store
|
||||
config.cache_store = :null_store
|
||||
end
|
||||
|
||||
# Don't care if the mailer can't send.
|
||||
config.action_mailer.raise_delivery_errors = false
|
||||
|
||||
# Make template changes take effect immediately.
|
||||
config.action_mailer.perform_caching = false
|
||||
|
||||
# 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
|
||||
|
||||
# Highlight code that triggered database queries in logs.
|
||||
config.active_record.verbose_query_logs = true
|
||||
|
||||
# Append comments with runtime information tags to SQL queries in logs.
|
||||
config.active_record.query_log_tags_enabled = true
|
||||
|
||||
# Highlight code that enqueued background job in logs.
|
||||
config.active_job.verbose_enqueue_logs = true
|
||||
|
||||
# Highlight code that triggered redirect in logs.
|
||||
config.action_dispatch.verbose_redirect_logs = true
|
||||
# Suppress logger output for asset requests.
|
||||
config.assets.quiet = true
|
||||
|
||||
# Raises error for missing translations.
|
||||
# config.i18n.raise_on_missing_translations = true
|
||||
|
||||
# Annotate rendered view with file names.
|
||||
config.action_view.annotate_rendered_view_with_filenames = true
|
||||
# config.action_view.annotate_rendered_view_with_filenames = true
|
||||
|
||||
# Raise error when a before_action's only/except options reference missing actions.
|
||||
config.action_controller.raise_on_missing_callback_actions = true
|
||||
# Uncomment if you wish to allow Action Cable access from any origin.
|
||||
# config.action_cable.disable_request_forgery_protection = true
|
||||
end
|
||||
|
||||
@@ -4,83 +4,78 @@ Rails.application.configure do
|
||||
# Settings specified here will take precedence over those in config/application.rb.
|
||||
|
||||
# Code is not reloaded between requests.
|
||||
config.enable_reloading = false
|
||||
config.cache_classes = true
|
||||
|
||||
# Eager load code on boot for better performance and memory savings (ignored by Rake tasks).
|
||||
# Eager load code on boot. This eager loads most of Rails and
|
||||
# your application in memory, allowing both threaded web servers
|
||||
# and those relying on copy on write to perform better.
|
||||
# Rake tasks automatically ignore this option for performance.
|
||||
config.eager_load = true
|
||||
|
||||
# Full error reports are disabled.
|
||||
config.consider_all_requests_local = false
|
||||
|
||||
# Turn on fragment caching in view templates.
|
||||
# Full error reports are disabled and caching is turned on.
|
||||
config.consider_all_requests_local = false
|
||||
config.action_controller.perform_caching = true
|
||||
|
||||
# Cache assets for far-future expiry since they are all digest stamped.
|
||||
config.public_file_server.headers = { "cache-control" => "public, max-age=#{1.year.to_i}" }
|
||||
# Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
|
||||
# or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
|
||||
# config.require_master_key = true
|
||||
|
||||
# Disable serving static files from the `/public` folder by default since
|
||||
# Apache or NGINX already handles this.
|
||||
config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
|
||||
|
||||
# Compress CSS using a preprocessor.
|
||||
# config.assets.css_compressor = :sass
|
||||
|
||||
# Do not fallback to assets pipeline if a precompiled asset is missed.
|
||||
config.assets.compile = false
|
||||
|
||||
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
|
||||
# config.asset_host = "http://assets.example.com"
|
||||
|
||||
# Assume all access to the app is happening through a SSL-terminating reverse proxy.
|
||||
config.assume_ssl = true
|
||||
# Specifies the header that your server uses for sending files.
|
||||
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
|
||||
# config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
|
||||
|
||||
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
|
||||
config.force_ssl = true
|
||||
# config.force_ssl = true
|
||||
|
||||
# Skip http-to-https redirect for the default health check endpoint.
|
||||
# config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
|
||||
# Include generic and useful information about system operation, but avoid logging too much
|
||||
# information to avoid inadvertent exposure of personally identifiable information (PII).
|
||||
config.log_level = :info
|
||||
|
||||
# Log to STDOUT with the current request id as a default log tag.
|
||||
# Prepend all log lines with the following tags.
|
||||
config.log_tags = [ :request_id ]
|
||||
config.logger = ActiveSupport::TaggedLogging.logger(STDOUT)
|
||||
|
||||
# Change to "debug" to log everything (including potentially personally-identifiable information!).
|
||||
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
|
||||
|
||||
# Prevent health checks from clogging up the logs.
|
||||
config.silence_healthcheck_path = "/up"
|
||||
|
||||
# Don't log any deprecations.
|
||||
config.active_support.report_deprecations = false
|
||||
|
||||
# Replace the default in-process memory cache store with a durable alternative.
|
||||
# Use a different cache store in production.
|
||||
# config.cache_store = :mem_cache_store
|
||||
|
||||
# Replace the default in-process and non-durable queuing backend for Active Job.
|
||||
# config.active_job.queue_adapter = :resque
|
||||
config.action_mailer.perform_caching = false
|
||||
|
||||
# Ignore bad email addresses and do not raise email delivery errors.
|
||||
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
|
||||
# config.action_mailer.raise_delivery_errors = false
|
||||
|
||||
# Specify outgoing SMTP server. Remember to add smtp/* credentials via bin/rails credentials:edit.
|
||||
# config.action_mailer.smtp_settings = {
|
||||
# user_name: Rails.application.credentials.dig(:smtp, :user_name),
|
||||
# password: Rails.application.credentials.dig(:smtp, :password),
|
||||
# address: "smtp.example.com",
|
||||
# port: 587,
|
||||
# authentication: :plain
|
||||
# }
|
||||
|
||||
# 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 = true
|
||||
|
||||
# Don't log any deprecations.
|
||||
config.active_support.report_deprecations = false
|
||||
|
||||
# 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"
|
||||
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
|
||||
|
||||
if ENV["RAILS_LOG_TO_STDOUT"].present?
|
||||
logger = ActiveSupport::Logger.new(STDOUT)
|
||||
logger.formatter = config.log_formatter
|
||||
config.logger = ActiveSupport::TaggedLogging.new(logger)
|
||||
end
|
||||
|
||||
# Do not dump schema after migrations.
|
||||
config.active_record.dump_schema_after_migration = false
|
||||
|
||||
# Only use :id for inspections in production.
|
||||
config.active_record.attributes_for_inspect = [ :id ]
|
||||
|
||||
# Enable DNS rebinding protection and other `Host` header attacks.
|
||||
# config.hosts = [
|
||||
# "example.com", # Allow requests from example.com
|
||||
# /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
|
||||
# ]
|
||||
#
|
||||
# Skip DNS rebinding protection for the default health check endpoint.
|
||||
# config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
|
||||
|
||||
# Protect e-mail addresses from being logged only in production.
|
||||
config.filter_parameters += [:email]
|
||||
end
|
||||
|
||||
+27
-20
@@ -1,3 +1,5 @@
|
||||
require "active_support/core_ext/integer/time"
|
||||
|
||||
# The test environment is used exclusively to run your application's
|
||||
# test suite. You never need to work with it otherwise. Remember that
|
||||
# your test database is "scratch space" for the test suite and is wiped
|
||||
@@ -6,49 +8,54 @@
|
||||
Rails.application.configure do
|
||||
# Settings specified here will take precedence over those in config/application.rb.
|
||||
|
||||
# While tests run files are not watched, reloading is not necessary.
|
||||
config.enable_reloading = false
|
||||
# Turn false under Spring and add config.action_view.cache_template_loading = true.
|
||||
config.cache_classes = true
|
||||
|
||||
# Eager loading loads your entire application. When running a single test locally,
|
||||
# this is usually not necessary, and can slow down your test suite. However, it's
|
||||
# recommended that you enable it in continuous integration systems to ensure eager
|
||||
# loading is working properly before deploying your code.
|
||||
# Eager loading loads your whole application. When running a single test locally,
|
||||
# this probably isn't necessary. It's a good idea to do in a continuous integration
|
||||
# system, or in some way before deploying your code.
|
||||
config.eager_load = ENV["CI"].present?
|
||||
|
||||
# Configure public file server for tests with cache-control for performance.
|
||||
config.public_file_server.headers = { "cache-control" => "public, max-age=3600" }
|
||||
# Configure public file server for tests with Cache-Control for performance.
|
||||
config.public_file_server.enabled = true
|
||||
config.public_file_server.headers = {
|
||||
"Cache-Control" => "public, max-age=#{1.hour.to_i}"
|
||||
}
|
||||
|
||||
# Behave as in `production`.
|
||||
config.consider_all_requests_local = false
|
||||
# Hide full error reports.
|
||||
config.consider_all_requests_local = false
|
||||
# Render exception templates instead of raising exceptions.
|
||||
config.action_dispatch.show_exceptions = :all
|
||||
|
||||
# Disable caching.
|
||||
config.action_controller.perform_caching = false
|
||||
config.cache_store = :null_store
|
||||
|
||||
# Disable request forgery protection in test environment.
|
||||
config.action_controller.allow_forgery_protection = false
|
||||
|
||||
config.action_mailer.perform_caching = false
|
||||
|
||||
# Tell Action Mailer not to deliver emails to the real world.
|
||||
# The :test delivery method accumulates sent emails in the
|
||||
# ActionMailer::Base.deliveries array.
|
||||
config.action_mailer.delivery_method = :test
|
||||
|
||||
# Set host to be used by links generated in mailer templates.
|
||||
config.action_mailer.default_url_options = {host: Capybara.server_host,
|
||||
protocol: 'http'}
|
||||
config.action_mailer.default_url_options = {host: '127.0.0.1', :protocol => 'http'}
|
||||
|
||||
# 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.i18n.raise_on_missing_translations = true
|
||||
|
||||
# Annotate rendered view with file names.
|
||||
# config.action_view.annotate_rendered_view_with_filenames = true
|
||||
|
||||
# Raise error when a before_action's only/except options reference missing actions.
|
||||
config.action_controller.raise_on_missing_callback_actions = true
|
||||
|
||||
# Allow Capybara application server IP
|
||||
config.hosts |= [IPAddr.new(Capybara.server_host)]
|
||||
|
||||
config.log_level = :info
|
||||
end
|
||||
|
||||
@@ -5,3 +5,8 @@ Rails.application.config.assets.version = "1.0"
|
||||
|
||||
# Add additional assets to the asset load path.
|
||||
# Rails.application.config.assets.paths << Emoji.images_path
|
||||
|
||||
# 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( '*.svg' )
|
||||
|
||||
@@ -16,13 +16,9 @@
|
||||
# # policy.report_uri "/csp-violation-report-endpoint"
|
||||
# end
|
||||
#
|
||||
# # Generate session nonces for permitted importmap, inline scripts, and inline styles.
|
||||
# # Generate session nonces for permitted importmap and inline scripts
|
||||
# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
|
||||
# config.content_security_policy_nonce_directives = %w(script-src style-src)
|
||||
#
|
||||
# # Automatically add `nonce` to `javascript_tag`, `javascript_include_tag`, and `stylesheet_link_tag`
|
||||
# # if the corresponding directives are specified in `content_security_policy_nonce_directives`.
|
||||
# # config.content_security_policy_nonce_auto = true
|
||||
# config.content_security_policy_nonce_directives = %w(script-src)
|
||||
#
|
||||
# # Report violations without enforcing the policy.
|
||||
# # config.content_security_policy_report_only = true
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
require 'core_ext/array_delete_bang'
|
||||
require 'core_ext/float'
|
||||
require 'core_ext/range'
|
||||
require 'core_ext/big_decimal_scientific_notation'
|
||||
|
||||
ActiveSupport.on_load :action_dispatch_system_test_case do
|
||||
prepend CoreExt::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelperUniqueId
|
||||
# Allow denormalized string comparison,
|
||||
# https://github.com/orgs/teamcapybara/discussions/2841
|
||||
XPath::DSL.prepend CoreExt::XPath::DSL::NormalizeSpaceDefault
|
||||
end
|
||||
|
||||
ActiveSupport.on_load :action_view do
|
||||
ActionView::RecordIdentifier.prepend CoreExt::ActionView::RecordIdentifierWithSuffix
|
||||
end
|
||||
|
||||
ActiveSupport.on_load :active_record do
|
||||
ActiveModel::Validations::NumericalityValidator
|
||||
.prepend CoreExt::ActiveModel::Validations::NumericalityValidatesPrecision
|
||||
.prepend CoreExt::ActiveModel::Validations::NumericalityValidatesPrecisionAndScale
|
||||
|
||||
# Temporary patch for https://github.com/rails/rails/pull/54658
|
||||
Arel::TreeManager::StatementMethods
|
||||
|
||||
@@ -179,7 +179,7 @@ Devise.setup do |config|
|
||||
|
||||
# ==> Configuration for :validatable
|
||||
# Range for password length.
|
||||
config.password_length = 5..32
|
||||
config.password_length = 5..128
|
||||
|
||||
# Email regex used to validate email formats. It simply asserts that
|
||||
# one (and only one) @ exists in the given string. This is mainly
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# Be sure to restart your server when you modify this file.
|
||||
|
||||
# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
|
||||
# Use this to limit dissemination of sensitive information.
|
||||
# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
|
||||
# Configure parameters to be filtered from the log file. Use this to limit dissemination of
|
||||
# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
|
||||
# notations and behaviors.
|
||||
Rails.application.config.filter_parameters += [
|
||||
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
|
||||
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
|
||||
]
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user