forked from fixin.me/fixin.me
Compare commits
10 Commits
test-multi
...
feature/ex
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e0f27b357 | |||
| d893e59293 | |||
| 33004f62bd | |||
| 687e6fcdff | |||
| 5ed066ad18 | |||
| dde4e52f1b | |||
| a9091d76a8 | |||
| 4175d31b9d | |||
| c659201904 | |||
| 83b064ef3c |
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:
|
/* Strive for simplicity:
|
||||||
* * style elements/tags only - if possible,
|
* * style elements/tags only - if possible,
|
||||||
* * replace element/tag name with class name - if element has to be styled
|
* * 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,
|
* NOTE: style in a modular way, similar to how CSS @scope would be used,
|
||||||
* to make transition easier once @scope is widely available */
|
* to make transition easier once @scope is widely available. */
|
||||||
:root {
|
:root {
|
||||||
--color-focus-gray: #f3f3f3;
|
--color-focus-gray: #f3f3f3;
|
||||||
--color-border-gray: #dddddd;
|
--color-border-gray: #dddddd;
|
||||||
@@ -53,17 +55,36 @@
|
|||||||
:focus-visible {
|
:focus-visible {
|
||||||
outline: none;
|
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:
|
/* Color coding of input controls' background:
|
||||||
* blue - target for interaction with pointer
|
* blue - target for interaction with pointer,
|
||||||
* gray - target for interaction with keyboard
|
* gray - target for interaction with keyboard,
|
||||||
* red - destructive, non-undoable action
|
* red - destructive, non-undoable action.
|
||||||
*/
|
*/
|
||||||
|
/* TODO: merge selectors using :is() */
|
||||||
|
a,
|
||||||
button,
|
button,
|
||||||
details,
|
details,
|
||||||
input,
|
input,
|
||||||
select,
|
select,
|
||||||
|
summary,
|
||||||
textarea {
|
textarea {
|
||||||
background-color: inherit;
|
background-color: inherit;
|
||||||
font: inherit;
|
font: inherit;
|
||||||
@@ -73,50 +94,24 @@ input,
|
|||||||
select {
|
select {
|
||||||
text-align: inherit;
|
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,
|
input,
|
||||||
select,
|
select,
|
||||||
summary,
|
summary,
|
||||||
textarea {
|
textarea {
|
||||||
border: solid 1px var(--color-gray);
|
border: 1px solid var(--color-gray);
|
||||||
border-radius: 0.25em;
|
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 {
|
textarea {
|
||||||
margin: 0
|
margin: 0;
|
||||||
}
|
}
|
||||||
input[type=checkbox] {
|
input[type=checkbox] {
|
||||||
accent-color: var(--color-blue);
|
accent-color: var(--color-blue);
|
||||||
@@ -124,16 +119,20 @@ input[type=checkbox] {
|
|||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
display: flex;
|
display: flex;
|
||||||
height: 1.1em;
|
height: 1.1em;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
width: 1.1em;
|
width: 1.1em;
|
||||||
}
|
}
|
||||||
input[type=checkbox]:checked {
|
input[type=checkbox]:checked {
|
||||||
appearance: checkbox;
|
appearance: checkbox;
|
||||||
-webkit-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] {
|
input[type=number] {
|
||||||
appearance: textfield;
|
appearance: textfield;
|
||||||
-moz-appearance: textfield;
|
-moz-appearance: textfield;
|
||||||
|
text-align: end;
|
||||||
}
|
}
|
||||||
input::-webkit-inner-spin-button {
|
input::-webkit-inner-spin-button {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
@@ -142,37 +141,108 @@ input::-webkit-outer-spin-button {
|
|||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
.button > svg,
|
/* Text color of table form controls:
|
||||||
.tab > svg,
|
* - black for row/table forms,
|
||||||
button > svg {
|
* - inherited for internal (column specific) buttons/forms. */
|
||||||
height: 1.4em;
|
table input,
|
||||||
width: 1.4em;
|
table select,
|
||||||
|
table summary,
|
||||||
|
table textarea {
|
||||||
|
border-color: var(--color-border-gray);
|
||||||
}
|
}
|
||||||
.button > svg:not(:last-child),
|
table input,
|
||||||
.tab > svg:not(:last-child),
|
table select,
|
||||||
button > svg:not(:last-child) {
|
table textarea {
|
||||||
margin-right: 0.2em;
|
padding-block: 0.375em;
|
||||||
}
|
}
|
||||||
/* TODO: move normal non-button links (<a>:hover/:focus) styling here (i.e.
|
table form input,
|
||||||
* page-wide, top-level) and remove from table.items - as the style should be
|
table form select,
|
||||||
* same everywhere */
|
table form summary,
|
||||||
.button:focus-visible,
|
table form textarea {
|
||||||
button:focus-visible,
|
color: inherit;
|
||||||
input[type=submit]:focus-visible {
|
}
|
||||||
background-color: var(--color-focus-gray);
|
table svg:not(:only-child) {
|
||||||
|
height: 1.25em;
|
||||||
|
width: 1.25em;
|
||||||
}
|
}
|
||||||
input:focus-visible,
|
input:focus-visible,
|
||||||
select:focus-visible,
|
select:focus-visible,
|
||||||
select:focus-within,
|
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,
|
summary:focus-visible,
|
||||||
textarea:focus-visible {
|
textarea:focus-visible {
|
||||||
accent-color: var(--color-dark-blue);
|
accent-color: var(--color-dark-blue);
|
||||||
background-color: var(--color-focus-gray);
|
background-color: var(--color-focus-gray);
|
||||||
|
color: black;
|
||||||
}
|
}
|
||||||
.button:hover,
|
input:hover,
|
||||||
button:hover,
|
select:hover,
|
||||||
input[type=submit]: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);
|
background-color: var(--color-blue);
|
||||||
border-color: var(--color-blue);
|
border-color: var(--color-blue);
|
||||||
color: white;
|
color: white;
|
||||||
@@ -182,32 +252,24 @@ input[type=submit]:hover {
|
|||||||
background-color: var(--color-red);
|
background-color: var(--color-red);
|
||||||
border-color: var(--color-red);
|
border-color: var(--color-red);
|
||||||
}
|
}
|
||||||
input:hover,
|
.link:focus-visible {
|
||||||
select:hover,
|
text-decoration-color: var(--color-gray);
|
||||||
summary:hover,
|
|
||||||
textarea:hover {
|
|
||||||
border-color: var(--color-blue);
|
|
||||||
outline: solid 1px var(--color-blue);
|
|
||||||
}
|
}
|
||||||
select:hover,
|
.link:hover {
|
||||||
summary:hover {
|
color: var(--color-blue);
|
||||||
cursor: pointer;
|
text-decoration-color: var(--color-blue);
|
||||||
}
|
}
|
||||||
input:invalid,
|
table .button {
|
||||||
select:invalid,
|
border-color: var(--color-border-gray);
|
||||||
textarea:invalid {
|
color: var(--color-table-gray);
|
||||||
border-color: var(--color-red);
|
font-weight: normal;
|
||||||
outline: solid 1px var(--color-red);
|
height: 100%;
|
||||||
}
|
padding: 0.4em;
|
||||||
input[type=text]:read-only,
|
|
||||||
textarea:read-only {
|
|
||||||
border: none;
|
|
||||||
padding-inline: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* NOTE: collapse gaps around empty rows (`topside`) once possible
|
/* NOTE: collapse gaps around empty rows (`topside`) once possible with
|
||||||
* with grid-collapse property and remove alternative grid-template
|
* `grid-collapse` property and remove alternative `grid-template-areas`.
|
||||||
* https://github.com/w3c/csswg-drafts/issues/5813 */
|
* https://github.com/w3c/csswg-drafts/issues/5813 */
|
||||||
body {
|
body {
|
||||||
display: grid;
|
display: grid;
|
||||||
@@ -215,16 +277,16 @@ body {
|
|||||||
grid-template-areas:
|
grid-template-areas:
|
||||||
"header header header"
|
"header header header"
|
||||||
"nav nav nav"
|
"nav nav nav"
|
||||||
"leftside topside rightside"
|
|
||||||
"leftside main rightside";
|
"leftside main rightside";
|
||||||
grid-template-columns: 1fr minmax(max-content, 2fr) 1fr;
|
grid-template-columns: 1fr minmax(max-content, 2fr) 1fr;
|
||||||
font-family: system-ui;
|
font-family: system-ui;
|
||||||
margin: 0.4em;
|
margin: 0.4em;
|
||||||
}
|
}
|
||||||
body:not(:has(.topside-area)) {
|
body:has(> .topside-area) {
|
||||||
grid-template-areas:
|
grid-template-areas:
|
||||||
"header header header"
|
"header header header"
|
||||||
"nav nav nav"
|
"nav nav nav"
|
||||||
|
"leftside topside rightside"
|
||||||
"leftside main rightside";
|
"leftside main rightside";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,18 +302,14 @@ header {
|
|||||||
margin-inline-start: 4%;
|
margin-inline-start: 4%;
|
||||||
}
|
}
|
||||||
.navigation > .tab {
|
.navigation > .tab {
|
||||||
border-bottom: solid 2px var(--color-nav-gray);
|
border-bottom: 2px solid var(--color-nav-gray);
|
||||||
flex: 1;
|
flex: 1;
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding-block: 0.4em;
|
padding-block: 0.4em;
|
||||||
}
|
}
|
||||||
.navigation > .tab:hover,
|
|
||||||
.navigation > .tab:focus-visible {
|
|
||||||
background-color: var(--color-focus-gray);
|
|
||||||
}
|
|
||||||
.navigation > .tab.active {
|
.navigation > .tab.active {
|
||||||
border-bottom: solid 4px var(--color-blue);
|
border-bottom: 4px solid var(--color-blue);
|
||||||
color: var(--color-blue);
|
color: var(--color-blue);
|
||||||
fill: var(--color-blue);
|
fill: var(--color-blue);
|
||||||
}
|
}
|
||||||
@@ -283,7 +341,7 @@ header {
|
|||||||
|
|
||||||
#flashes {
|
#flashes {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 0.2em;
|
row-gap: 0.4em;
|
||||||
grid-template-columns: 1fr auto auto auto 1fr;
|
grid-template-columns: 1fr auto auto auto 1fr;
|
||||||
left: 0;
|
left: 0;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
@@ -299,48 +357,42 @@ header {
|
|||||||
display: grid;
|
display: grid;
|
||||||
grid-column: 2/5;
|
grid-column: 2/5;
|
||||||
grid-template-columns: subgrid;
|
grid-template-columns: subgrid;
|
||||||
|
line-height: 2.2em;
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
.flash.alert:before {
|
.flash:before {
|
||||||
content: url('pictograms/alert-outline.svg');
|
filter: invert();
|
||||||
height: 1.4em;
|
height: 1.4em;
|
||||||
margin: 0 0.5em;
|
margin: 0 0.5em;
|
||||||
width: 1.4em;
|
width: 1.4em;
|
||||||
}
|
}
|
||||||
|
.flash.alert:before {
|
||||||
|
content: url('pictograms/alert-outline.svg');
|
||||||
|
}
|
||||||
.flash.alert {
|
.flash.alert {
|
||||||
border-color: var(--color-red);
|
border-color: var(--color-red);
|
||||||
background-color: var(--color-red);
|
background-color: var(--color-red);
|
||||||
}
|
}
|
||||||
.flash.notice:before {
|
.flash.notice:before {
|
||||||
content: url('pictograms/check-circle-outline.svg');
|
content: url('pictograms/check-circle-outline.svg');
|
||||||
height: 1.4em;
|
|
||||||
margin: 0 0.5em;
|
|
||||||
width: 1.4em;
|
|
||||||
}
|
}
|
||||||
.flash.notice {
|
.flash.notice {
|
||||||
border-color: var(--color-blue);
|
border-color: var(--color-blue);
|
||||||
background-color: var(--color-blue);
|
background-color: var(--color-blue);
|
||||||
}
|
}
|
||||||
.flash > div {
|
.flash svg {
|
||||||
grid-column: 2;
|
|
||||||
}
|
|
||||||
/* NOTE: currently flash button inherits some unnecessary styles from generic
|
|
||||||
* button. */
|
|
||||||
.flash > button {
|
|
||||||
border: none;
|
|
||||||
color: inherit;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 1.4em;
|
fill: white;
|
||||||
font-weight: bold;
|
height: 2.2em;
|
||||||
grid-column: 3;
|
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
padding: 0.2em 0.4em;
|
padding: 0.4em 0.5em;
|
||||||
|
width: 2.4em;
|
||||||
}
|
}
|
||||||
.flash > button:hover {
|
.flash svg:hover {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: Hover over invalid should work like in measurements (thin vs thick border) */
|
|
||||||
.labeled-form {
|
.labeled-form {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
display: grid;
|
display: grid;
|
||||||
@@ -357,7 +409,7 @@ header {
|
|||||||
.labeled-form label.required {
|
.labeled-form label.required {
|
||||||
font-weight: bold;
|
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 {
|
.labeled-form label.error {
|
||||||
color: var(--color-red);
|
color: var(--color-red);
|
||||||
}
|
}
|
||||||
@@ -371,203 +423,123 @@ header {
|
|||||||
}
|
}
|
||||||
.labeled-form input[type=submit] {
|
.labeled-form input[type=submit] {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
margin: 1.5em auto 0 auto;
|
margin: 1em auto 0 auto;
|
||||||
padding: 0.75em;
|
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 */
|
.items-table {
|
||||||
table.items {
|
|
||||||
border-spacing: 0;
|
border-spacing: 0;
|
||||||
border: solid 1px var(--color-border-gray);
|
border: 1px solid var(--color-border-gray);
|
||||||
border-radius: 0.25em;
|
border-radius: 0.25em;
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
table:not(:has(tr)) {
|
.items-table thead {
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
table.items thead {
|
|
||||||
font-size: 0.8rem;
|
font-size: 0.8rem;
|
||||||
}
|
}
|
||||||
table.items thead,
|
.items-table thead,
|
||||||
table.items tbody tr:hover {
|
.items-table tbody tr:hover {
|
||||||
background-color: var(--color-focus-gray);
|
background-color: var(--color-focus-gray);
|
||||||
}
|
}
|
||||||
table.items th {
|
.items-table th {
|
||||||
padding-block: 0.75em;
|
padding: 0.75em 0 0.75em 1em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
table.items th,
|
.items-table th:last-child {
|
||||||
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 {
|
|
||||||
padding-inline-end: 0.4em;
|
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;
|
padding-inline-end: 0.1em;
|
||||||
}
|
}
|
||||||
table.items td {
|
.items-table :is(form, input, select, textarea):only-child {
|
||||||
border-top: solid 1px var(--color-border-gray);
|
margin-inline-start: calc(-0.4em - 0.9px);
|
||||||
height: 2.4em;
|
|
||||||
padding-block: 0.1em;
|
|
||||||
}
|
}
|
||||||
table.items .actions {
|
/* For <a> to fill table cell completely, we use an `::after` pseudoelement. */
|
||||||
display: flex;
|
/* 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;
|
gap: 0.4em;
|
||||||
justify-content: end;
|
justify-content: end;
|
||||||
}
|
}
|
||||||
table.items .actions.centered {
|
.items-table .dropzone {
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
table.items tr.dropzone {
|
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
table.items tr.dropzone::after {
|
.items-table .dropzone::after {
|
||||||
content: '';
|
content: '';
|
||||||
inset: 1px 0 0 0;
|
inset: 1px 0 0 0;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
outline: dashed 2px var(--color-blue);
|
outline: 2px dashed var(--color-blue);
|
||||||
outline-offset: -1px;
|
outline-offset: -1px;
|
||||||
z-index: var(--z-index-table-row-outline);
|
z-index: var(--z-index-table-row-outline);
|
||||||
}
|
}
|
||||||
table.items td.handle {
|
.items-table .handle {
|
||||||
cursor: move;
|
cursor: grab;
|
||||||
}
|
}
|
||||||
table.items tr.form td {
|
.items-table .form td {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
.items-table td:not(:first-child),
|
||||||
/* 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),
|
|
||||||
.grayed {
|
.grayed {
|
||||||
color: var(--color-table-gray);
|
color: var(--color-table-gray);
|
||||||
fill: var(--color-table-gray);
|
fill: var(--color-gray);
|
||||||
}
|
}
|
||||||
table.items svg {
|
.items-table td:has(> svg:only-child) {
|
||||||
height: 1rem;
|
|
||||||
vertical-align: middle;
|
|
||||||
width: 1rem;
|
|
||||||
}
|
|
||||||
table.items svg:last-child {
|
|
||||||
height: 1.2rem;
|
|
||||||
width: 1.2rem;
|
|
||||||
}
|
|
||||||
table.items td.svg {
|
|
||||||
text-align: center;
|
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;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
.extendedright {
|
|
||||||
margin-right: auto;
|
|
||||||
}
|
|
||||||
.hexpand {
|
.hexpand {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
.hflex {
|
.flex {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.8em;
|
gap: 0.8em;
|
||||||
}
|
}
|
||||||
.hflex.reverse {
|
.flex.reverse {
|
||||||
flex-direction: row-reverse;
|
flex-direction: row-reverse;
|
||||||
}
|
}
|
||||||
.hflex.centered {
|
.flex.vertical {
|
||||||
justify-content: center;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
.hint {
|
.hint {
|
||||||
color: var(--color-table-gray);
|
color: var(--color-table-gray);
|
||||||
@@ -575,21 +547,18 @@ form table.items td:first-child {
|
|||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.vflex {
|
.hmin50 {
|
||||||
display: flex;
|
min-width: 50%;
|
||||||
gap: 0.8em;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
}
|
||||||
[disabled] {
|
.italic {
|
||||||
/* label:has(input[disabled]) {
|
color: var(--color-gray);
|
||||||
* TODO: disabled checkbox blue square focus removal; disabled label styling;
|
font-style: italic;
|
||||||
* focused label styling (currently only checkbox has focus)
|
}
|
||||||
* */
|
.ralign {
|
||||||
border-color: var(--color-border-gray) !important;
|
text-align: right;
|
||||||
color: var(--color-border-gray) !important;
|
}
|
||||||
cursor: not-allowed;
|
.rextend {
|
||||||
fill: var(--color-border-gray) !important;
|
margin-right: auto;
|
||||||
pointer-events: none;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -601,12 +570,12 @@ summary {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
color: var(--color-gray);
|
color: var(--color-gray);
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.2em;
|
gap: 0.4em;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
summary::before {
|
summary::before {
|
||||||
background-color: #000;
|
background-color: currentColor;
|
||||||
content: "";
|
content: "";
|
||||||
height: 1em;
|
height: 1em;
|
||||||
mask-image: url('pictograms/chevron-down.svg');
|
mask-image: url('pictograms/chevron-down.svg');
|
||||||
@@ -618,7 +587,7 @@ summary:has(.button) {
|
|||||||
padding-inline-end: 0;
|
padding-inline-end: 0;
|
||||||
}
|
}
|
||||||
summary .button {
|
summary .button {
|
||||||
border: solid 1px var(--color-border-gray);
|
border: 1px solid var(--color-border-gray);
|
||||||
border-radius: inherit;
|
border-radius: inherit;
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
border-bottom-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
@@ -629,15 +598,15 @@ summary span {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
details[open] summary::before {
|
details[open] summary::before {
|
||||||
transform: rotate(180deg);
|
transform: scaleY(-1);
|
||||||
}
|
}
|
||||||
summary::marker {
|
summary::marker {
|
||||||
padding-left: 0.25em;
|
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 {
|
details[open] ul {
|
||||||
background: white;
|
background-color: white;
|
||||||
border: solid 1px var(--color-border-gray);
|
border: 1px solid var(--color-border-gray);
|
||||||
border-radius: 0.25em;
|
border-radius: 0.25em;
|
||||||
box-shadow: 1px 1px 3px var(--color-border-gray);
|
box-shadow: 1px 1px 3px var(--color-border-gray);
|
||||||
margin: -1px 0 0 0;
|
margin: -1px 0 0 0;
|
||||||
@@ -659,3 +628,15 @@ li input[type=checkbox] {
|
|||||||
li::marker {
|
li::marker {
|
||||||
content: '';
|
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;
|
||||||
|
}
|
||||||
|
|||||||
@@ -25,6 +25,18 @@ class ApplicationController < ActionController::Base
|
|||||||
# Turbo will reload 2nd time with HTML format and flashes will be lost.
|
# Turbo will reload 2nd time with HTML format and flashes will be lost.
|
||||||
rescue_from *ActionDispatch::ExceptionWrapper.rescue_responses.keys, with: :rescue_turbo
|
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
|
protected
|
||||||
|
|
||||||
def current_user_disguised?
|
def current_user_disguised?
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
class RegistrationsController < Devise::RegistrationsController
|
class User::ProfilesController < Devise::RegistrationsController
|
||||||
before_action :authenticate_user!, only: [:edit, :update, :destroy]
|
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
# TODO: Disallow/disable deletion for last admin account; update :edit view
|
# TODO: Disallow/disable deletion for last admin account; update :edit view
|
||||||
super
|
super
|
||||||
@@ -37,7 +37,7 @@ class UsersController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
# NOTE: limited actions availabe to :admin by design. Users are meant to
|
# 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.
|
# is allowed to sign-in (disguise) as user and make changes from there.
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|||||||
@@ -12,6 +12,12 @@ module ApplicationHelper
|
|||||||
labeled_field_for(method, options) { super }
|
labeled_field_for(method, options) { super }
|
||||||
end
|
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
|
private
|
||||||
|
|
||||||
def labeled_field_for(method, options)
|
def labeled_field_for(method, options)
|
||||||
@@ -72,13 +78,8 @@ module ApplicationHelper
|
|||||||
end
|
end
|
||||||
|
|
||||||
def labeled_form_for(record, options = {}, &block)
|
def labeled_form_for(record, options = {}, &block)
|
||||||
extra_options = {builder: LabeledFormBuilder,
|
extra_options = {builder: LabeledFormBuilder, html: {class: 'labeled-form'}}
|
||||||
data: {turbo: false},
|
form_for(record, **merge_attributes(options, extra_options), &block)
|
||||||
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)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class TabularFormBuilder < ActionView::Helpers::FormBuilder
|
class TabularFormBuilder < ActionView::Helpers::FormBuilder
|
||||||
@@ -101,20 +102,28 @@ module ApplicationHelper
|
|||||||
|
|
||||||
def number_field(method, options = {})
|
def number_field(method, options = {})
|
||||||
attr_type = object.type_for_attribute(method)
|
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[:value] = object.public_send(method)&.to_scientific
|
||||||
options[:step] ||= BigDecimal(10).power(-attr_type.scale)
|
options[:step] ||= BigDecimal(10).power(-attr_type.scale)
|
||||||
options[:max] ||= BigDecimal(10).power(attr_type.precision - attr_type.scale) -
|
options[:max] ||= BigDecimal(10).power(attr_type.precision - attr_type.scale) -
|
||||||
options[:step]
|
options[:step]
|
||||||
options[:min] = options[:min] == :step ? options[:step] : options[:min]
|
options[:min] = options[:min] == :step ? options[:step] : options[:min]
|
||||||
options[:min] ||= -options[:max]
|
options[:min] ||= -options[:max]
|
||||||
|
options[:size] ||= attr_type.precision / 2
|
||||||
|
when :float
|
||||||
|
options[:size] ||= 6
|
||||||
end
|
end
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
|
|
||||||
def button(value = nil, options = {}, &block)
|
def button(value = nil, options = {}, &block)
|
||||||
# button does not use #objectify_options
|
# #button does not use #objectify_options/@default_options
|
||||||
options.merge!(@options.slice(:form))
|
value, options = nil, value if value.is_a?(Hash)
|
||||||
|
options = options.merge(
|
||||||
|
@default_options.slice(:form),
|
||||||
|
class: @template.class_names('button', options[:class])
|
||||||
|
)
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -135,20 +144,22 @@ module ApplicationHelper
|
|||||||
# [autofocus]. Otherwise IDs are not unique when multiple forms are open
|
# [autofocus]. Otherwise IDs are not unique when multiple forms are open
|
||||||
# and the first input gets focus.
|
# and the first input gets focus.
|
||||||
record_object, options = nil, record_object if record_object.is_a?(Hash)
|
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?
|
# TODO: set error message with setCustomValidity instead of rendering to flash?
|
||||||
render_errors(record_object || record_name)
|
render_errors(record_object || record_name)
|
||||||
fields_for(record_name, record_object, **options, &block)
|
fields_for(record_name, record_object, **options, &block)
|
||||||
end
|
end
|
||||||
|
|
||||||
def tabular_form_with(**options, &block)
|
def tabular_form_with(**options, &block)
|
||||||
options = options.deep_merge(builder: TabularFormBuilder,
|
extra_options = {builder: TabularFormBuilder, class: 'tabular-form',
|
||||||
html: {autocomplete: 'off'})
|
html: {autocomplete: 'off'}}
|
||||||
form_with(**options, &block)
|
form_with(**merge_attributes(options, extra_options), &block)
|
||||||
end
|
end
|
||||||
|
|
||||||
def svg_tag(source, label = nil, options = {})
|
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")
|
tag.use(href: "#{image_path(source + ".svg")}#icon")
|
||||||
end
|
end
|
||||||
label.blank? ? svg_tag : svg_tag + tag.span(label)
|
label.blank? ? svg_tag : svg_tag + tag.span(label)
|
||||||
@@ -159,6 +170,7 @@ module ApplicationHelper
|
|||||||
['measurements', 'scale-bathroom', :restricted],
|
['measurements', 'scale-bathroom', :restricted],
|
||||||
['quantities', 'axis-arrow', :restricted, 'right'],
|
['quantities', 'axis-arrow', :restricted, 'right'],
|
||||||
['units', 'weight-gram', :restricted],
|
['units', 'weight-gram', :restricted],
|
||||||
|
# TODO: display users tab only if >1 user present; sole_user?/sole_admin?
|
||||||
['users', 'account-multiple-outline', :admin],
|
['users', 'account-multiple-outline', :admin],
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -206,6 +218,7 @@ module ApplicationHelper
|
|||||||
|
|
||||||
def render_errors(records)
|
def render_errors(records)
|
||||||
# Conversion of flash to Array only required because of Devise
|
# Conversion of flash to Array only required because of Devise
|
||||||
|
# TODO: override Devise message setting to Array()?
|
||||||
flash[:alert] = Array(flash[:alert])
|
flash[:alert] = Array(flash[:alert])
|
||||||
Array(records).each { |record| flash[:alert] += record.errors.full_messages }
|
Array(records).each { |record| flash[:alert] += record.errors.full_messages }
|
||||||
end
|
end
|
||||||
@@ -215,8 +228,8 @@ module ApplicationHelper
|
|||||||
# Conversion of flash to Array only required because of Devise
|
# Conversion of flash to Array only required because of Devise
|
||||||
Array(messages).map do |message|
|
Array(messages).map do |message|
|
||||||
tag.div class: "flash #{entry}" do
|
tag.div class: "flash #{entry}" do
|
||||||
tag.div(sanitize(message)) + tag.button(sanitize("×"), tabindex: -1,
|
tag.span(sanitize(message)) +
|
||||||
onclick: "this.parentElement.remove();")
|
svg_tag('pictograms/close-outline', {onclick: "this.parentElement.remove()"})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end.join.html_safe
|
end.join.html_safe
|
||||||
@@ -252,4 +265,11 @@ module ApplicationHelper
|
|||||||
|
|
||||||
[name, html_options]
|
[name, html_options]
|
||||||
end
|
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
|
end
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
module QuantitiesHelper
|
module QuantitiesHelper
|
||||||
def quantities_check_boxes
|
def quantities_check_boxes(quantities)
|
||||||
# Closing <details> on focusout event depends on relatedTarget for internal
|
# Closing <details> on focusout event depends on relatedTarget for internal
|
||||||
# actions being non-null. To ensure this, all top-layer elements of
|
# actions being non-null. To ensure this, all top-layer elements of
|
||||||
# ::details-content must accept focus, e.g. <label> needs tabindex="-1" */
|
# ::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|
|
include_hidden: false) do |b|
|
||||||
content_tag :li, b.label(tabindex: -1) { b.check_box + b.text }
|
content_tag :li, b.label(tabindex: -1) { b.check_box + b.text }
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -37,6 +37,18 @@ window.detailsObserver = new MutationObserver((mutations) => {
|
|||||||
mutations[0].target.dispatchEvent(new Event('change', {bubbles: true}))
|
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 stream actions */
|
||||||
Turbo.StreamElement.prototype.disableElement = function(element) {
|
Turbo.StreamElement.prototype.disableElement = function(element) {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
</td>
|
</td>
|
||||||
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="actions">
|
<td class="flex">
|
||||||
<% unless unit.portable.nil? %>
|
<% unless unit.portable.nil? %>
|
||||||
<% if unit.default? %>
|
<% if unit.default? %>
|
||||||
<%= image_button_to_if unit.portable?, t('.import'), 'download-outline',
|
<%= image_button_to_if unit.portable?, t('.import'), 'download-outline',
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
class: 'tools-area' %>
|
class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table class="main-area items">
|
<table class="main-area items-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
||||||
|
|||||||
@@ -23,10 +23,10 @@
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header class="hflex">
|
<header class="flex">
|
||||||
<%= image_link_to t(".source_code"), "code-braces", source_code_url %>
|
<%= image_link_to t(".source_code"), "code-braces", source_code_url %>
|
||||||
<%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url,
|
<%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url,
|
||||||
class: "extendedright" %>
|
class: "rextend" %>
|
||||||
<% if user_signed_in? %>
|
<% if user_signed_in? %>
|
||||||
<%= image_link_to_unless_current(current_user, "account-wrench-outline",
|
<%= image_link_to_unless_current(current_user, "account-wrench-outline",
|
||||||
edit_user_registration_path) %>
|
edit_user_registration_path) %>
|
||||||
|
|||||||
@@ -1,28 +1,37 @@
|
|||||||
<%= tabular_form_with model: Measurement.new, id: :measurement_form,
|
<%= tabular_form_with model: Measurement.new, id: :measurement_form,
|
||||||
class: 'topside-area vflex', html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
class: 'topside-area flex vertical center',
|
||||||
<table class="items centered">
|
html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
||||||
<tbody id="readouts"></tbody>
|
|
||||||
|
<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>
|
</table>
|
||||||
|
|
||||||
<div class="hflex">
|
<%# TODO: right-click selection; unnecessary with hierarchical tags? %>
|
||||||
<%# TODO: right-click selection %>
|
<details id="quantity_select" class="center hexpand" open
|
||||||
<details id="quantity_select" class="hexpand" open
|
onkeydown="detailsProcessKey(event)">
|
||||||
onkeydown="detailsProcessKey(event)">
|
<summary autofocus>
|
||||||
<summary autofocus>
|
<!-- TODO: Set content with CSS when span empty to avoid duplication -->
|
||||||
<!-- TODO: Set content with CSS when span empty to avoid duplication -->
|
<span data-prompt="<%= t('.select_quantity') %>">
|
||||||
<span data-prompt="<%= t('.select_quantity') %>">
|
<%= t('.select_quantity') %>
|
||||||
<%= t('.select_quantity') %>
|
</span>
|
||||||
</span>
|
<%= image_button_tag t(:apply), "update", name: nil, disabled: true,
|
||||||
<%= image_button_tag t(:apply), "update", name: nil, disabled: true,
|
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
||||||
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
data: {turbo_stream: true} %>
|
||||||
data: {turbo_stream: true} %>
|
</summary>
|
||||||
</summary>
|
<ul><%= quantities_check_boxes(@quantities) %></ul>
|
||||||
<ul><%= quantities_check_boxes %></ul>
|
</details>
|
||||||
</details>
|
|
||||||
<%= form.button id: :create_measurement_button, disabled: true -%>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<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,
|
<%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
|
||||||
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="actions">
|
<td class="flex">
|
||||||
<%= form.button %>
|
<%= form.button %>
|
||||||
<%= image_link_to t(:cancel), "close-outline", quantities_path, class: 'dangerous',
|
<%= image_link_to t(:cancel), "close-outline", quantities_path, class: 'dangerous',
|
||||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
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),
|
data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
|
||||||
drop_id_param: "quantity[parent_id]"} do %>
|
drop_id_param: "quantity[parent_id]"} do %>
|
||||||
|
|
||||||
<td class="link" style="--depth:<%= quantity.depth %>">
|
<td style="--depth:<%= quantity.depth %>">
|
||||||
<%= link_to quantity, edit_quantity_path(quantity), onclick: 'this.blur();',
|
<%= link_to quantity, edit_quantity_path(quantity), class: 'link',
|
||||||
data: {turbo_stream: true} %>
|
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
</td>
|
</td>
|
||||||
<td><%= quantity.description %></td>
|
<td><%= quantity.description %></td>
|
||||||
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="actions">
|
<td class="flex">
|
||||||
<%= image_link_to t('.new_subquantity'), 'plus-outline', new_quantity_path(quantity),
|
<%= 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} %>
|
id: dom_id(quantity, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
|
|
||||||
|
|||||||
@@ -8,13 +8,14 @@
|
|||||||
class: 'tools-area' %>
|
class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
||||||
<%= tag.div class: 'main-area', id: :quantity_form %>
|
<%= tag.div class: 'main-area', id: :quantity_form %>
|
||||||
|
|
||||||
<table class="main-area items">
|
<table class="main-area items-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= Quantity.human_attribute_name(:name) %></th>
|
<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) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<th><%= t :actions %></th>
|
<th><%= t :actions %></th>
|
||||||
<th></th>
|
<th></th>
|
||||||
|
|||||||
@@ -1,25 +1,24 @@
|
|||||||
<%# TODO: add readout reordering by dragging %>
|
<%# TODO: add readout reordering by dragging %>
|
||||||
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
||||||
<%- tag.tr id: dom_id(readout.quantity, :new, :readout) do %>
|
<%- 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 %>
|
<%# TODO: change to _link_ after giving up displaying relative paths %>
|
||||||
<%= image_button_tag '', 'delete-outline', class: 'dangerous', name: nil,
|
<%= image_button_tag '', 'delete-outline', class: 'dangerous', name: nil,
|
||||||
formaction: discard_readouts_path(readout.quantity),
|
formaction: discard_readouts_path(readout.quantity),
|
||||||
formmethod: :get, formnovalidate: true, data: {turbo_stream: true} %>
|
formmethod: :get, formnovalidate: true, data: {turbo_stream: true} %>
|
||||||
</td>
|
</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 %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
<td>
|
<td>
|
||||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||||
</td>
|
</td>
|
||||||
<td class="number">
|
<td>
|
||||||
<%= form.number_field :multiplier, required: true, size: 10, min: :step if @unit.base_id? %>
|
<%= form.number_field :multiplier, required: true, size: 10, min: :step if @unit.base_id? %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="actions">
|
<td class="flex">
|
||||||
<%= form.button %>
|
<%= form.button %>
|
||||||
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
||||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||||
|
|||||||
@@ -6,14 +6,15 @@
|
|||||||
drop_id: dom_id(unit.base || unit),
|
drop_id: dom_id(unit.base || unit),
|
||||||
drop_id_param: "unit[base_id]"} do %>
|
drop_id_param: "unit[base_id]"} do %>
|
||||||
|
|
||||||
<td class="link" style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
<td style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
||||||
<%= link_to unit, edit_unit_path(unit), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
<%= link_to unit, edit_unit_path(unit), class: 'link', onclick: 'this.blur();',
|
||||||
|
data: {turbo_stream: true} %>
|
||||||
</td>
|
</td>
|
||||||
<td><%= unit.description %></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) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="actions">
|
<td class="flex">
|
||||||
<% unless unit.base_id? %>
|
<% unless unit.base_id? %>
|
||||||
<%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
|
<%= 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} %>
|
id: dom_id(unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
|
|||||||
@@ -7,13 +7,14 @@
|
|||||||
class: 'tools-area' %>
|
class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
||||||
<%= tag.div id: :unit_form %>
|
<%= tag.div id: :unit_form %>
|
||||||
|
|
||||||
<table class="main-area items">
|
<table class="main-area items-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
<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>
|
<th><%= Unit.human_attribute_name(:multiplier) %></th>
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<th><%= t :actions %></th>
|
<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>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= User.human_attribute_name(:email) %></th>
|
<th><%= User.human_attribute_name(:email) %></th>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
<% @users.each do |user| %>
|
<% @users.each do |user| %>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="link"><%= link_to user, user_path(user) %></td>
|
<td><%= link_to user, user_path(user), class: 'link' %></td>
|
||||||
<td>
|
<td>
|
||||||
<% if user == current_user %>
|
<% if user == current_user %>
|
||||||
<%= user.status %>
|
<%= user.status %>
|
||||||
@@ -22,11 +22,11 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
<td class="svg">
|
<td>
|
||||||
<%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %>
|
<%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %>
|
||||||
</td>
|
</td>
|
||||||
<td><%= l user.created_at, format: :without_tz %></td>
|
<td><%= l user.created_at, format: :without_tz %></td>
|
||||||
<td class="actions">
|
<td class="flex">
|
||||||
<% if allow_disguise?(user) %>
|
<% if allow_disguise?(user) %>
|
||||||
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
||||||
<% end %>
|
<% 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,
|
<%= 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 %>
|
<%= 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,
|
||||||
<%= labeled_form_for resource, url: user_session_path do |f| %>
|
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: 'current-password' %>
|
|
||||||
|
|
||||||
<% if devise_mapping.rememberable? %>
|
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||||
<%= f.check_box :remember_me %>
|
autocomplete: 'email' %>
|
||||||
<% end %>
|
<%= 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 %>
|
<% end %>
|
||||||
|
|
||||||
<%= content_tag :p, t(:or), style: 'text-align: center;' %>
|
<%# /sign_in as HTML; /password as TURBO_STREAM %>
|
||||||
<%= image_link_to t(:recover_password), 'lock-reset', new_user_password_path,
|
<%= f.submit t(:sign_in), data: {turbo: false} %>
|
||||||
class: 'centered' %>
|
|
||||||
</div>
|
<%= 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" %>
|
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="actions">
|
<div class="flex">
|
||||||
<%= f.submit "Resend unlock instructions" %>
|
<%= f.submit "Resend unlock instructions" %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -20,6 +20,10 @@ Bundler.require(*Rails.groups)
|
|||||||
|
|
||||||
module FixinMe
|
module FixinMe
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
|
# Allow RAILS_DATABASE_YML to override the database config file path.
|
||||||
|
# Used by the multi-database test runner (lib/tasks/test_databases.rake).
|
||||||
|
config.paths['config/database'] = [ENV['RAILS_DATABASE_YML']] if ENV['RAILS_DATABASE_YML']
|
||||||
|
|
||||||
# Initialize configuration defaults for originally generated Rails version.
|
# Initialize configuration defaults for originally generated Rails version.
|
||||||
config.load_defaults 7.0
|
config.load_defaults 7.0
|
||||||
|
|
||||||
|
|||||||
@@ -48,3 +48,24 @@ production:
|
|||||||
#test:
|
#test:
|
||||||
# <<: *default
|
# <<: *default
|
||||||
# database: fixinme_test
|
# database: fixinme_test
|
||||||
|
|
||||||
|
# Multi-database testing
|
||||||
|
# ----------------------
|
||||||
|
# Any key starting with "test" is treated as a test database.
|
||||||
|
# When more than one is present, EVERY test task (rails test, rails test:models,
|
||||||
|
# rails test:system, …) automatically runs against all of them.
|
||||||
|
#
|
||||||
|
# The adapter gem must be available:
|
||||||
|
# bundle config --local with "mysql sqlite" # mysql + sqlite
|
||||||
|
# bundle config --local with "mysql pg" # mysql + postgresql
|
||||||
|
#
|
||||||
|
#test_sqlite:
|
||||||
|
# adapter: sqlite3
|
||||||
|
# database: db/fixinme_test.sqlite3
|
||||||
|
#
|
||||||
|
#test_pg:
|
||||||
|
# adapter: postgresql
|
||||||
|
# database: fixinme_test
|
||||||
|
# username: fixinme
|
||||||
|
# password: Some-password1%
|
||||||
|
# host: localhost
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ Devise.setup do |config|
|
|||||||
# It will change confirmation, password recovery and other workflows
|
# It will change confirmation, password recovery and other workflows
|
||||||
# to behave the same regardless if the e-mail provided was right or wrong.
|
# to behave the same regardless if the e-mail provided was right or wrong.
|
||||||
# Does not affect registerable.
|
# Does not affect registerable.
|
||||||
# config.paranoid = true
|
config.paranoid = true
|
||||||
|
|
||||||
# By default Devise will store the user in session. You can skip storage for
|
# By default Devise will store the user in session. You can skip storage for
|
||||||
# particular strategies by setting this option.
|
# particular strategies by setting this option.
|
||||||
|
|||||||
@@ -4,15 +4,15 @@ en:
|
|||||||
devise:
|
devise:
|
||||||
confirmations:
|
confirmations:
|
||||||
confirmed: "Your email address has been successfully confirmed."
|
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: >
|
||||||
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."
|
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:
|
failure:
|
||||||
already_authenticated: "You are already signed in."
|
already_authenticated: "You are already signed in."
|
||||||
inactive: "Your account is not activated yet."
|
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."
|
locked: "Your account is locked."
|
||||||
last_attempt: "You have one more attempt before 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."
|
timeout: "Your session expired. Please sign in again to continue."
|
||||||
unauthenticated: "You need to sign in or sign up before continuing."
|
unauthenticated: "You need to sign in or sign up before continuing."
|
||||||
unconfirmed: "You have to confirm your email address before continuing."
|
unconfirmed: "You have to confirm your email address before continuing."
|
||||||
@@ -32,8 +32,9 @@ en:
|
|||||||
success: "Successfully authenticated from %{kind} account."
|
success: "Successfully authenticated from %{kind} account."
|
||||||
passwords:
|
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."
|
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: >
|
||||||
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."
|
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: "Your password has been changed successfully. You are now signed in."
|
||||||
updated_not_active: "Your password has been changed successfully."
|
updated_not_active: "Your password has been changed successfully."
|
||||||
registrations:
|
registrations:
|
||||||
@@ -50,7 +51,6 @@ en:
|
|||||||
signed_out: "Signed out successfully."
|
signed_out: "Signed out successfully."
|
||||||
already_signed_out: "Signed out successfully."
|
already_signed_out: "Signed out successfully."
|
||||||
unlocks:
|
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."
|
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."
|
unlocked: "Your account has been unlocked successfully. Please sign in to continue."
|
||||||
errors:
|
errors:
|
||||||
|
|||||||
@@ -85,12 +85,10 @@ en:
|
|||||||
navigation: Measurements
|
navigation: Measurements
|
||||||
no_items: There are no measurements taken. You can Add some now.
|
no_items: There are no measurements taken. You can Add some now.
|
||||||
form:
|
form:
|
||||||
select_quantity: select the measured quantities...
|
select_quantity: select quantities...
|
||||||
|
taken_at_html: Measurement taken at 
|
||||||
index:
|
index:
|
||||||
new_measurement: Add measurement
|
new_measurement: Add measurement
|
||||||
readouts:
|
|
||||||
form:
|
|
||||||
select_unit: ...
|
|
||||||
quantities:
|
quantities:
|
||||||
navigation: Quantities
|
navigation: Quantities
|
||||||
no_items: There are no configured quantities. You can Add some or Import from defaults.
|
no_items: There are no configured quantities. You can Add some or Import from defaults.
|
||||||
@@ -150,7 +148,7 @@ en:
|
|||||||
edit:
|
edit:
|
||||||
password_html: 'New password:%{password_length_hint_html}'
|
password_html: 'New password:%{password_length_hint_html}'
|
||||||
update_password: Update password
|
update_password: Update password
|
||||||
registrations:
|
profiles:
|
||||||
new:
|
new:
|
||||||
password_html: 'Password:%{password_length_hint_html}'
|
password_html: 'Password:%{password_length_hint_html}'
|
||||||
password_confirmation: 'Retype password:'
|
password_confirmation: 'Retype password:'
|
||||||
@@ -169,7 +167,6 @@ en:
|
|||||||
cancel: Cancel
|
cancel: Cancel
|
||||||
delete: Delete
|
delete: Delete
|
||||||
:no: 'no'
|
:no: 'no'
|
||||||
or: or
|
|
||||||
register: Register
|
register: Register
|
||||||
sign_in: Sign in
|
sign_in: Sign in
|
||||||
recover_password: Recover password
|
recover_password: Recover password
|
||||||
|
|||||||
@@ -24,8 +24,9 @@ Rails.application.routes.draw do
|
|||||||
# https://github.com/heartcombo/devise/issues/5786
|
# https://github.com/heartcombo/devise/issues/5786
|
||||||
connection = ActiveRecord::Base.connection
|
connection = ActiveRecord::Base.connection
|
||||||
if connection.schema_version && connection.table_exists?(:users)
|
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'},
|
devise_for :users, path: '', path_names: {registration: 'profile'},
|
||||||
controllers: {registrations: :registrations}
|
controllers: {registrations: 'user/profiles'}
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :users, only: [:index, :show, :update] do
|
resources :users, only: [:index, :show, :update] do
|
||||||
@@ -34,9 +35,7 @@ Rails.application.routes.draw do
|
|||||||
end
|
end
|
||||||
|
|
||||||
unauthenticated do
|
unauthenticated do
|
||||||
as :user do
|
root to: redirect('/sign_in')
|
||||||
root to: redirect('/sign_in')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
root to: redirect('/units'), as: :user_root
|
root to: redirect('/units'), as: :user_root
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
class CreateReadouts < ActiveRecord::Migration[7.2]
|
class CreateReadouts < ActiveRecord::Migration[7.2]
|
||||||
def change
|
def change
|
||||||
create_table :readouts do |t|
|
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
|
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.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 :collector, foreign_key: true
|
||||||
#t.references :device, foreign_key: true
|
#t.references :device, foreign_key: true
|
||||||
|
|
||||||
|
|||||||
158
lib/tasks/test_databases.rake
Normal file
158
lib/tasks/test_databases.rake
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
require 'yaml'
|
||||||
|
require 'erb'
|
||||||
|
require 'tmpdir'
|
||||||
|
|
||||||
|
# Multi-database test runner
|
||||||
|
# ==========================
|
||||||
|
# When database.yml contains more than one `test*` configuration, every
|
||||||
|
# standard test task (test, test:models, test:system, …) is automatically
|
||||||
|
# rewritten to run the full suite against EACH configured database in turn.
|
||||||
|
#
|
||||||
|
# Convention — any top-level key that starts with "test" and holds a Hash:
|
||||||
|
#
|
||||||
|
# test: ← required primary database
|
||||||
|
# adapter: mysql2
|
||||||
|
# database: fixinme_test
|
||||||
|
# ...
|
||||||
|
#
|
||||||
|
# test_sqlite: ← optional additional databases
|
||||||
|
# adapter: sqlite3
|
||||||
|
# database: db/fixinme_test.sqlite3
|
||||||
|
#
|
||||||
|
# test_pg:
|
||||||
|
# adapter: postgresql
|
||||||
|
# ...
|
||||||
|
#
|
||||||
|
# A single-database setup is unchanged: every task behaves exactly as before.
|
||||||
|
#
|
||||||
|
# The mechanism uses RAILS_DATABASE_YML — an env var read by
|
||||||
|
# config/application.rb(.dist) to override Rails' database config path before
|
||||||
|
# initialisation, giving each subprocess a clean, isolated database config.
|
||||||
|
|
||||||
|
module MultiDbTests
|
||||||
|
ADAPTER_GEMS = {
|
||||||
|
'mysql2' => 'mysql2',
|
||||||
|
'sqlite3' => 'sqlite3',
|
||||||
|
'postgresql' => 'pg',
|
||||||
|
'pg' => 'pg',
|
||||||
|
}.freeze
|
||||||
|
|
||||||
|
ADAPTER_BUNDLE_GROUPS = {
|
||||||
|
'mysql2' => 'mysql',
|
||||||
|
'sqlite3' => 'sqlite',
|
||||||
|
'postgresql' => 'postgresql',
|
||||||
|
'pg' => 'postgresql',
|
||||||
|
}.freeze
|
||||||
|
|
||||||
|
# Rake task names generated by railties/lib/rails/test_unit/testing.rake
|
||||||
|
# that use run_from_rake — these are the ones we rewrite.
|
||||||
|
WRAPPED_TASKS = (
|
||||||
|
['test'] +
|
||||||
|
Rails::TestUnit::Runner::TEST_FOLDERS.map { |f| "test:#{f}" } +
|
||||||
|
%w[test:all test:system test:generators test:units test:functionals]
|
||||||
|
).freeze
|
||||||
|
|
||||||
|
class << self
|
||||||
|
# Returns {name => config_hash} for every key starting with "test".
|
||||||
|
def test_configs
|
||||||
|
@test_configs ||= begin
|
||||||
|
db_file = Rails.root.join('config', 'database.yml')
|
||||||
|
all = YAML.safe_load(ERB.new(db_file.read).result, aliases: true) || {}
|
||||||
|
all.select { |k, v| k.to_s.start_with?('test') && v.is_a?(Hash) }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def non_test_configs
|
||||||
|
@non_test_configs ||= begin
|
||||||
|
db_file = Rails.root.join('config', 'database.yml')
|
||||||
|
all = YAML.safe_load(ERB.new(db_file.read).result, aliases: true) || {}
|
||||||
|
all.reject { |k, _| k.to_s.start_with?('test') }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Run rails +task_name+ for every configured test database.
|
||||||
|
# Called from the rewritten rake task actions.
|
||||||
|
def run(task_name)
|
||||||
|
cfgs = test_configs
|
||||||
|
results = {}
|
||||||
|
|
||||||
|
cfgs.each do |db_name, config|
|
||||||
|
adapter = config['adapter'].to_s
|
||||||
|
puts "\n#{'─' * 64}"
|
||||||
|
puts " #{task_name} · #{db_name} (#{adapter})"
|
||||||
|
puts '─' * 64
|
||||||
|
|
||||||
|
unless adapter_available?(adapter)
|
||||||
|
warn " SKIPPED — '#{adapter}' gem not in bundle.\n" \
|
||||||
|
" Run: bundle config --local with \"#{current_with} #{adapter_group(adapter)}\""
|
||||||
|
results[db_name] = :skipped
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
|
Dir.mktmpdir('rails_test_') do |tmpdir|
|
||||||
|
tmp_yml = File.join(tmpdir, 'database.yml')
|
||||||
|
File.write(tmp_yml, non_test_configs.merge('test' => config).to_yaml)
|
||||||
|
env = { 'RAILS_DATABASE_YML' => tmp_yml }
|
||||||
|
|
||||||
|
if system(env, 'bundle exec rails db:test:prepare')
|
||||||
|
results[db_name] = system(env, 'rails', task_name) ? :pass : :fail
|
||||||
|
else
|
||||||
|
results[db_name] = :prepare_failed
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
print_summary(cfgs, results)
|
||||||
|
|
||||||
|
failed = results.count { |_, s| [:fail, :prepare_failed].include?(s) }
|
||||||
|
exit(false) if failed > 0
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def adapter_available?(adapter)
|
||||||
|
require ADAPTER_GEMS.fetch(adapter, adapter)
|
||||||
|
true
|
||||||
|
rescue LoadError
|
||||||
|
false
|
||||||
|
end
|
||||||
|
|
||||||
|
def adapter_group(adapter)
|
||||||
|
ADAPTER_BUNDLE_GROUPS.fetch(adapter, adapter)
|
||||||
|
end
|
||||||
|
|
||||||
|
def current_with
|
||||||
|
(Bundler.settings[:with] || '').split(':').join(' ')
|
||||||
|
end
|
||||||
|
|
||||||
|
def print_summary(cfgs, results)
|
||||||
|
return if results.size <= 1 # no summary for single-DB runs
|
||||||
|
|
||||||
|
puts "\n#{'═' * 64}"
|
||||||
|
puts ' SUMMARY'
|
||||||
|
puts '═' * 64
|
||||||
|
results.each do |db_name, status|
|
||||||
|
adapter = cfgs.dig(db_name, 'adapter') || '?'
|
||||||
|
icon = status == :pass ? '✓' : (status == :skipped ? '–' : '✗')
|
||||||
|
label = { pass: 'PASS', fail: 'FAIL',
|
||||||
|
prepare_failed: 'PREPARE FAILED', skipped: 'SKIPPED' }[status]
|
||||||
|
puts " #{icon} #{db_name.ljust(26)} (#{adapter.ljust(12)}) #{label}"
|
||||||
|
end
|
||||||
|
puts '═' * 64
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Rewrite every standard test task to run against all configured databases.
|
||||||
|
# This file loads after railties/testing.rake, so all tasks already exist.
|
||||||
|
# Single-database setups are completely unaffected.
|
||||||
|
if MultiDbTests.test_configs.size > 1
|
||||||
|
MultiDbTests::WRAPPED_TASKS.each do |task_name|
|
||||||
|
next unless Rake::Task.task_defined?(task_name)
|
||||||
|
|
||||||
|
Rake::Task[task_name].clear_actions
|
||||||
|
Rake::Task[task_name].enhance do
|
||||||
|
MultiDbTests.run(task_name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
require "test_helper"
|
require "test_helper"
|
||||||
|
|
||||||
class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
|
class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
|
||||||
|
include ActionView::Helpers::SanitizeHelper
|
||||||
include ActionView::Helpers::UrlHelper
|
include ActionView::Helpers::UrlHelper
|
||||||
|
|
||||||
# NOTE: geckodriver installed with Firefox, ignore incompatibility warning
|
# NOTE: geckodriver installed with Firefox, ignore incompatibility warning
|
||||||
@@ -32,7 +33,8 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
|
|||||||
# Allow skipping interpolations when translating for testing purposes
|
# Allow skipping interpolations when translating for testing purposes
|
||||||
INTERPOLATION_PATTERNS = Regexp.union(I18n.config.interpolation_patterns)
|
INTERPOLATION_PATTERNS = Regexp.union(I18n.config.interpolation_patterns)
|
||||||
def translate(key, **options)
|
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
|
end
|
||||||
alias :t :translate
|
alias :t :translate
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
@admin = users(:admin)
|
@admin = users(:admin)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "sign in" do
|
test 'sign in' do
|
||||||
visit new_user_session_path
|
visit root_url
|
||||||
assert find_link(href: new_user_session_path)[:disabled]
|
assert find_link(href: new_user_session_path)[:disabled]
|
||||||
|
|
||||||
sign_in
|
sign_in
|
||||||
@@ -14,16 +14,23 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
assert_text t('devise.sessions.signed_in')
|
assert_text t('devise.sessions.signed_in')
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'sign in fails with invalid password' do
|
test 'sign in fails with invalid credentials' do
|
||||||
sign_in password: random_password
|
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_current_path new_user_session_path
|
||||||
assert_text t('devise.failure.not_found_in_database',
|
assert_text t('devise.failure.invalid', authentication_keys: label.downcase_first)
|
||||||
authentication_keys: User.human_attribute_name(:email))
|
|
||||||
assert find_link(href: new_user_session_path)[:disabled]
|
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
|
end
|
||||||
|
|
||||||
test "sign out" do
|
test 'sign out' do
|
||||||
sign_in
|
sign_in
|
||||||
visit root_url
|
visit root_url
|
||||||
click_on t("layouts.application.sign_out")
|
click_on t("layouts.application.sign_out")
|
||||||
@@ -31,79 +38,106 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
assert_text t("devise.sessions.signed_out")
|
assert_text t("devise.sessions.signed_out")
|
||||||
end
|
end
|
||||||
|
|
||||||
test "recover password" do
|
test 'recover password' do
|
||||||
visit new_user_session_url
|
label = User.human_attribute_name(:email)
|
||||||
click_on t(:recover_password)
|
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
|
assert_emails 1 do
|
||||||
click_on t(:recover_password)
|
click_on t(:recover_password)
|
||||||
# Wait until redirected to make sure async request has been processed
|
|
||||||
assert_current_path new_user_session_path
|
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
|
end
|
||||||
assert_text t("devise.passwords.send_instructions")
|
assert has_field?(label, with: email)
|
||||||
|
|
||||||
with_last_email do |mail|
|
with_last_email do |mail|
|
||||||
visit Capybara.string(mail.body.to_s).find_link("Change my password")[:href]
|
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
|
end
|
||||||
new_password = random_password
|
new_password = random_password
|
||||||
fill_in t("users.passwords.edit.password_html"), with: new_password
|
fill_in t("users.passwords.edit.password_html"), with: new_password
|
||||||
fill_in t("helpers.label.user.password_confirmation"), with: new_password
|
fill_in t("helpers.label.user.password_confirmation"), with: new_password
|
||||||
assert_emails 1 do
|
assert_emails 1 do
|
||||||
click_on t("users.passwords.edit.update_password")
|
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_current_path units_path
|
||||||
|
assert_text t("devise.passwords.updated")
|
||||||
end
|
end
|
||||||
assert_text t("devise.passwords.updated")
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "register" do
|
test 'recover password for nonexistent user' do
|
||||||
visit new_user_session_url
|
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)
|
click_on t(:register)
|
||||||
|
assert find_link(href: new_user_registration_path)[:disabled]
|
||||||
|
|
||||||
fill_in User.human_attribute_name(:email), with: random_email
|
fill_in User.human_attribute_name(:email), with: random_email
|
||||||
password = random_password
|
password = random_password
|
||||||
fill_in User.human_attribute_name(:password), with: password
|
fill_in User.human_attribute_name(:password), with: password
|
||||||
fill_in t("users.registrations.new.password_confirmation"), with: password
|
fill_in t("users.profiles.new.password_confirmation"), with: password
|
||||||
assert_difference ->{User.count}, 1 do
|
assert_difference ->{ User.count }, 1 do
|
||||||
assert_emails 1 do
|
assert_emails 1 do
|
||||||
click_on t(:register)
|
click_on t(:register)
|
||||||
# Wait until redirected to make sure async request has been processed
|
|
||||||
assert_current_path new_user_session_path
|
assert_current_path new_user_session_path
|
||||||
|
assert_text t("devise.registrations.signed_up_but_unconfirmed")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
assert_text t("devise.registrations.signed_up_but_unconfirmed")
|
|
||||||
|
|
||||||
with_last_email do |mail|
|
assert_changes ->{ User.last.confirmed? }, from: false, to: true do
|
||||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
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
|
end
|
||||||
assert_current_path new_user_session_path
|
|
||||||
assert_text t("devise.confirmations.confirmed")
|
|
||||||
assert User.last.confirmed?
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "resend confirmation" do
|
test 'resend confirmation' do
|
||||||
visit new_user_session_url
|
label = User.human_attribute_name(:email)
|
||||||
click_on t(:register)
|
user = users.reject(&:confirmed?).sample
|
||||||
click_on t(:resend_confirmation)
|
|
||||||
|
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
|
assert_emails 1 do
|
||||||
click_on t(:resend_confirmation)
|
click_on t(:resend_confirmation)
|
||||||
# Wait until redirected to make sure async request has been processed
|
assert_current_path new_user_registration_path
|
||||||
assert_current_path new_user_session_path
|
assert_text t("devise.confirmations.send_paranoid_instructions")
|
||||||
end
|
end
|
||||||
assert_current_path new_user_session_path
|
assert has_field?(label, with: user.email)
|
||||||
assert_text t("devise.confirmations.send_instructions")
|
|
||||||
|
|
||||||
with_last_email do |mail|
|
assert_changes ->{ user.reload.confirmed? }, from: false, to: true do
|
||||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
test "show profile" do
|
test 'show profile' do
|
||||||
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
||||||
click_on t("users.navigation")
|
click_on t("users.navigation")
|
||||||
within all('tr').drop(1).sample do |tr|
|
within all('tr').drop(1).sample do |tr|
|
||||||
@@ -113,7 +147,7 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
test "disguise" do
|
test 'disguise' do
|
||||||
user = users.select(&:admin?).select(&:confirmed?).sample
|
user = users.select(&:admin?).select(&:confirmed?).sample
|
||||||
sign_in user: user
|
sign_in user: user
|
||||||
|
|
||||||
@@ -129,7 +163,7 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
assert_link user.email
|
assert_link user.email
|
||||||
end
|
end
|
||||||
|
|
||||||
test "disguise fails for admin when disallowed" do
|
test 'disguise fails for admin when disallowed' do
|
||||||
user = users.select(&:admin?).select(&:confirmed?).sample
|
user = users.select(&:admin?).select(&:confirmed?).sample
|
||||||
sign_in user: user
|
sign_in user: user
|
||||||
|
|
||||||
@@ -142,13 +176,13 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
assert_title 'The change you wanted was rejected (422)'
|
assert_title 'The change you wanted was rejected (422)'
|
||||||
end
|
end
|
||||||
|
|
||||||
test "disguise forbidden for non admin" do
|
test 'disguise forbidden for non admin' do
|
||||||
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||||
visit disguise_user_path(User.all.sample)
|
visit disguise_user_path(User.all.sample)
|
||||||
assert_title 'Access is forbidden to this page (403)'
|
assert_title 'Access is forbidden to this page (403)'
|
||||||
end
|
end
|
||||||
|
|
||||||
test "delete profile" do
|
test 'delete profile' do
|
||||||
user = sign_in
|
user = sign_in
|
||||||
# TODO: remove condition after root_url changed to different path than
|
# TODO: remove condition after root_url changed to different path than
|
||||||
# profile in routes.rb
|
# profile in routes.rb
|
||||||
@@ -156,23 +190,23 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
first(:link_or_button, user.email).click
|
first(:link_or_button, user.email).click
|
||||||
end
|
end
|
||||||
assert_difference ->{ User.count }, -1 do
|
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
|
assert_current_path new_user_session_path
|
||||||
end
|
end
|
||||||
assert_text t("devise.registrations.destroyed")
|
assert_text t("devise.registrations.destroyed")
|
||||||
end
|
end
|
||||||
|
|
||||||
test "index forbidden for non admin" do
|
test 'index forbidden for non admin' do
|
||||||
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||||
visit users_path
|
visit users_path
|
||||||
assert_title "Access is forbidden to this page (403)"
|
assert_title "Access is forbidden to this page (403)"
|
||||||
end
|
end
|
||||||
|
|
||||||
test "update profile" do
|
test 'update profile' do
|
||||||
# TODO
|
# TODO
|
||||||
end
|
end
|
||||||
|
|
||||||
test "update status" do
|
test 'update status' do
|
||||||
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
||||||
visit users_path
|
visit users_path
|
||||||
|
|
||||||
@@ -187,7 +221,7 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
assert_current_path users_path
|
assert_current_path users_path
|
||||||
end
|
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
|
sign_in user: users.select(&:admin?).select(&:confirmed?).sample
|
||||||
visit users_path
|
visit users_path
|
||||||
|
|
||||||
@@ -200,7 +234,7 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
assert_title 'The change you wanted was rejected (422)'
|
assert_title 'The change you wanted was rejected (422)'
|
||||||
end
|
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
|
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||||
visit units_path
|
visit units_path
|
||||||
inject_button_to find('body'), "update status", user_path(User.all.sample), method: :patch,
|
inject_button_to find('body'), "update status", user_path(User.all.sample), method: :patch,
|
||||||
|
|||||||
Reference in New Issue
Block a user