forked from fixin.me/fixin.me
Compare commits
10 Commits
test-multi
...
feature/mu
| Author | SHA1 | Date | |
|---|---|---|---|
| 24539f236c | |||
| d893e59293 | |||
| 33004f62bd | |||
| 687e6fcdff | |||
| 5ed066ad18 | |||
| dde4e52f1b | |||
| a9091d76a8 | |||
| 4175d31b9d | |||
| c659201904 | |||
| 83b064ef3c |
@@ -1,74 +0,0 @@
|
||||
name: Tests
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ master ]
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
|
||||
jobs:
|
||||
test-sqlite:
|
||||
name: Tests (SQLite)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: '3.3'
|
||||
bundler-cache: true
|
||||
env:
|
||||
BUNDLE_WITH: "sqlite:development:test"
|
||||
|
||||
- name: Set up test database
|
||||
run: bin/rails db:create db:schema:load
|
||||
env:
|
||||
RAILS_ENV: test
|
||||
|
||||
- name: Run tests
|
||||
run: bin/rails test
|
||||
env:
|
||||
RAILS_ENV: test
|
||||
CI: "true"
|
||||
|
||||
test-mysql:
|
||||
name: Tests (MySQL)
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
services:
|
||||
mysql:
|
||||
image: mysql:8.0
|
||||
env:
|
||||
MYSQL_ROOT_PASSWORD: ""
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
|
||||
MYSQL_DATABASE: fixin_test
|
||||
ports:
|
||||
- 3306:3306
|
||||
options: >-
|
||||
--health-cmd="mysqladmin ping"
|
||||
--health-interval=10s
|
||||
--health-timeout=5s
|
||||
--health-retries=3
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: '3.3'
|
||||
bundler-cache: true
|
||||
env:
|
||||
BUNDLE_WITH: "mysql:development:test"
|
||||
|
||||
- name: Set up test database
|
||||
run: bin/rails db:schema:load
|
||||
env:
|
||||
RAILS_ENV: test
|
||||
DB_ADAPTER: mysql
|
||||
|
||||
- name: Run tests
|
||||
run: bin/rails test
|
||||
env:
|
||||
RAILS_ENV: test
|
||||
CI: "true"
|
||||
DB_ADAPTER: mysql
|
||||
34
DESIGN.md
Normal file
34
DESIGN.md
Normal file
@@ -0,0 +1,34 @@
|
||||
DESIGN
|
||||
======
|
||||
|
||||
Below is a list of design decisions. The justification is to be consulted
|
||||
whenever a change is considered, to avoid regressions.
|
||||
|
||||
### Data type for DB storage of numeric values (`decimal` vs `float`)
|
||||
|
||||
* among database engines supported (by Rails), SQLite offers storage of
|
||||
`decimal` data type with the lowest precision, equal to the precision of
|
||||
`REAL` type (double precision float value, IEEE 754), but in a floating point
|
||||
format,
|
||||
* decimal types in other database engines offer greater precision, but store
|
||||
data in a fixed point format,
|
||||
* biology-related values differ by several orders of magnitude; storing them in
|
||||
fixed point format would only make sense if required precision would be
|
||||
greater than that offered by floating point format,
|
||||
* even then, fixed point would mean either bigger memory requirements or
|
||||
worse precision for numbers close to scale limit,
|
||||
* for a fixed point format to use the same 8 bytes of storage as IEEE
|
||||
754, precision would need to be limited to 18 digits (4 bytes/9 digits)
|
||||
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,
|
||||
* 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)
|
||||
* double precision floating point (IEEE 754) is a standard that ensures
|
||||
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
|
||||
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path fill="#ffffff" d="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" /></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" /></svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 152 B |
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path fill="#ffffff" d="M12 2C6.5 2 2 6.5 2 12S6.5 22 12 22 22 17.5 22 12 17.5 2 12 2M12 20C7.59 20 4 16.41 4 12S7.59 4 12 4 20 7.59 20 12 16.41 20 12 20M16.59 7.58L10 14.17L7.41 11.59L6 13L10 17L18 9L16.59 7.58Z" /></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M12 2C6.5 2 2 6.5 2 12S6.5 22 12 22 22 17.5 22 12 17.5 2 12 2M12 20C7.59 20 4 16.41 4 12S7.59 4 12 4 20 7.59 20 12 16.41 20 12 20M16.59 7.58L10 14.17L7.41 11.59L6 13L10 17L18 9L16.59 7.58Z" /></svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 293 B After Width: | Height: | Size: 278 B |
@@ -18,10 +18,12 @@
|
||||
/* 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)
|
||||
* differently depending on context (e.g. <form>, <table>, <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 */
|
||||
* NOTE: style in a modular way, similar to how CSS @scope would be used,
|
||||
* to make transition easier once @scope is widely available. */
|
||||
:root {
|
||||
--color-focus-gray: #f3f3f3;
|
||||
--color-border-gray: #dddddd;
|
||||
@@ -53,17 +55,36 @@
|
||||
:focus-visible {
|
||||
outline: none;
|
||||
}
|
||||
/* NOTE: move to higher priority layer instead of using !important?; add CSS
|
||||
* @layer requirements in README */
|
||||
[disabled] {
|
||||
border-color: var(--color-border-gray) !important;
|
||||
color: var(--color-border-gray) !important;
|
||||
/* NOTE: cannot set cursor when `pointer-events: none`; can be fixed by setting
|
||||
* `cursor` on wrapping element.
|
||||
cursor: not-allowed; */
|
||||
fill: var(--color-border-gray) !important;
|
||||
pointer-events: none !important;
|
||||
}
|
||||
/* Styles set `display` without distinguishing between [hidden] elements, making
|
||||
* them visible. */
|
||||
[hidden] {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
|
||||
/* Color coding of input controls' background:
|
||||
* blue - target for interaction with pointer
|
||||
* gray - target for interaction with keyboard
|
||||
* red - destructive, non-undoable action
|
||||
* blue - target for interaction with pointer,
|
||||
* 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;
|
||||
@@ -73,50 +94,24 @@ input,
|
||||
select {
|
||||
text-align: inherit;
|
||||
}
|
||||
a,
|
||||
button,
|
||||
input[type=submit] {
|
||||
cursor: pointer;
|
||||
text-decoration: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* [hidden] submit controls cannot have `display` set as it makes them visible */
|
||||
.button,
|
||||
button:not([hidden]),
|
||||
input[type=submit]:not([hidden]),
|
||||
.tab {
|
||||
align-items: center;
|
||||
color: var(--color-gray);
|
||||
display: flex;
|
||||
fill: var(--color-gray);
|
||||
font-weight: bold;
|
||||
}
|
||||
.button,
|
||||
button,
|
||||
input[type=submit] {
|
||||
font-size: 0.8rem;
|
||||
padding: 0.6em 0.5em;
|
||||
width: fit-content;
|
||||
}
|
||||
input:not([type=submit]):not([type=checkbox]),
|
||||
select,
|
||||
summary,
|
||||
textarea {
|
||||
padding: 0.2em 0.4em;
|
||||
}
|
||||
.button,
|
||||
button,
|
||||
input,
|
||||
select,
|
||||
summary,
|
||||
textarea {
|
||||
border: solid 1px var(--color-gray);
|
||||
border: 1px solid var(--color-gray);
|
||||
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;
|
||||
}
|
||||
input[type=checkbox],
|
||||
svg,
|
||||
textarea {
|
||||
margin: 0
|
||||
margin: 0;
|
||||
}
|
||||
input[type=checkbox] {
|
||||
accent-color: var(--color-blue);
|
||||
@@ -124,16 +119,20 @@ input[type=checkbox] {
|
||||
-webkit-appearance: none;
|
||||
display: flex;
|
||||
height: 1.1em;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
width: 1.1em;
|
||||
}
|
||||
input[type=checkbox]:checked {
|
||||
appearance: checkbox;
|
||||
-webkit-appearance: checkbox;
|
||||
}
|
||||
/* Hide spin buttons in input number fields */
|
||||
/* Hide spin buttons of <input type=number>. */
|
||||
/* TODO: add spin buttons inside <input type=number>: before (-) and after (+) input. */
|
||||
input[type=number] {
|
||||
appearance: textfield;
|
||||
-moz-appearance: textfield;
|
||||
text-align: end;
|
||||
}
|
||||
input::-webkit-inner-spin-button {
|
||||
-webkit-appearance: none;
|
||||
@@ -142,37 +141,108 @@ input::-webkit-outer-spin-button {
|
||||
-webkit-appearance: none;
|
||||
margin: 0;
|
||||
}
|
||||
.button > svg,
|
||||
.tab > svg,
|
||||
button > svg {
|
||||
height: 1.4em;
|
||||
width: 1.4em;
|
||||
/* Text color of table form controls:
|
||||
* - black for row/table forms,
|
||||
* - inherited for internal (column specific) buttons/forms. */
|
||||
table input,
|
||||
table select,
|
||||
table summary,
|
||||
table textarea {
|
||||
border-color: var(--color-border-gray);
|
||||
}
|
||||
.button > svg:not(:last-child),
|
||||
.tab > svg:not(:last-child),
|
||||
button > svg:not(:last-child) {
|
||||
margin-right: 0.2em;
|
||||
table input,
|
||||
table select,
|
||||
table textarea {
|
||||
padding-block: 0.375em;
|
||||
}
|
||||
/* 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 */
|
||||
.button:focus-visible,
|
||||
button:focus-visible,
|
||||
input[type=submit]:focus-visible {
|
||||
background-color: var(--color-focus-gray);
|
||||
table form input,
|
||||
table form select,
|
||||
table form summary,
|
||||
table form textarea {
|
||||
color: inherit;
|
||||
}
|
||||
table svg:not(:only-child) {
|
||||
height: 1.25em;
|
||||
width: 1.25em;
|
||||
}
|
||||
input:focus-visible,
|
||||
select:focus-visible,
|
||||
select:focus-within,
|
||||
/* TODO: how to achieve summary:focus-within for ::details-content? */
|
||||
/* TODO: how to achieve `summary:focus-within` for `::details-content`? */
|
||||
summary:focus-visible,
|
||||
textarea:focus-visible {
|
||||
accent-color: var(--color-dark-blue);
|
||||
background-color: var(--color-focus-gray);
|
||||
color: black;
|
||||
}
|
||||
.button:hover,
|
||||
button:hover,
|
||||
input[type=submit]:hover {
|
||||
input:hover,
|
||||
select:hover,
|
||||
summary:hover,
|
||||
textarea:hover {
|
||||
border-color: var(--color-blue);
|
||||
outline: 1px solid var(--color-blue);
|
||||
}
|
||||
select:hover,
|
||||
summary:hover {
|
||||
color: black;
|
||||
cursor: pointer;
|
||||
}
|
||||
/* TODO: style <details>/<summary> focus to match <select> as much as possible.
|
||||
summary:focus-visible::before,
|
||||
summary:hover::before {
|
||||
background-color: black;
|
||||
}
|
||||
*/
|
||||
input:invalid,
|
||||
select:invalid,
|
||||
textarea:invalid {
|
||||
border-color: var(--color-red);
|
||||
outline-color: var(--color-red);
|
||||
}
|
||||
|
||||
/* `.button`: button-styled <a>, <button>, <input type=submit>.
|
||||
* `.link`: any other <a>.
|
||||
* `.tab`: tab-styled <a>.
|
||||
*/
|
||||
.button,
|
||||
.link,
|
||||
.tab {
|
||||
cursor: pointer;
|
||||
text-decoration: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.button,
|
||||
.tab {
|
||||
align-items: center;
|
||||
color: var(--color-gray);
|
||||
display: flex;
|
||||
fill: var(--color-gray);
|
||||
font-weight: bold;
|
||||
}
|
||||
.button {
|
||||
border: 1px solid var(--color-gray);
|
||||
border-radius: 0.25em;
|
||||
font-size: 0.8rem;
|
||||
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-border-gray);
|
||||
color: var(--color-nav-gray);
|
||||
fill: var(--color-nav-gray);
|
||||
}
|
||||
.button:focus-visible,
|
||||
.tab:focus-visible,
|
||||
.tab:hover {
|
||||
background-color: var(--color-focus-gray);
|
||||
}
|
||||
.button:hover {
|
||||
background-color: var(--color-blue);
|
||||
border-color: var(--color-blue);
|
||||
color: white;
|
||||
@@ -182,32 +252,24 @@ input[type=submit]:hover {
|
||||
background-color: var(--color-red);
|
||||
border-color: var(--color-red);
|
||||
}
|
||||
input:hover,
|
||||
select:hover,
|
||||
summary:hover,
|
||||
textarea:hover {
|
||||
border-color: var(--color-blue);
|
||||
outline: solid 1px var(--color-blue);
|
||||
.link:focus-visible {
|
||||
text-decoration-color: var(--color-gray);
|
||||
}
|
||||
select:hover,
|
||||
summary:hover {
|
||||
cursor: pointer;
|
||||
.link:hover {
|
||||
color: var(--color-blue);
|
||||
text-decoration-color: var(--color-blue);
|
||||
}
|
||||
input:invalid,
|
||||
select:invalid,
|
||||
textarea:invalid {
|
||||
border-color: var(--color-red);
|
||||
outline: solid 1px var(--color-red);
|
||||
}
|
||||
input[type=text]:read-only,
|
||||
textarea:read-only {
|
||||
border: none;
|
||||
padding-inline: 0;
|
||||
table .button {
|
||||
border-color: var(--color-border-gray);
|
||||
color: var(--color-table-gray);
|
||||
font-weight: normal;
|
||||
height: 100%;
|
||||
padding: 0.4em;
|
||||
}
|
||||
|
||||
|
||||
/* NOTE: collapse gaps around empty rows (`topside`) once possible
|
||||
* with grid-collapse property and remove alternative grid-template
|
||||
/* NOTE: collapse gaps around empty rows (`topside`) once possible with
|
||||
* `grid-collapse` property and remove alternative `grid-template-areas`.
|
||||
* https://github.com/w3c/csswg-drafts/issues/5813 */
|
||||
body {
|
||||
display: grid;
|
||||
@@ -215,16 +277,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:not(:has(.topside-area)) {
|
||||
body:has(> .topside-area) {
|
||||
grid-template-areas:
|
||||
"header header header"
|
||||
"nav nav nav"
|
||||
"leftside topside rightside"
|
||||
"leftside main rightside";
|
||||
}
|
||||
|
||||
@@ -240,18 +302,14 @@ header {
|
||||
margin-inline-start: 4%;
|
||||
}
|
||||
.navigation > .tab {
|
||||
border-bottom: solid 2px var(--color-nav-gray);
|
||||
border-bottom: 2px solid var(--color-nav-gray);
|
||||
flex: 1;
|
||||
font-size: 1rem;
|
||||
justify-content: center;
|
||||
padding-block: 0.4em;
|
||||
}
|
||||
.navigation > .tab:hover,
|
||||
.navigation > .tab:focus-visible {
|
||||
background-color: var(--color-focus-gray);
|
||||
}
|
||||
.navigation > .tab.active {
|
||||
border-bottom: solid 4px var(--color-blue);
|
||||
border-bottom: 4px solid var(--color-blue);
|
||||
color: var(--color-blue);
|
||||
fill: var(--color-blue);
|
||||
}
|
||||
@@ -283,7 +341,7 @@ header {
|
||||
|
||||
#flashes {
|
||||
display: grid;
|
||||
gap: 0.2em;
|
||||
row-gap: 0.4em;
|
||||
grid-template-columns: 1fr auto auto auto 1fr;
|
||||
left: 0;
|
||||
pointer-events: none;
|
||||
@@ -299,48 +357,42 @@ header {
|
||||
display: grid;
|
||||
grid-column: 2/5;
|
||||
grid-template-columns: subgrid;
|
||||
line-height: 2.2em;
|
||||
pointer-events: auto;
|
||||
}
|
||||
.flash.alert:before {
|
||||
content: url('pictograms/alert-outline.svg');
|
||||
.flash:before {
|
||||
filter: invert();
|
||||
height: 1.4em;
|
||||
margin: 0 0.5em;
|
||||
width: 1.4em;
|
||||
}
|
||||
.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('pictograms/check-circle-outline.svg');
|
||||
height: 1.4em;
|
||||
margin: 0 0.5em;
|
||||
width: 1.4em;
|
||||
}
|
||||
.flash.notice {
|
||||
border-color: var(--color-blue);
|
||||
background-color: var(--color-blue);
|
||||
}
|
||||
.flash > div {
|
||||
grid-column: 2;
|
||||
}
|
||||
/* NOTE: currently flash button inherits some unnecessary styles from generic
|
||||
* button. */
|
||||
.flash > button {
|
||||
border: none;
|
||||
color: inherit;
|
||||
.flash svg {
|
||||
cursor: pointer;
|
||||
font-size: 1.4em;
|
||||
font-weight: bold;
|
||||
grid-column: 3;
|
||||
fill: white;
|
||||
height: 2.2em;
|
||||
opacity: 0.6;
|
||||
padding: 0.2em 0.4em;
|
||||
padding: 0.4em 0.5em;
|
||||
width: 2.4em;
|
||||
}
|
||||
.flash > button:hover {
|
||||
.flash svg:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
/* TODO: Hover over invalid should work like in measurements (thin vs thick border) */
|
||||
|
||||
.labeled-form {
|
||||
align-items: center;
|
||||
display: grid;
|
||||
@@ -357,7 +409,7 @@ header {
|
||||
.labeled-form label.required {
|
||||
font-weight: bold;
|
||||
}
|
||||
/* Don't style `label.error + input` if case already covered by input:invalid */
|
||||
/* Don't style `label.error + input` if case already covered by `input:invalid`. */
|
||||
.labeled-form label.error {
|
||||
color: var(--color-red);
|
||||
}
|
||||
@@ -371,203 +423,123 @@ header {
|
||||
}
|
||||
.labeled-form input[type=submit] {
|
||||
font-size: 1rem;
|
||||
margin: 1.5em auto 0 auto;
|
||||
margin: 1em auto 0 auto;
|
||||
padding: 0.75em;
|
||||
}
|
||||
.labeled-form .auxiliary {
|
||||
grid-column: 3;
|
||||
/* If more buttons are needed, `grid-row` can be replaced with
|
||||
* `reading-flow: grid-columns` to ensure proper [tabindex] order. */
|
||||
grid-row: 1;
|
||||
height: 100%;
|
||||
padding-block: 0;
|
||||
}
|
||||
|
||||
.tabular-form table {
|
||||
border: none;
|
||||
border-spacing: 0.4em 0;
|
||||
margin-inline: -0.4em;
|
||||
}
|
||||
.tabular-form table td {
|
||||
border: none;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.tabular-form table td {
|
||||
padding-inline: 0;
|
||||
}
|
||||
.tabular-form table :is(form, input, select, textarea):only-child {
|
||||
margin-inline-start: 0;
|
||||
}
|
||||
|
||||
|
||||
/* TODO: remove .items class (?) and make 'form table' work properly */
|
||||
table.items {
|
||||
.items-table {
|
||||
border-spacing: 0;
|
||||
border: solid 1px var(--color-border-gray);
|
||||
border: 1px solid var(--color-border-gray);
|
||||
border-radius: 0.25em;
|
||||
font-size: 0.85rem;
|
||||
text-align: left;
|
||||
}
|
||||
table:not(:has(tr)) {
|
||||
display: none;
|
||||
}
|
||||
table.items thead {
|
||||
.items-table thead {
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
table.items thead,
|
||||
table.items tbody tr:hover {
|
||||
.items-table thead,
|
||||
.items-table tbody tr:hover {
|
||||
background-color: var(--color-focus-gray);
|
||||
}
|
||||
table.items th {
|
||||
padding-block: 0.75em;
|
||||
.items-table th {
|
||||
padding: 0.75em 0 0.75em 1em;
|
||||
text-align: center;
|
||||
}
|
||||
table.items th,
|
||||
table.items td {
|
||||
padding-inline: 1em 0;
|
||||
}
|
||||
/* For <a> to fill <td> completely, we use an ::after pseudoelement. */
|
||||
table.items td.link {
|
||||
padding: 0;
|
||||
position: relative;
|
||||
}
|
||||
table.items td.link a {
|
||||
color: inherit;
|
||||
font: inherit;
|
||||
}
|
||||
table.items td.link a::after {
|
||||
content: '';
|
||||
inset: 0;
|
||||
position: absolute;
|
||||
}
|
||||
table.items td:first-child {
|
||||
padding-inline-start: calc(1em + var(--depth) * 0.8em);
|
||||
}
|
||||
table.items td:has(input, select, textarea) {
|
||||
padding-inline-start: calc(0.6em - 0.9px);
|
||||
}
|
||||
table.items td:first-child:has(input, select, textarea) {
|
||||
padding-inline-start: calc(0.6em + var(--depth) * 0.8em - 0.9px);
|
||||
}
|
||||
table.items th:last-child {
|
||||
.items-table th:last-child {
|
||||
padding-inline-end: 0.4em;
|
||||
}
|
||||
table.items td:last-child {
|
||||
.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;
|
||||
}
|
||||
table.items td {
|
||||
border-top: solid 1px var(--color-border-gray);
|
||||
height: 2.4em;
|
||||
padding-block: 0.1em;
|
||||
.items-table :is(form, input, select, textarea):only-child {
|
||||
margin-inline-start: calc(-0.4em - 0.9px);
|
||||
}
|
||||
table.items .actions {
|
||||
display: flex;
|
||||
/* 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 {
|
||||
gap: 0.4em;
|
||||
justify-content: end;
|
||||
}
|
||||
table.items .actions.centered {
|
||||
justify-content: center;
|
||||
}
|
||||
table.items tr.dropzone {
|
||||
.items-table .dropzone {
|
||||
position: relative;
|
||||
}
|
||||
table.items tr.dropzone::after {
|
||||
.items-table .dropzone::after {
|
||||
content: '';
|
||||
inset: 1px 0 0 0;
|
||||
position: absolute;
|
||||
outline: dashed 2px var(--color-blue);
|
||||
outline: 2px dashed var(--color-blue);
|
||||
outline-offset: -1px;
|
||||
z-index: var(--z-index-table-row-outline);
|
||||
}
|
||||
table.items td.handle {
|
||||
cursor: move;
|
||||
.items-table .handle {
|
||||
cursor: grab;
|
||||
}
|
||||
table.items tr.form td {
|
||||
.items-table .form td {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
/* TODO: replace :hover:focus-visible combos with proper LOVE stye order */
|
||||
/* TODO: Update table styling: simplify selectors, deduplicate, remove non-font rem. */
|
||||
table.items td.link a:hover,
|
||||
table.items td.link a:focus-visible,
|
||||
table.items td.link a:hover:focus-visible {
|
||||
text-decoration: underline;
|
||||
text-decoration-thickness: 0.05rem;
|
||||
text-underline-offset: 0.2rem;
|
||||
}
|
||||
table.items td.link a:hover {
|
||||
color: var(--color-blue);
|
||||
}
|
||||
table.items td.link a:focus-visible {
|
||||
text-decoration-color: var(--color-gray);
|
||||
}
|
||||
table.items td.link a:hover:focus-visible {
|
||||
color: var(--color-dark-blue);
|
||||
}
|
||||
|
||||
table.items td:not(:first-child),
|
||||
.items-table td:not(:first-child),
|
||||
.grayed {
|
||||
color: var(--color-table-gray);
|
||||
fill: var(--color-table-gray);
|
||||
fill: var(--color-gray);
|
||||
}
|
||||
table.items svg {
|
||||
height: 1rem;
|
||||
vertical-align: middle;
|
||||
width: 1rem;
|
||||
}
|
||||
table.items svg:last-child {
|
||||
height: 1.2rem;
|
||||
width: 1.2rem;
|
||||
}
|
||||
table.items td.svg {
|
||||
.items-table td:has(> svg:only-child) {
|
||||
text-align: center;
|
||||
}
|
||||
table.items td.number {
|
||||
text-align: right;
|
||||
}
|
||||
table.items .button,
|
||||
table.items button,
|
||||
table.items input[type=submit] {
|
||||
font-weight: normal;
|
||||
height: 100%;
|
||||
padding: 0.4em;
|
||||
}
|
||||
table.items input:not([type=submit]):not([type=checkbox]),
|
||||
table.items select,
|
||||
table.items textarea {
|
||||
padding-block: 0.375em;
|
||||
}
|
||||
/* TODO: find a way (layers?) to style inputs differently while making sure
|
||||
* hover works properly without using :not(:hover) selectors here. */
|
||||
table.items .button:not(:hover),
|
||||
table.items button:not(:hover),
|
||||
table.items input:not(:hover),
|
||||
table.items select:not(:hover),
|
||||
table.items textarea:not(:hover) {
|
||||
border-color: var(--color-border-gray);
|
||||
}
|
||||
table.items .button:not(:hover),
|
||||
table.items button:not(:hover),
|
||||
table.items input[type=submit]:not(:hover),
|
||||
table.items select:not(:hover) {
|
||||
color: var(--color-table-gray);
|
||||
}
|
||||
table.items select:focus-within,
|
||||
table.items select:focus-visible {
|
||||
color: black;
|
||||
}
|
||||
form a[name=cancel] {
|
||||
border-color: var(--color-border-gray);
|
||||
color: var(--color-nav-gray);
|
||||
fill: var(--color-nav-gray);
|
||||
}
|
||||
form table.items {
|
||||
border: none;
|
||||
}
|
||||
form table.items td {
|
||||
border: none;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
}
|
||||
form table.items td:first-child {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
|
||||
.centered {
|
||||
.center {
|
||||
margin: 0 auto;
|
||||
}
|
||||
.extendedright {
|
||||
margin-right: auto;
|
||||
}
|
||||
.hexpand {
|
||||
width: 100%;
|
||||
}
|
||||
.hflex {
|
||||
.flex {
|
||||
display: flex;
|
||||
gap: 0.8em;
|
||||
}
|
||||
.hflex.reverse {
|
||||
.flex.reverse {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
.hflex.centered {
|
||||
justify-content: center;
|
||||
.flex.vertical {
|
||||
flex-direction: column;
|
||||
}
|
||||
.hint {
|
||||
color: var(--color-table-gray);
|
||||
@@ -575,21 +547,18 @@ form table.items td:first-child {
|
||||
font-size: 0.9rem;
|
||||
text-align: center;
|
||||
}
|
||||
.vflex {
|
||||
display: flex;
|
||||
gap: 0.8em;
|
||||
flex-direction: column;
|
||||
.hmin50 {
|
||||
min-width: 50%;
|
||||
}
|
||||
[disabled] {
|
||||
/* label:has(input[disabled]) {
|
||||
* TODO: disabled checkbox blue square focus removal; disabled label styling;
|
||||
* focused label styling (currently only checkbox has focus)
|
||||
* */
|
||||
border-color: var(--color-border-gray) !important;
|
||||
color: var(--color-border-gray) !important;
|
||||
cursor: not-allowed;
|
||||
fill: var(--color-border-gray) !important;
|
||||
pointer-events: none;
|
||||
.italic {
|
||||
color: var(--color-gray);
|
||||
font-style: italic;
|
||||
}
|
||||
.ralign {
|
||||
text-align: right;
|
||||
}
|
||||
.rextend {
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
|
||||
@@ -601,12 +570,12 @@ summary {
|
||||
align-items: center;
|
||||
color: var(--color-gray);
|
||||
display: flex;
|
||||
gap: 0.2em;
|
||||
gap: 0.4em;
|
||||
height: 100%;
|
||||
white-space: nowrap;
|
||||
}
|
||||
summary::before {
|
||||
background-color: #000;
|
||||
background-color: currentColor;
|
||||
content: "";
|
||||
height: 1em;
|
||||
mask-image: url('pictograms/chevron-down.svg');
|
||||
@@ -618,7 +587,7 @@ summary:has(.button) {
|
||||
padding-inline-end: 0;
|
||||
}
|
||||
summary .button {
|
||||
border: solid 1px var(--color-border-gray);
|
||||
border: 1px solid var(--color-border-gray);
|
||||
border-radius: inherit;
|
||||
border-top-left-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
@@ -629,15 +598,15 @@ summary span {
|
||||
width: 100%;
|
||||
}
|
||||
details[open] summary::before {
|
||||
transform: rotate(180deg);
|
||||
transform: scaleY(-1);
|
||||
}
|
||||
summary::marker {
|
||||
padding-left: 0.25em;
|
||||
}
|
||||
/* NOTE: use details[open]::details-content once widely available */
|
||||
/* NOTE: use `details[open]::details-content` once widely available. */
|
||||
details[open] ul {
|
||||
background: white;
|
||||
border: solid 1px var(--color-border-gray);
|
||||
background-color: white;
|
||||
border: 1px solid var(--color-border-gray);
|
||||
border-radius: 0.25em;
|
||||
box-shadow: 1px 1px 3px var(--color-border-gray);
|
||||
margin: -1px 0 0 0;
|
||||
@@ -659,3 +628,15 @@ li input[type=checkbox] {
|
||||
li::marker {
|
||||
content: '';
|
||||
}
|
||||
/*
|
||||
* TODO:
|
||||
* * disable <label> containing disabled checkbox: `label:has(input[disabled])`,
|
||||
* * disabled label styling,
|
||||
* * focused label styling (currently only checkbox has focus),
|
||||
* * disabled checkbox blue square focus removal.
|
||||
* */
|
||||
|
||||
#measurement_form {
|
||||
min-width: 66%;
|
||||
width: max-content;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ class ApplicationController < ActionController::Base
|
||||
helper_method :current_user_disguised?
|
||||
helper_method :current_tab
|
||||
|
||||
before_action :redirect_to_setup_if_needed
|
||||
before_action :authenticate_user!
|
||||
|
||||
class AccessForbidden < StandardError; end
|
||||
@@ -26,6 +25,18 @@ class ApplicationController < ActionController::Base
|
||||
# Turbo will reload 2nd time with HTML format and flashes will be lost.
|
||||
rescue_from *ActionDispatch::ExceptionWrapper.rescue_responses.keys, with: :rescue_turbo
|
||||
|
||||
# Required by #respond_with (gem `responders`) used by Devise controllers.
|
||||
respond_to :html, :turbo_stream
|
||||
|
||||
def after_sign_in_path_for(resource)
|
||||
# TODO: allow setting path per-user or save last path in session and restore
|
||||
units_path
|
||||
end
|
||||
|
||||
def after_sign_out_path_for(resource)
|
||||
new_user_session_path
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def current_user_disguised?
|
||||
@@ -44,16 +55,6 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
private
|
||||
|
||||
# Redirect to the web setup wizard when the application has not yet been
|
||||
# initialised (i.e. no admin account exists in the database).
|
||||
def redirect_to_setup_if_needed
|
||||
return if User.exists?(status: :admin)
|
||||
redirect_to new_setup_path
|
||||
rescue ActiveRecord::StatementInvalid
|
||||
# Tables may not exist yet (migrations not run). Fall through and let the
|
||||
# normal request handling surface a meaningful error.
|
||||
end
|
||||
|
||||
def render_no_content(record)
|
||||
helpers.render_errors(record)
|
||||
render html: nil, layout: true
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
# Handles the one-time web-based installation wizard.
|
||||
#
|
||||
# The wizard is only accessible when no admin account exists yet. Once an
|
||||
# admin has been created the controller redirects every request to the root
|
||||
# path, so it can never be used to overwrite an existing installation.
|
||||
class SetupController < ActionController::Base
|
||||
# Use the full application layout (header, flash, etc.) so the page looks
|
||||
# consistent with the rest of the site.
|
||||
layout "application"
|
||||
|
||||
before_action :redirect_if_installed
|
||||
|
||||
def new
|
||||
end
|
||||
|
||||
def create
|
||||
email = params[:admin_email].to_s.strip
|
||||
password = params[:admin_password].to_s
|
||||
confirm = params[:admin_password_confirmation].to_s
|
||||
|
||||
errors = []
|
||||
errors << t(".email_blank") if email.blank?
|
||||
errors << t(".password_blank") if password.blank?
|
||||
errors << t(".password_mismatch") if password != confirm
|
||||
|
||||
if errors.any?
|
||||
flash.now[:alert] = errors.join(" ")
|
||||
return render :new, status: :unprocessable_entity
|
||||
end
|
||||
|
||||
user = User.new(email: email, password: password, status: :admin)
|
||||
user.skip_confirmation!
|
||||
|
||||
unless user.save
|
||||
flash.now[:alert] = user.errors.full_messages.join(" ")
|
||||
return render :new, status: :unprocessable_entity
|
||||
end
|
||||
|
||||
# Persist runtime settings chosen during setup.
|
||||
Setting.set("skip_email_confirmation",
|
||||
params[:skip_email_confirmation] == "1")
|
||||
|
||||
# Optionally seed the built-in default units.
|
||||
if params[:seed_units] == "1"
|
||||
load Rails.root.join("db/seeds/units.rb")
|
||||
end
|
||||
|
||||
redirect_to new_user_session_path, notice: t(".success")
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def redirect_if_installed
|
||||
redirect_to root_path if User.exists?(status: :admin)
|
||||
rescue ActiveRecord::StatementInvalid
|
||||
# Tables are not yet migrated — stay on the setup page so the user sees a
|
||||
# meaningful error rather than a crash.
|
||||
end
|
||||
end
|
||||
@@ -1,6 +1,4 @@
|
||||
class RegistrationsController < Devise::RegistrationsController
|
||||
before_action :authenticate_user!, only: [:edit, :update, :destroy]
|
||||
|
||||
class User::ProfilesController < Devise::RegistrationsController
|
||||
def destroy
|
||||
# TODO: Disallow/disable deletion for last admin account; update :edit view
|
||||
super
|
||||
@@ -8,15 +6,6 @@ class RegistrationsController < Devise::RegistrationsController
|
||||
|
||||
protected
|
||||
|
||||
def build_resource(hash = {})
|
||||
super
|
||||
# Skip the email confirmation step when the admin has enabled this option
|
||||
# via the web setup wizard (stored as the "skip_email_confirmation" Setting).
|
||||
# The account becomes active immediately so the user can sign in right after
|
||||
# registering.
|
||||
resource.skip_confirmation! if Setting.get("skip_email_confirmation") == "true"
|
||||
end
|
||||
|
||||
def update_resource(resource, params)
|
||||
# Based on update_with_password()
|
||||
if params[:password].blank?
|
||||
@@ -37,7 +37,7 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
# NOTE: limited actions availabe to :admin by design. Users are meant to
|
||||
# manage their accounts by themselves through registrations. :admin
|
||||
# manage their accounts by themselves through profiles. :admin
|
||||
# is allowed to sign-in (disguise) as user and make changes from there.
|
||||
|
||||
protected
|
||||
|
||||
@@ -12,6 +12,12 @@ module ApplicationHelper
|
||||
labeled_field_for(method, options) { super }
|
||||
end
|
||||
|
||||
def submit(value = nil, options = {})
|
||||
value, options = nil, value if value.is_a?(Hash)
|
||||
options[:class] = @template.class_names('button', options[:class])
|
||||
super
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def labeled_field_for(method, options)
|
||||
@@ -72,13 +78,8 @@ module ApplicationHelper
|
||||
end
|
||||
|
||||
def labeled_form_for(record, options = {}, &block)
|
||||
extra_options = {builder: LabeledFormBuilder,
|
||||
data: {turbo: false},
|
||||
html: {class: 'labeled-form'}}
|
||||
options = options.deep_merge(extra_options) do |key, left, right|
|
||||
key == :class ? class_names(left, right) : right
|
||||
end
|
||||
form_for(record, **options, &block)
|
||||
extra_options = {builder: LabeledFormBuilder, html: {class: 'labeled-form'}}
|
||||
form_for(record, **merge_attributes(options, extra_options), &block)
|
||||
end
|
||||
|
||||
class TabularFormBuilder < ActionView::Helpers::FormBuilder
|
||||
@@ -101,20 +102,28 @@ module ApplicationHelper
|
||||
|
||||
def number_field(method, options = {})
|
||||
attr_type = object.type_for_attribute(method)
|
||||
if attr_type.type == :decimal
|
||||
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
|
||||
|
||||
def button(value = nil, options = {}, &block)
|
||||
# button does not use #objectify_options
|
||||
options.merge!(@options.slice(:form))
|
||||
# #button does not use #objectify_options/@default_options
|
||||
value, options = nil, value if value.is_a?(Hash)
|
||||
options = options.merge(
|
||||
@default_options.slice(:form),
|
||||
class: @template.class_names('button', options[:class])
|
||||
)
|
||||
super
|
||||
end
|
||||
|
||||
@@ -135,20 +144,22 @@ module ApplicationHelper
|
||||
# [autofocus]. Otherwise IDs are not unique when multiple forms are open
|
||||
# and the first input gets focus.
|
||||
record_object, options = nil, record_object if record_object.is_a?(Hash)
|
||||
options.merge!(builder: TabularFormBuilder, skip_default_ids: true)
|
||||
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
|
||||
|
||||
def tabular_form_with(**options, &block)
|
||||
options = options.deep_merge(builder: TabularFormBuilder,
|
||||
html: {autocomplete: 'off'})
|
||||
form_with(**options, &block)
|
||||
extra_options = {builder: TabularFormBuilder, class: 'tabular-form',
|
||||
html: {autocomplete: 'off'}}
|
||||
form_with(**merge_attributes(options, extra_options), &block)
|
||||
end
|
||||
|
||||
def svg_tag(source, label = nil, options = {})
|
||||
svg_tag = tag.svg(options) do
|
||||
label, options = nil, label if label.is_a? Hash
|
||||
svg_tag = tag.svg(**options) do
|
||||
tag.use(href: "#{image_path(source + ".svg")}#icon")
|
||||
end
|
||||
label.blank? ? svg_tag : svg_tag + tag.span(label)
|
||||
@@ -159,6 +170,7 @@ module ApplicationHelper
|
||||
['measurements', 'scale-bathroom', :restricted],
|
||||
['quantities', 'axis-arrow', :restricted, 'right'],
|
||||
['units', 'weight-gram', :restricted],
|
||||
# TODO: display users tab only if >1 user present; sole_user?/sole_admin?
|
||||
['users', 'account-multiple-outline', :admin],
|
||||
]
|
||||
|
||||
@@ -206,6 +218,7 @@ module ApplicationHelper
|
||||
|
||||
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
|
||||
@@ -215,8 +228,8 @@ module ApplicationHelper
|
||||
# Conversion of flash to Array only required because of Devise
|
||||
Array(messages).map do |message|
|
||||
tag.div class: "flash #{entry}" do
|
||||
tag.div(sanitize(message)) + tag.button(sanitize("×"), tabindex: -1,
|
||||
onclick: "this.parentElement.remove();")
|
||||
tag.span(sanitize(message)) +
|
||||
svg_tag('pictograms/close-outline', {onclick: "this.parentElement.remove()"})
|
||||
end
|
||||
end
|
||||
end.join.html_safe
|
||||
@@ -252,4 +265,11 @@ module ApplicationHelper
|
||||
|
||||
[name, html_options]
|
||||
end
|
||||
|
||||
# Like Hash#deep_merge, but aware of HTML attributes.
|
||||
def merge_attributes(left, right)
|
||||
left.deep_merge(right) do |key, lvalue, rvalue|
|
||||
key == :class ? class_names(lvalue, rvalue) : rvalue
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
module QuantitiesHelper
|
||||
def quantities_check_boxes
|
||||
def quantities_check_boxes(quantities)
|
||||
# Closing <details> on focusout event depends on relatedTarget for internal
|
||||
# actions being non-null. To ensure this, all top-layer elements of
|
||||
# ::details-content must accept focus, e.g. <label> needs tabindex="-1" */
|
||||
collection_check_boxes(nil, :quantity, @quantities, :id, :to_s_with_depth,
|
||||
collection_check_boxes(nil, :quantity, quantities, :id, :to_s_with_depth,
|
||||
include_hidden: false) do |b|
|
||||
content_tag :li, b.label(tabindex: -1) { b.check_box + b.text }
|
||||
end
|
||||
|
||||
@@ -37,6 +37,18 @@ window.detailsObserver = new MutationObserver((mutations) => {
|
||||
mutations[0].target.dispatchEvent(new Event('change', {bubbles: true}))
|
||||
});
|
||||
|
||||
function formValidate(event) {
|
||||
var id = event.submitter.getAttribute("data-validate")
|
||||
if (!id) return;
|
||||
|
||||
var input = document.getElementById(id)
|
||||
if (!input.checkValidity()) {
|
||||
input.reportValidity()
|
||||
event.preventDefault()
|
||||
}
|
||||
}
|
||||
window.formValidate = formValidate
|
||||
|
||||
|
||||
/* Turbo stream actions */
|
||||
Turbo.StreamElement.prototype.disableElement = function(element) {
|
||||
|
||||
@@ -15,8 +15,8 @@ class Quantity < ApplicationRecord
|
||||
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 || Float::INFINITY}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
||||
length: {maximum: type_for_attribute(:name).limit}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||
|
||||
# Update :depths of progenies after parent change
|
||||
before_save if: :parent_changed? do
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
# Key-value store for runtime application settings that are configured through
|
||||
# the web setup wizard (or updated by an administrator) rather than hard-coded
|
||||
# in application.rb.
|
||||
#
|
||||
# Known keys:
|
||||
# skip_email_confirmation – "true"/"false", mirrors the homonymous option
|
||||
# that was previously in application.rb.
|
||||
class Setting < ApplicationRecord
|
||||
validates :key, presence: true, uniqueness: true
|
||||
|
||||
# Return the string value stored for +key+, or +default+ when absent.
|
||||
def self.get(key, default: nil)
|
||||
find_by(key: key)&.value || default
|
||||
end
|
||||
|
||||
# Persist +value+ for +key+, creating the record if it does not yet exist.
|
||||
def self.set(key, value)
|
||||
find_or_initialize_by(key: key).update!(value: value.to_s)
|
||||
end
|
||||
end
|
||||
@@ -12,8 +12,8 @@ class Unit < ApplicationRecord
|
||||
errors.add(:base, :multilevel_nesting) if base.base_id?
|
||||
end
|
||||
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
||||
length: {maximum: type_for_attribute(:symbol).limit || Float::INFINITY}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
||||
length: {maximum: type_for_attribute(:symbol).limit}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
||||
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
||||
|
||||
@@ -26,8 +26,10 @@ class Unit < ApplicationRecord
|
||||
other_bases_units = arel_table.alias('other_bases_units')
|
||||
sub_units = arel_table.alias('sub_units')
|
||||
|
||||
# TODO: move inner 'with' CTE to outer 'with recursive' - it can have multiple
|
||||
# CTEs, even non recursive ones.
|
||||
Unit.with_recursive(actionable_units: [
|
||||
self.or(Unit.defaults).left_joins(:base)
|
||||
Unit.with(units: self.or(Unit.defaults)).left_joins(:base)
|
||||
.where.not(
|
||||
# Exclude Units that are/have default counterpart
|
||||
Arel::SelectManager.new.project(1).from(other_units)
|
||||
@@ -63,14 +65,8 @@ class Unit < ApplicationRecord
|
||||
),
|
||||
# Fill base Units to display proper hierarchy. Duplicates will be removed
|
||||
# by final group() - can't be deduplicated with UNION due to 'portable' field.
|
||||
# Use ActiveRecord::Relation (not a raw SelectManager) so the SQLite Arel
|
||||
# visitor does not wrap it in parentheses inside the UNION ALL CTE body.
|
||||
Unit.joins(
|
||||
arel_table.create_join(
|
||||
actionable_units,
|
||||
arel_table.create_on(actionable_units[:base_id].eq(arel_table[:id]))
|
||||
)
|
||||
).select(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
||||
arel_table.join(actionable_units).on(actionable_units[:base_id].eq(arel_table[:id]))
|
||||
.project(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
||||
]).select(units: [:base_id, :symbol])
|
||||
.select(
|
||||
units[:id].minimum.as('id'), # can be ANY_VALUE()
|
||||
@@ -78,7 +74,7 @@ class Unit < ApplicationRecord
|
||||
Arel::Nodes.build_quoted(1).as('multiplier'), # disregard multiplier when sorting
|
||||
units[:portable].minimum.as('portable')
|
||||
)
|
||||
.from(units).group(units[:base_id], units[:symbol])
|
||||
.from(units).group(:base_id, :symbol)
|
||||
}
|
||||
scope :ordered, ->{
|
||||
left_outer_joins(:base).order(ordering)
|
||||
@@ -87,8 +83,8 @@ class Unit < ApplicationRecord
|
||||
def self.ordering
|
||||
[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]]
|
||||
:multiplier,
|
||||
:symbol]
|
||||
end
|
||||
|
||||
before_destroy do
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
</td>
|
||||
|
||||
<% if current_user.at_least(:active) %>
|
||||
<td class="actions">
|
||||
<td class="flex">
|
||||
<% unless unit.portable.nil? %>
|
||||
<% if unit.default? %>
|
||||
<%= image_button_to_if unit.portable?, t('.import'), 'download-outline',
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
class: 'tools-area' %>
|
||||
</div>
|
||||
|
||||
<table class="main-area items">
|
||||
<table class="main-area items-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
||||
|
||||
@@ -23,10 +23,10 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header class="hflex">
|
||||
<header class="flex">
|
||||
<%= image_link_to t(".source_code"), "code-braces", source_code_url %>
|
||||
<%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url,
|
||||
class: "extendedright" %>
|
||||
class: "rextend" %>
|
||||
<% if user_signed_in? %>
|
||||
<%= image_link_to_unless_current(current_user, "account-wrench-outline",
|
||||
edit_user_registration_path) %>
|
||||
|
||||
@@ -1,28 +1,37 @@
|
||||
<%= tabular_form_with model: Measurement.new, id: :measurement_form,
|
||||
class: 'topside-area vflex', html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
||||
<table class="items centered">
|
||||
<tbody id="readouts"></tbody>
|
||||
class: 'topside-area flex vertical center',
|
||||
html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
||||
|
||||
<table class="items-table center">
|
||||
<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">
|
||||
<%= form.datetime_field :taken_at, required: true %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="hflex">
|
||||
<%# TODO: right-click selection %>
|
||||
<details id="quantity_select" class="hexpand" open
|
||||
onkeydown="detailsProcessKey(event)">
|
||||
<summary autofocus>
|
||||
<!-- TODO: Set content with CSS when span empty to avoid duplication -->
|
||||
<span data-prompt="<%= t('.select_quantity') %>">
|
||||
<%= t('.select_quantity') %>
|
||||
</span>
|
||||
<%= image_button_tag t(:apply), "update", name: nil, disabled: true,
|
||||
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
||||
data: {turbo_stream: true} %>
|
||||
</summary>
|
||||
<ul><%= quantities_check_boxes %></ul>
|
||||
</details>
|
||||
<%= form.button id: :create_measurement_button, disabled: true -%>
|
||||
</div>
|
||||
<%# TODO: right-click selection; unnecessary with hierarchical tags? %>
|
||||
<details id="quantity_select" class="center hexpand" open
|
||||
onkeydown="detailsProcessKey(event)">
|
||||
<summary autofocus>
|
||||
<!-- TODO: Set content with CSS when span empty to avoid duplication -->
|
||||
<span data-prompt="<%= t('.select_quantity') %>">
|
||||
<%= t('.select_quantity') %>
|
||||
</span>
|
||||
<%= image_button_tag t(:apply), "update", name: nil, disabled: true,
|
||||
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
||||
data: {turbo_stream: true} %>
|
||||
</summary>
|
||||
<ul><%= quantities_check_boxes(@quantities) %></ul>
|
||||
</details>
|
||||
|
||||
<div class="hflex reverse">
|
||||
<div class="flex reverse">
|
||||
<%= form.button id: :create_measurement_button, disabled: true -%>
|
||||
<%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
|
||||
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
||||
</div>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||
</td>
|
||||
|
||||
<td class="actions">
|
||||
<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}) %>
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
|
||||
drop_id_param: "quantity[parent_id]"} do %>
|
||||
|
||||
<td class="link" style="--depth:<%= quantity.depth %>">
|
||||
<%= link_to quantity, edit_quantity_path(quantity), onclick: 'this.blur();',
|
||||
data: {turbo_stream: true} %>
|
||||
<td style="--depth:<%= quantity.depth %>">
|
||||
<%= link_to quantity, edit_quantity_path(quantity), class: 'link',
|
||||
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
</td>
|
||||
<td><%= quantity.description %></td>
|
||||
|
||||
<% if current_user.at_least(:active) %>
|
||||
<td class="actions">
|
||||
<td class="flex">
|
||||
<%= 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} %>
|
||||
|
||||
|
||||
@@ -8,13 +8,14 @@
|
||||
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 class="main-area items-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><%= Quantity.human_attribute_name(:name) %></th>
|
||||
<th><%= Quantity.human_attribute_name(:description) %></th>
|
||||
<th class="hexpand"><%= Quantity.human_attribute_name(:description) %></th>
|
||||
<% if current_user.at_least(:active) %>
|
||||
<th><%= t :actions %></th>
|
||||
<th></th>
|
||||
|
||||
@@ -1,25 +1,24 @@
|
||||
<%# TODO: add readout reordering by dragging %>
|
||||
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
||||
<%- tag.tr id: dom_id(readout.quantity, :new, :readout) do %>
|
||||
<td class="actions">
|
||||
<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.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">
|
||||
<%# 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),
|
||||
formmethod: :get, formnovalidate: true, data: {turbo_stream: true} %>
|
||||
</td>
|
||||
<td>
|
||||
<%= readout.quantity.relative_pathname(@superquantity) %>
|
||||
</td>
|
||||
<td>
|
||||
<%= form.number_field :value, required: true,
|
||||
size: readout.type_for_attribute(:value).precision / 2,
|
||||
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: t('.select_unit'), disabled: '', selected: ''}, required: true %>
|
||||
</td>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
<%= form_with url: setup_path, method: :post, class: "labeled-form main-area" do %>
|
||||
|
||||
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0;">
|
||||
<%= t(".admin_account") %>
|
||||
</h3>
|
||||
|
||||
<label for="admin_email"><%= t(".admin_email") %></label>
|
||||
<%= email_field_tag :admin_email, params[:admin_email],
|
||||
id: "admin_email", required: true, size: 30, autofocus: true,
|
||||
autocomplete: "email" %>
|
||||
|
||||
<label for="admin_password"><%= t(".admin_password") %></label>
|
||||
<%= password_field_tag :admin_password, nil,
|
||||
id: "admin_password", required: true, size: 30,
|
||||
autocomplete: "new-password" %>
|
||||
|
||||
<label for="admin_password_confirmation"><%= t(".admin_password_confirmation") %></label>
|
||||
<%= password_field_tag :admin_password_confirmation, nil,
|
||||
id: "admin_password_confirmation", required: true, size: 30,
|
||||
autocomplete: "off" %>
|
||||
|
||||
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0.5em 0 0 0;">
|
||||
<%= t(".options") %>
|
||||
</h3>
|
||||
|
||||
<label for="skip_email_confirmation" style="grid-column: 1 / 3; text-align: left;">
|
||||
<%= check_box_tag :skip_email_confirmation, "1",
|
||||
params[:skip_email_confirmation] == "1",
|
||||
id: "skip_email_confirmation" %>
|
||||
<%= t(".skip_email_confirmation") %>
|
||||
</label>
|
||||
|
||||
<label for="seed_units" style="grid-column: 1 / 3; text-align: left;">
|
||||
<%= check_box_tag :seed_units, "1", true, id: "seed_units" %>
|
||||
<%= t(".seed_units") %>
|
||||
</label>
|
||||
|
||||
<%= submit_tag t(".submit") %>
|
||||
<% end %>
|
||||
@@ -8,11 +8,11 @@
|
||||
<td>
|
||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||
</td>
|
||||
<td class="number">
|
||||
<td>
|
||||
<%= form.number_field :multiplier, required: true, size: 10, min: :step if @unit.base_id? %>
|
||||
</td>
|
||||
|
||||
<td class="actions">
|
||||
<td class="flex">
|
||||
<%= form.button %>
|
||||
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||
|
||||
@@ -6,14 +6,15 @@
|
||||
drop_id: dom_id(unit.base || unit),
|
||||
drop_id_param: "unit[base_id]"} do %>
|
||||
|
||||
<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 style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
||||
<%= link_to unit, edit_unit_path(unit), class: 'link', onclick: 'this.blur();',
|
||||
data: {turbo_stream: true} %>
|
||||
</td>
|
||||
<td><%= unit.description %></td>
|
||||
<td class="number"><%= unit.multiplier.to_html %></td>
|
||||
<td class="ralign"><%= unit.multiplier.to_html %></td>
|
||||
|
||||
<% if current_user.at_least(:active) %>
|
||||
<td class="actions">
|
||||
<td class="flex">
|
||||
<% unless unit.base_id? %>
|
||||
<%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
|
||||
id: dom_id(unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||
|
||||
@@ -7,13 +7,14 @@
|
||||
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 class="main-area items-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
||||
<th><%= Unit.human_attribute_name(:description) %></th>
|
||||
<th class="hexpand"><%= Unit.human_attribute_name(:description) %></th>
|
||||
<th><%= Unit.human_attribute_name(:multiplier) %></th>
|
||||
<% if current_user.at_least(:active) %>
|
||||
<th><%= t :actions %></th>
|
||||
|
||||
1
app/views/users/confirmations/create.turbo_stream.erb
Normal file
1
app/views/users/confirmations/create.turbo_stream.erb
Normal file
@@ -0,0 +1 @@
|
||||
<% flash.discard %>
|
||||
@@ -1,9 +0,0 @@
|
||||
<%= labeled_form_for resource, url: user_confirmation_path,
|
||||
html: {class: 'main-area'} do |f| %>
|
||||
|
||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||
autocomplete: 'email', value:
|
||||
resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email %>
|
||||
|
||||
<%= f.submit t(:resend_confirmation) %>
|
||||
<% end %>
|
||||
@@ -1,4 +1,4 @@
|
||||
<table class="main-area items" id="users">
|
||||
<table class="main-area items-table" id="users">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><%= User.human_attribute_name(:email) %></th>
|
||||
@@ -11,7 +11,7 @@
|
||||
<tbody>
|
||||
<% @users.each do |user| %>
|
||||
<tr>
|
||||
<td class="link"><%= link_to user, user_path(user) %></td>
|
||||
<td><%= link_to user, user_path(user), class: 'link' %></td>
|
||||
<td>
|
||||
<% if user == current_user %>
|
||||
<%= user.status %>
|
||||
@@ -22,11 +22,11 @@
|
||||
<% end %>
|
||||
<% end %>
|
||||
</td>
|
||||
<td class="svg">
|
||||
<td>
|
||||
<%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %>
|
||||
</td>
|
||||
<td><%= l user.created_at, format: :without_tz %></td>
|
||||
<td class="actions">
|
||||
<td class="flex">
|
||||
<% if allow_disguise?(user) %>
|
||||
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
||||
<% end %>
|
||||
|
||||
2
app/views/users/passwords/create.turbo_stream.erb
Normal file
2
app/views/users/passwords/create.turbo_stream.erb
Normal file
@@ -0,0 +1,2 @@
|
||||
<%# For some reason flash messages are duplicated in bot flash and flash.now %>
|
||||
<% flash.discard %>
|
||||
@@ -1,5 +1,5 @@
|
||||
<%= labeled_form_for resource, url: user_password_path,
|
||||
html: {method: :put, class: 'main-area'} do |f| %>
|
||||
html: {method: :put, class: 'main-area', data: {turbo: false}} do |f| %>
|
||||
|
||||
<%= f.hidden_field :reset_password_token %>
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
<%= labeled_form_for resource, url: user_password_path,
|
||||
html: {class: 'main-area'} do |f| %>
|
||||
|
||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||
autocomplete: 'email' %>
|
||||
|
||||
<%= f.submit t(:recover_password) %>
|
||||
<% end %>
|
||||
16
app/views/users/profiles/new.html.erb
Normal file
16
app/views/users/profiles/new.html.erb
Normal file
@@ -0,0 +1,16 @@
|
||||
<%= labeled_form_for resource, url: user_registration_path,
|
||||
html: {class: 'main-area', onsubmit: 'formValidate(event)'} do |f| %>
|
||||
|
||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||
autocomplete: 'email' %>
|
||||
<%= f.password_field :password, required: true, size: 30,
|
||||
minlength: @minimum_password_length, autocomplete: 'new-password' %>
|
||||
<%= f.password_field :password_confirmation, required: true, size: 30,
|
||||
minlength: @minimum_password_length, autocomplete: 'off' %>
|
||||
|
||||
<%= f.submit t(:register), data: {turbo: false} %>
|
||||
|
||||
<%= image_button_tag t(:resend_confirmation), 'email-sync-outline',
|
||||
class: 'auxiliary', formaction: user_confirmation_path, formnovalidate: true,
|
||||
data: {validate: f.field_id(:email)} %>
|
||||
<% end %>
|
||||
@@ -1,16 +0,0 @@
|
||||
<div class="main-area">
|
||||
<%= labeled_form_for resource, url: user_registration_path do |f| %>
|
||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||
autocomplete: 'email' %>
|
||||
<%= f.password_field :password, required: true, size: 30,
|
||||
minlength: @minimum_password_length, autocomplete: 'new-password' %>
|
||||
<%= f.password_field :password_confirmation, required: true, size: 30,
|
||||
minlength: @minimum_password_length, autocomplete: 'off' %>
|
||||
|
||||
<%= f.submit t(:register) %>
|
||||
<% end %>
|
||||
|
||||
<%= content_tag :p, t(:or), style: 'text-align: center;' %>
|
||||
<%= image_link_to t(:resend_confirmation), 'email-sync-outline',
|
||||
new_user_confirmation_path, class: 'centered' %>
|
||||
</div>
|
||||
@@ -1,18 +1,19 @@
|
||||
<div class="main-area">
|
||||
<%= labeled_form_for resource, url: user_session_path do |f| %>
|
||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||
autocomplete: 'email' %>
|
||||
<%= f.password_field :password, required: true, size: 30,
|
||||
minlength: @minimum_password_length, autocomplete: 'current-password' %>
|
||||
<%= labeled_form_for resource, url: user_session_path,
|
||||
html: {class: 'main-area', onsubmit: 'formValidate(event)'} do |f| %>
|
||||
|
||||
<% if devise_mapping.rememberable? %>
|
||||
<%= f.check_box :remember_me %>
|
||||
<% end %>
|
||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||
autocomplete: 'email' %>
|
||||
<%= f.password_field :password, required: true, size: 30,
|
||||
autocomplete: 'current-password' %>
|
||||
|
||||
<%= f.submit t(:sign_in) %>
|
||||
<% if devise_mapping.rememberable? %>
|
||||
<%= f.check_box :remember_me %>
|
||||
<% end %>
|
||||
|
||||
<%= content_tag :p, t(:or), style: 'text-align: center;' %>
|
||||
<%= image_link_to t(:recover_password), 'lock-reset', new_user_password_path,
|
||||
class: 'centered' %>
|
||||
</div>
|
||||
<%# /sign_in as HTML; /password as TURBO_STREAM %>
|
||||
<%= f.submit t(:sign_in), data: {turbo: false} %>
|
||||
|
||||
<%= image_button_tag t(:recover_password), 'lock-reset', class: 'auxiliary',
|
||||
formaction: user_password_path, formnovalidate: true,
|
||||
data: {validate: f.field_id(:email)} %>
|
||||
<% end %>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
|
||||
</div>
|
||||
|
||||
<div class="actions">
|
||||
<div class="flex">
|
||||
<%= f.submit "Resend unlock instructions" %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
@@ -20,6 +20,10 @@ Bundler.require(*Rails.groups)
|
||||
|
||||
module FixinMe
|
||||
class Application < Rails::Application
|
||||
# Allow RAILS_DATABASE_YML to override the database config file path.
|
||||
# Used by `rails test:all_databases` to test against multiple DB adapters.
|
||||
config.paths['config/database'] = [ENV['RAILS_DATABASE_YML']] if ENV['RAILS_DATABASE_YML']
|
||||
|
||||
# Initialize configuration defaults for originally generated Rails version.
|
||||
config.load_defaults 7.0
|
||||
|
||||
@@ -54,9 +58,5 @@ module FixinMe
|
||||
|
||||
# Sender address of account registration-related messages
|
||||
Devise.mailer_sender = 'noreply@localhost'
|
||||
|
||||
# Whether to skip e-mail confirmation for new registrations is configured
|
||||
# through the web setup wizard and stored in the database (Setting model),
|
||||
# so it does not need to be set here.
|
||||
end
|
||||
end
|
||||
|
||||
@@ -48,3 +48,26 @@ production:
|
||||
#test:
|
||||
# <<: *default
|
||||
# database: fixinme_test
|
||||
|
||||
# Multi-database testing — `bundle exec rails test:all_databases`
|
||||
# ---------------------------------------------------------------
|
||||
# Add any number of `test_<name>:` blocks to run the full test suite
|
||||
# against additional database adapters in a single command.
|
||||
# Each adapter's gem must be available in the bundle:
|
||||
# bundle config --local with "mysql:sqlite" # mysql + sqlite
|
||||
# bundle config --local with "mysql:pg" # mysql + postgresql
|
||||
#
|
||||
# Example — run tests against MySQL and SQLite:
|
||||
#
|
||||
#test_sqlite:
|
||||
# adapter: sqlite3
|
||||
# database: db/fixinme_test.sqlite3
|
||||
#
|
||||
# Example — run tests against MySQL and PostgreSQL:
|
||||
#
|
||||
#test_pg:
|
||||
# adapter: postgresql
|
||||
# database: fixinme_test
|
||||
# username: fixinme
|
||||
# password: Some-password1%
|
||||
# host: localhost
|
||||
|
||||
@@ -58,7 +58,4 @@ Rails.application.configure do
|
||||
# config.action_view.annotate_rendered_view_with_filenames = true
|
||||
|
||||
config.log_level = :info
|
||||
|
||||
# Allow the default integration test host.
|
||||
config.hosts << "www.example.com"
|
||||
end
|
||||
|
||||
@@ -91,7 +91,7 @@ Devise.setup do |config|
|
||||
# It will change confirmation, password recovery and other workflows
|
||||
# to behave the same regardless if the e-mail provided was right or wrong.
|
||||
# Does not affect registerable.
|
||||
# config.paranoid = true
|
||||
config.paranoid = true
|
||||
|
||||
# By default Devise will store the user in session. You can skip storage for
|
||||
# particular strategies by setting this option.
|
||||
|
||||
@@ -4,15 +4,15 @@ en:
|
||||
devise:
|
||||
confirmations:
|
||||
confirmed: "Your email address has been successfully confirmed."
|
||||
send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
|
||||
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
|
||||
send_paranoid_instructions: >
|
||||
If your email address is in our database, a message with instructions on how
|
||||
to confirm your email address has been sent to you.
|
||||
failure:
|
||||
already_authenticated: "You are already signed in."
|
||||
inactive: "Your account is not activated yet."
|
||||
invalid: "Invalid %{authentication_keys} or password."
|
||||
invalid: "Invalid <b>%{authentication_keys}</b> or <b>password</b>."
|
||||
locked: "Your account is locked."
|
||||
last_attempt: "You have one more attempt before your account is locked."
|
||||
not_found_in_database: "Invalid %{authentication_keys} or password."
|
||||
timeout: "Your session expired. Please sign in again to continue."
|
||||
unauthenticated: "You need to sign in or sign up before continuing."
|
||||
unconfirmed: "You have to confirm your email address before continuing."
|
||||
@@ -32,8 +32,9 @@ en:
|
||||
success: "Successfully authenticated from %{kind} account."
|
||||
passwords:
|
||||
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
|
||||
send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
|
||||
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
|
||||
send_paranoid_instructions: >
|
||||
If your email address is in our database, the password recovery link has been
|
||||
sent to you.
|
||||
updated: "Your password has been changed successfully. You are now signed in."
|
||||
updated_not_active: "Your password has been changed successfully."
|
||||
registrations:
|
||||
@@ -50,7 +51,6 @@ en:
|
||||
signed_out: "Signed out successfully."
|
||||
already_signed_out: "Signed out successfully."
|
||||
unlocks:
|
||||
send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
|
||||
send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
|
||||
unlocked: "Your account has been unlocked successfully. Please sign in to continue."
|
||||
errors:
|
||||
|
||||
@@ -85,12 +85,10 @@ en:
|
||||
navigation: Measurements
|
||||
no_items: There are no measurements taken. You can Add some now.
|
||||
form:
|
||||
select_quantity: select the measured quantities...
|
||||
select_quantity: select quantities...
|
||||
taken_at_html: Measurement taken at 
|
||||
index:
|
||||
new_measurement: Add measurement
|
||||
readouts:
|
||||
form:
|
||||
select_unit: ...
|
||||
quantities:
|
||||
navigation: Quantities
|
||||
no_items: There are no configured quantities. You can Add some or Import from defaults.
|
||||
@@ -150,7 +148,7 @@ en:
|
||||
edit:
|
||||
password_html: 'New password:%{password_length_hint_html}'
|
||||
update_password: Update password
|
||||
registrations:
|
||||
profiles:
|
||||
new:
|
||||
password_html: 'Password:%{password_length_hint_html}'
|
||||
password_confirmation: 'Retype password:'
|
||||
@@ -163,30 +161,12 @@ en:
|
||||
<br><em>leave blank to keep unchanged</em>
|
||||
%{password_length_hint_html}
|
||||
actions: Actions
|
||||
setup:
|
||||
new:
|
||||
admin_account: Admin account
|
||||
admin_email: 'E-mail:'
|
||||
admin_password: 'Password:'
|
||||
admin_password_confirmation: 'Retype password:'
|
||||
options: Options
|
||||
skip_email_confirmation: Skip e-mail confirmation for new registrations
|
||||
seed_units: Seed built-in default units
|
||||
submit: Set up
|
||||
create:
|
||||
email_blank: E-mail cannot be blank.
|
||||
password_blank: Password cannot be blank.
|
||||
password_mismatch: Passwords do not match.
|
||||
success: >
|
||||
Installation complete. You can now sign in with the admin account you
|
||||
just created.
|
||||
add: Add
|
||||
apply: Apply
|
||||
back: Back
|
||||
cancel: Cancel
|
||||
delete: Delete
|
||||
:no: 'no'
|
||||
or: or
|
||||
register: Register
|
||||
sign_in: Sign in
|
||||
recover_password: Recover password
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
Rails.application.routes.draw do
|
||||
# Web-based installation wizard — only reachable when no admin exists yet.
|
||||
resource :setup, only: [:new, :create], controller: :setup
|
||||
|
||||
resources :measurements
|
||||
|
||||
resources :readouts, only: [:new] do
|
||||
@@ -27,8 +24,9 @@ Rails.application.routes.draw do
|
||||
# https://github.com/heartcombo/devise/issues/5786
|
||||
connection = ActiveRecord::Base.connection
|
||||
if connection.schema_version && connection.table_exists?(:users)
|
||||
# NOTE: change helper prefix from *_registration to *_profile once possible
|
||||
devise_for :users, path: '', path_names: {registration: 'profile'},
|
||||
controllers: {registrations: :registrations}
|
||||
controllers: {registrations: 'user/profiles'}
|
||||
end
|
||||
|
||||
resources :users, only: [:index, :show, :update] do
|
||||
@@ -37,9 +35,7 @@ Rails.application.routes.draw do
|
||||
end
|
||||
|
||||
unauthenticated do
|
||||
as :user do
|
||||
root to: redirect('/sign_in')
|
||||
end
|
||||
root to: redirect('/sign_in')
|
||||
end
|
||||
root to: redirect('/units'), as: :user_root
|
||||
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
class CreateReadouts < ActiveRecord::Migration[7.2]
|
||||
def change
|
||||
create_table :readouts do |t|
|
||||
t.references :user, null: false, foreign_key: true
|
||||
# Reference :user through :quantity (:measurement may be NULL).
|
||||
t.references :measurement, foreign_key: true
|
||||
t.references :quantity, null: false, foreign_key: true
|
||||
# :category + :value + :unit as a separate table? (NumericValue, TextValue)
|
||||
t.integer :category, null: false, default: 0
|
||||
t.float :value, null: false, limit: Float::MANT_DIG
|
||||
t.references :unit, foreign_key: true
|
||||
t.decimal :value, null: false, precision: 30, scale: 15
|
||||
# Move to Measurement?
|
||||
#t.references :collector, foreign_key: true
|
||||
#t.references :device, foreign_key: true
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
class CreateSettings < ActiveRecord::Migration[7.2]
|
||||
def change
|
||||
create_table :settings do |t|
|
||||
t.string :key, null: false
|
||||
t.string :value
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
|
||||
add_index :settings, :key, unique: true
|
||||
end
|
||||
end
|
||||
11
db/seeds.rb
11
db/seeds.rb
@@ -3,17 +3,6 @@
|
||||
# bin/rails db:seed
|
||||
# command (or created alongside the database with db:setup).
|
||||
# Seeding process should be idempotent.
|
||||
#
|
||||
# Admin account setup
|
||||
# -------------------
|
||||
# The preferred way to create the first admin account is through the web setup
|
||||
# wizard, which is shown automatically on the first visit when no admin exists.
|
||||
# The wizard also lets you configure runtime options (e.g. skip e-mail
|
||||
# confirmation) and seed the default units without using the command line.
|
||||
#
|
||||
# The block below provides an alternative CLI path for headless / automated
|
||||
# deployments. It is skipped when an admin account already exists (e.g. after
|
||||
# the web wizard has run).
|
||||
|
||||
User.transaction do
|
||||
break if User.find_by status: :admin
|
||||
|
||||
118
lib/tasks/test_databases.rake
Normal file
118
lib/tasks/test_databases.rake
Normal file
@@ -0,0 +1,118 @@
|
||||
require 'yaml'
|
||||
require 'erb'
|
||||
require 'tmpdir'
|
||||
|
||||
namespace :test do
|
||||
desc <<~DESC
|
||||
Run the full test suite against every test database configured in database.yml.
|
||||
|
||||
Any top-level key that starts with "test" and contains a Hash is treated as a
|
||||
test database configuration:
|
||||
|
||||
test: # always required — the primary test database
|
||||
adapter: mysql2
|
||||
database: fixinme_test
|
||||
...
|
||||
|
||||
test_sqlite: # optional additional databases
|
||||
adapter: sqlite3
|
||||
database: db/fixinme_test.sqlite3
|
||||
|
||||
test_pg:
|
||||
adapter: postgresql
|
||||
database: fixinme_test
|
||||
...
|
||||
|
||||
For each database the task will:
|
||||
1. Check that the required adapter gem is available (skip with warning if not).
|
||||
2. Run `rails db:test:prepare` to create/migrate the database.
|
||||
3. Run `rails test` and record pass/fail.
|
||||
|
||||
A summary is printed at the end. The task exits non-zero if any database fails.
|
||||
DESC
|
||||
task :all_databases do
|
||||
db_file = Rails.root.join('config', 'database.yml')
|
||||
all = YAML.safe_load(ERB.new(db_file.read).result, aliases: true) || {}
|
||||
test_cfgs = all.select { |k, v| k.to_s.start_with?('test') && v.is_a?(Hash) }
|
||||
non_test = all.reject { |k, _| k.to_s.start_with?('test') }
|
||||
|
||||
abort "No test database configurations found in #{db_file}." if test_cfgs.empty?
|
||||
|
||||
results = {}
|
||||
|
||||
test_cfgs.each do |name, config|
|
||||
adapter = config['adapter'].to_s
|
||||
|
||||
puts "\n#{'─' * 64}"
|
||||
puts " #{name} (adapter: #{adapter})"
|
||||
puts '─' * 64
|
||||
|
||||
unless adapter_available?(adapter)
|
||||
puts " SKIPPED — gem for '#{adapter}' adapter not available in bundle."
|
||||
puts " Add it to Gemfile (e.g. `bundle config --local with #{adapter_group(adapter)}`)"
|
||||
results[name] = :skipped
|
||||
next
|
||||
end
|
||||
|
||||
Dir.mktmpdir('rails_test_db_') do |tmpdir|
|
||||
tmp_yml = File.join(tmpdir, 'database.yml')
|
||||
# Write a standalone database.yml with just this config as `test:`
|
||||
# (non-test configs are preserved so boot doesn't fail on `production:` lookup)
|
||||
File.write(tmp_yml, non_test.merge('test' => config).to_yaml)
|
||||
|
||||
env = { 'RAILS_DATABASE_YML' => tmp_yml }
|
||||
|
||||
if system(env, 'bundle exec rails db:test:prepare')
|
||||
results[name] = system(env, 'bundle exec rails test') ? :pass : :fail
|
||||
else
|
||||
results[name] = :prepare_failed
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
puts "\n#{'═' * 64}"
|
||||
puts " SUMMARY"
|
||||
puts '═' * 64
|
||||
results.each do |name, status|
|
||||
adapter = test_cfgs[name]['adapter']
|
||||
icon = { pass: '✓', fail: '✗', prepare_failed: '✗', skipped: '–' }[status]
|
||||
label = { pass: 'PASS', fail: 'FAIL',
|
||||
prepare_failed: 'PREPARE FAILED', skipped: 'SKIPPED' }[status]
|
||||
puts " #{icon} #{name.ljust(26)} (#{adapter.ljust(12)}) #{label}"
|
||||
end
|
||||
puts '═' * 64
|
||||
|
||||
failed = results.count { |_, s| s == :fail || s == :prepare_failed }
|
||||
abort "\n #{failed} database(s) failed." if failed > 0
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Returns true if the gem required for this adapter is loadable.
|
||||
ADAPTER_GEMS = {
|
||||
'mysql2' => 'mysql2',
|
||||
'sqlite3' => 'sqlite3',
|
||||
'postgresql' => 'pg',
|
||||
'pg' => 'pg',
|
||||
}.freeze
|
||||
|
||||
def adapter_available?(adapter)
|
||||
gem_name = ADAPTER_GEMS.fetch(adapter, adapter)
|
||||
require gem_name
|
||||
true
|
||||
rescue LoadError
|
||||
false
|
||||
end
|
||||
|
||||
# Returns the Bundler group name that installs the adapter gem.
|
||||
ADAPTER_GROUPS = {
|
||||
'mysql2' => 'mysql',
|
||||
'sqlite3' => 'sqlite',
|
||||
'postgresql' => 'postgresql',
|
||||
'pg' => 'postgresql',
|
||||
}.freeze
|
||||
|
||||
def adapter_group(adapter)
|
||||
ADAPTER_GROUPS.fetch(adapter, adapter)
|
||||
end
|
||||
@@ -1,50 +0,0 @@
|
||||
namespace :test do
|
||||
desc "Run Rails tests against all supported database adapters (SQLite, MySQL)"
|
||||
task :all_adapters do
|
||||
# DATABASE_URL overrides the adapter from database.yml at runtime.
|
||||
# MySQL requires the mysql2 gem: bundle install --with mysql
|
||||
adapters = {
|
||||
"SQLite" => {
|
||||
"DATABASE_URL" => "sqlite3:db/test.sqlite3"
|
||||
},
|
||||
"MySQL" => {
|
||||
"DATABASE_URL" => format(
|
||||
"mysql2://%s:%s@%s/%s",
|
||||
ENV.fetch("DATABASE_USERNAME", "root"),
|
||||
ENV.fetch("DATABASE_PASSWORD", ""),
|
||||
ENV.fetch("DATABASE_HOST", "127.0.0.1"),
|
||||
ENV.fetch("DATABASE_NAME", "fixin_test")
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
failed = []
|
||||
|
||||
adapters.each do |name, extra_env|
|
||||
puts "\n#{"=" * 60}"
|
||||
puts " Running tests with #{name}"
|
||||
puts "=" * 60
|
||||
|
||||
env = ENV.to_h.merge("RAILS_ENV" => "test").merge(extra_env)
|
||||
|
||||
# Reset test database; db:drop may fail on first run — that's fine
|
||||
system(env, "bin/rails db:drop")
|
||||
unless system(env, "bin/rails db:create db:schema:load")
|
||||
failed << "#{name} (database setup)"
|
||||
next
|
||||
end
|
||||
|
||||
failed << name unless system(env, "bin/rails test")
|
||||
end
|
||||
|
||||
puts "\n#{"=" * 60}"
|
||||
if failed.any?
|
||||
puts " FAILED: #{failed.join(", ")}"
|
||||
puts "=" * 60
|
||||
exit 1
|
||||
else
|
||||
puts " All adapters passed!"
|
||||
puts "=" * 60
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,6 +1,7 @@
|
||||
require "test_helper"
|
||||
|
||||
class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
|
||||
include ActionView::Helpers::SanitizeHelper
|
||||
include ActionView::Helpers::UrlHelper
|
||||
|
||||
# NOTE: geckodriver installed with Firefox, ignore incompatibility warning
|
||||
@@ -32,7 +33,8 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
|
||||
# Allow skipping interpolations when translating for testing purposes
|
||||
INTERPOLATION_PATTERNS = Regexp.union(I18n.config.interpolation_patterns)
|
||||
def translate(key, **options)
|
||||
options.empty? ? super.split(INTERPOLATION_PATTERNS, 2).first : super
|
||||
translation = options.empty? ? super.split(INTERPOLATION_PATTERNS, 2).first : super
|
||||
sanitize(translation, tags: [])
|
||||
end
|
||||
alias :t :translate
|
||||
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
require "test_helper"
|
||||
|
||||
class Default::UnitsControllerTest < ActionDispatch::IntegrationTest
|
||||
setup do
|
||||
sign_in users(:alice)
|
||||
end
|
||||
|
||||
test "should get index" do
|
||||
get default_units_url
|
||||
get units_defaults_index_url
|
||||
assert_response :success
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2,9 +2,7 @@ require "test_helper"
|
||||
|
||||
class UsersControllerTest < ActionDispatch::IntegrationTest
|
||||
setup do
|
||||
@admin = users(:admin)
|
||||
@user = users(:alice)
|
||||
sign_in @admin
|
||||
@user = users(:one)
|
||||
end
|
||||
|
||||
test "should get index" do
|
||||
@@ -12,25 +10,39 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should get new" do
|
||||
get new_user_url
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should create user" do
|
||||
assert_difference("User.count") do
|
||||
post users_url, params: { user: { email: @user.email, status: @user.status } }
|
||||
end
|
||||
|
||||
assert_redirected_to user_url(User.last)
|
||||
end
|
||||
|
||||
test "should show user" do
|
||||
get user_url(@user)
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should get edit" do
|
||||
get edit_user_url(@user)
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should update user" do
|
||||
patch user_url(@user), params: { user: { status: :restricted } }, as: :turbo_stream
|
||||
assert_equal "restricted", @user.reload.status
|
||||
patch user_url(@user), params: { user: { email: @user.email, status: @user.status } }
|
||||
assert_redirected_to user_url(@user)
|
||||
end
|
||||
|
||||
test "should not update self" do
|
||||
patch user_url(@admin), params: { user: { status: :active } }, as: :turbo_stream,
|
||||
headers: { "HTTP_REFERER" => users_url }
|
||||
assert_response :redirect
|
||||
end
|
||||
test "should destroy user" do
|
||||
assert_difference("User.count", -1) do
|
||||
delete user_url(@user)
|
||||
end
|
||||
|
||||
test "should forbid non-admin" do
|
||||
sign_in @user
|
||||
get users_url
|
||||
assert_response :forbidden
|
||||
assert_redirected_to users_url
|
||||
end
|
||||
end
|
||||
|
||||
@@ -5,8 +5,8 @@ class UsersTest < ApplicationSystemTestCase
|
||||
@admin = users(:admin)
|
||||
end
|
||||
|
||||
test "sign in" do
|
||||
visit new_user_session_path
|
||||
test 'sign in' do
|
||||
visit root_url
|
||||
assert find_link(href: new_user_session_path)[:disabled]
|
||||
|
||||
sign_in
|
||||
@@ -14,16 +14,23 @@ class UsersTest < ApplicationSystemTestCase
|
||||
assert_text t('devise.sessions.signed_in')
|
||||
end
|
||||
|
||||
test 'sign in fails with invalid password' do
|
||||
sign_in password: random_password
|
||||
test 'sign in fails with invalid credentials' do
|
||||
label = User.human_attribute_name(:email)
|
||||
# Both: valid and invalid emails should give the same (paranoid) error message.
|
||||
email = [users.sample.email, random_email].sample
|
||||
|
||||
visit root_url
|
||||
fill_in label, with: email
|
||||
fill_in User.human_attribute_name(:password), with: random_password
|
||||
click_on t(:sign_in)
|
||||
|
||||
assert_current_path new_user_session_path
|
||||
assert_text t('devise.failure.not_found_in_database',
|
||||
authentication_keys: User.human_attribute_name(:email))
|
||||
assert_text t('devise.failure.invalid', authentication_keys: label.downcase_first)
|
||||
assert find_link(href: new_user_session_path)[:disabled]
|
||||
assert_not_empty find_field(User.human_attribute_name(:email)).value
|
||||
assert has_field?(label, with: email)
|
||||
end
|
||||
|
||||
test "sign out" do
|
||||
test 'sign out' do
|
||||
sign_in
|
||||
visit root_url
|
||||
click_on t("layouts.application.sign_out")
|
||||
@@ -31,79 +38,106 @@ class UsersTest < ApplicationSystemTestCase
|
||||
assert_text t("devise.sessions.signed_out")
|
||||
end
|
||||
|
||||
test "recover password" do
|
||||
visit new_user_session_url
|
||||
click_on t(:recover_password)
|
||||
test 'recover password' do
|
||||
label = User.human_attribute_name(:email)
|
||||
email = users.select(&:confirmed?).sample.email
|
||||
|
||||
visit root_url
|
||||
fill_in label, with: email
|
||||
# Form validations should allow empty password.
|
||||
assert has_field?(User.human_attribute_name(:password), with: nil)
|
||||
|
||||
fill_in User.human_attribute_name(:email),
|
||||
with: users.select(&:confirmed?).sample.email
|
||||
assert_emails 1 do
|
||||
click_on t(:recover_password)
|
||||
# Wait until redirected to make sure async request has been processed
|
||||
assert_current_path new_user_session_path
|
||||
# Wait for flash message to make sure async request has been processed.
|
||||
assert_text t("devise.passwords.send_paranoid_instructions")
|
||||
end
|
||||
assert_text t("devise.passwords.send_instructions")
|
||||
assert has_field?(label, with: email)
|
||||
|
||||
with_last_email do |mail|
|
||||
visit Capybara.string(mail.body.to_s).find_link("Change my password")[:href]
|
||||
assert_current_path edit_user_password_path, ignore_query: true
|
||||
# Make sure flash message is not displayed twice.
|
||||
assert_no_text t("devise.passwords.send_paranoid_instructions")
|
||||
end
|
||||
new_password = random_password
|
||||
fill_in t("users.passwords.edit.password_html"), with: new_password
|
||||
fill_in t("helpers.label.user.password_confirmation"), with: new_password
|
||||
assert_emails 1 do
|
||||
click_on t("users.passwords.edit.update_password")
|
||||
# Wait until redirected to make sure async request has been processed
|
||||
assert_current_path units_path
|
||||
assert_text t("devise.passwords.updated")
|
||||
end
|
||||
assert_text t("devise.passwords.updated")
|
||||
end
|
||||
|
||||
test "register" do
|
||||
visit new_user_session_url
|
||||
test 'recover password for nonexistent user' do
|
||||
label = User.human_attribute_name(:email)
|
||||
email = random_email
|
||||
|
||||
visit root_url
|
||||
fill_in label, with: email
|
||||
|
||||
assert_no_emails do
|
||||
click_on t(:recover_password)
|
||||
assert_current_path new_user_session_path
|
||||
assert_text t("devise.passwords.send_paranoid_instructions")
|
||||
end
|
||||
end
|
||||
|
||||
test 'register' do
|
||||
visit root_url
|
||||
click_on t(:register)
|
||||
assert find_link(href: new_user_registration_path)[:disabled]
|
||||
|
||||
fill_in User.human_attribute_name(:email), with: random_email
|
||||
password = random_password
|
||||
fill_in User.human_attribute_name(:password), with: password
|
||||
fill_in t("users.registrations.new.password_confirmation"), with: password
|
||||
assert_difference ->{User.count}, 1 do
|
||||
fill_in t("users.profiles.new.password_confirmation"), with: password
|
||||
assert_difference ->{ User.count }, 1 do
|
||||
assert_emails 1 do
|
||||
click_on t(:register)
|
||||
# Wait until redirected to make sure async request has been processed
|
||||
assert_current_path new_user_session_path
|
||||
assert_text t("devise.registrations.signed_up_but_unconfirmed")
|
||||
end
|
||||
end
|
||||
assert_text t("devise.registrations.signed_up_but_unconfirmed")
|
||||
|
||||
with_last_email do |mail|
|
||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
||||
assert_changes ->{ User.last.confirmed? }, from: false, to: true do
|
||||
with_last_email do |mail|
|
||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
||||
assert_current_path new_user_session_path
|
||||
assert_text t("devise.confirmations.confirmed")
|
||||
end
|
||||
end
|
||||
assert_current_path new_user_session_path
|
||||
assert_text t("devise.confirmations.confirmed")
|
||||
assert User.last.confirmed?
|
||||
end
|
||||
|
||||
test "resend confirmation" do
|
||||
visit new_user_session_url
|
||||
click_on t(:register)
|
||||
click_on t(:resend_confirmation)
|
||||
test 'resend confirmation' do
|
||||
label = User.human_attribute_name(:email)
|
||||
user = users.reject(&:confirmed?).sample
|
||||
|
||||
visit root_url
|
||||
click_on t(:register)
|
||||
fill_in label, with: user.email
|
||||
assert has_field?(User.human_attribute_name(:password), with: nil)
|
||||
|
||||
fill_in User.human_attribute_name(:email),
|
||||
with: users.reject(&:confirmed?).sample.email
|
||||
assert_emails 1 do
|
||||
click_on t(:resend_confirmation)
|
||||
# Wait until redirected to make sure async request has been processed
|
||||
assert_current_path new_user_session_path
|
||||
assert_current_path new_user_registration_path
|
||||
assert_text t("devise.confirmations.send_paranoid_instructions")
|
||||
end
|
||||
assert_current_path new_user_session_path
|
||||
assert_text t("devise.confirmations.send_instructions")
|
||||
assert has_field?(label, with: user.email)
|
||||
|
||||
with_last_email do |mail|
|
||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
||||
assert_changes ->{ user.reload.confirmed? }, from: false, to: true do
|
||||
with_last_email do |mail|
|
||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
||||
assert_current_path new_user_session_path
|
||||
assert_no_text t("devise.confirmations.send_paranoid_instructions")
|
||||
assert_text t("devise.confirmations.confirmed")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
test "show profile" do
|
||||
test 'show profile' do
|
||||
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
||||
click_on t("users.navigation")
|
||||
within all('tr').drop(1).sample do |tr|
|
||||
@@ -113,7 +147,7 @@ class UsersTest < ApplicationSystemTestCase
|
||||
end
|
||||
end
|
||||
|
||||
test "disguise" do
|
||||
test 'disguise' do
|
||||
user = users.select(&:admin?).select(&:confirmed?).sample
|
||||
sign_in user: user
|
||||
|
||||
@@ -129,7 +163,7 @@ class UsersTest < ApplicationSystemTestCase
|
||||
assert_link user.email
|
||||
end
|
||||
|
||||
test "disguise fails for admin when disallowed" do
|
||||
test 'disguise fails for admin when disallowed' do
|
||||
user = users.select(&:admin?).select(&:confirmed?).sample
|
||||
sign_in user: user
|
||||
|
||||
@@ -142,13 +176,13 @@ class UsersTest < ApplicationSystemTestCase
|
||||
assert_title 'The change you wanted was rejected (422)'
|
||||
end
|
||||
|
||||
test "disguise forbidden for non admin" do
|
||||
test 'disguise forbidden for non admin' do
|
||||
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||
visit disguise_user_path(User.all.sample)
|
||||
assert_title 'Access is forbidden to this page (403)'
|
||||
end
|
||||
|
||||
test "delete profile" do
|
||||
test 'delete profile' do
|
||||
user = sign_in
|
||||
# TODO: remove condition after root_url changed to different path than
|
||||
# profile in routes.rb
|
||||
@@ -156,23 +190,23 @@ class UsersTest < ApplicationSystemTestCase
|
||||
first(:link_or_button, user.email).click
|
||||
end
|
||||
assert_difference ->{ User.count }, -1 do
|
||||
accept_confirm { click_on t("users.registrations.edit.delete") }
|
||||
accept_confirm { click_on t("users.profiles.edit.delete") }
|
||||
assert_current_path new_user_session_path
|
||||
end
|
||||
assert_text t("devise.registrations.destroyed")
|
||||
end
|
||||
|
||||
test "index forbidden for non admin" do
|
||||
test 'index forbidden for non admin' do
|
||||
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||
visit users_path
|
||||
assert_title "Access is forbidden to this page (403)"
|
||||
end
|
||||
|
||||
test "update profile" do
|
||||
test 'update profile' do
|
||||
# TODO
|
||||
end
|
||||
|
||||
test "update status" do
|
||||
test 'update status' do
|
||||
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
||||
visit users_path
|
||||
|
||||
@@ -187,7 +221,7 @@ class UsersTest < ApplicationSystemTestCase
|
||||
assert_current_path users_path
|
||||
end
|
||||
|
||||
test "update status fails for admin when disallowed" do
|
||||
test 'update status fails for admin when disallowed' do
|
||||
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
||||
visit users_path
|
||||
|
||||
@@ -200,7 +234,7 @@ class UsersTest < ApplicationSystemTestCase
|
||||
assert_title 'The change you wanted was rejected (422)'
|
||||
end
|
||||
|
||||
test "update status forbidden for non admin" do
|
||||
test 'update status forbidden for non admin' do
|
||||
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||
visit units_path
|
||||
inject_button_to find('body'), "update status", user_path(User.all.sample), method: :patch,
|
||||
|
||||
@@ -2,10 +2,6 @@ ENV["RAILS_ENV"] ||= "test"
|
||||
require_relative "../config/environment"
|
||||
require "rails/test_help"
|
||||
|
||||
class ActionDispatch::IntegrationTest
|
||||
include Devise::Test::IntegrationHelpers
|
||||
end
|
||||
|
||||
class ActiveSupport::TestCase
|
||||
# Run tests in parallel with specified workers
|
||||
parallelize(workers: :number_of_processors)
|
||||
|
||||
Reference in New Issue
Block a user