forked from fixin.me/fixin.me
Compare commits
9 Commits
test-multi
...
fix/system
| Author | SHA1 | Date | |
|---|---|---|---|
| 3019f0fbec | |||
| 33004f62bd | |||
| 687e6fcdff | |||
| 5ed066ad18 | |||
| dde4e52f1b | |||
| a9091d76a8 | |||
| 4175d31b9d | |||
| c659201904 | |||
| 83b064ef3c |
@@ -1,74 +0,0 @@
|
|||||||
name: Tests
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ master ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test-sqlite:
|
|
||||||
name: Tests (SQLite)
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: ruby/setup-ruby@v1
|
|
||||||
with:
|
|
||||||
ruby-version: '3.3'
|
|
||||||
bundler-cache: true
|
|
||||||
env:
|
|
||||||
BUNDLE_WITH: "sqlite:development:test"
|
|
||||||
|
|
||||||
- name: Set up test database
|
|
||||||
run: bin/rails db:create db:schema:load
|
|
||||||
env:
|
|
||||||
RAILS_ENV: test
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: bin/rails test
|
|
||||||
env:
|
|
||||||
RAILS_ENV: test
|
|
||||||
CI: "true"
|
|
||||||
|
|
||||||
test-mysql:
|
|
||||||
name: Tests (MySQL)
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
services:
|
|
||||||
mysql:
|
|
||||||
image: mysql:8.0
|
|
||||||
env:
|
|
||||||
MYSQL_ROOT_PASSWORD: ""
|
|
||||||
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
|
|
||||||
MYSQL_DATABASE: fixin_test
|
|
||||||
ports:
|
|
||||||
- 3306:3306
|
|
||||||
options: >-
|
|
||||||
--health-cmd="mysqladmin ping"
|
|
||||||
--health-interval=10s
|
|
||||||
--health-timeout=5s
|
|
||||||
--health-retries=3
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: ruby/setup-ruby@v1
|
|
||||||
with:
|
|
||||||
ruby-version: '3.3'
|
|
||||||
bundler-cache: true
|
|
||||||
env:
|
|
||||||
BUNDLE_WITH: "mysql:development:test"
|
|
||||||
|
|
||||||
- name: Set up test database
|
|
||||||
run: bin/rails db:schema:load
|
|
||||||
env:
|
|
||||||
RAILS_ENV: test
|
|
||||||
DB_ADAPTER: mysql
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: bin/rails test
|
|
||||||
env:
|
|
||||||
RAILS_ENV: test
|
|
||||||
CI: "true"
|
|
||||||
DB_ADAPTER: mysql
|
|
||||||
34
DESIGN.md
Normal file
34
DESIGN.md
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
DESIGN
|
||||||
|
======
|
||||||
|
|
||||||
|
Below is a list of design decisions. The justification is to be consulted
|
||||||
|
whenever a change is considered, to avoid regressions.
|
||||||
|
|
||||||
|
### Data type for DB storage of numeric values (`decimal` vs `float`)
|
||||||
|
|
||||||
|
* among database engines supported (by Rails), SQLite offers storage of
|
||||||
|
`decimal` data type with the lowest precision, equal to the precision of
|
||||||
|
`REAL` type (double precision float value, IEEE 754), but in a floating point
|
||||||
|
format,
|
||||||
|
* decimal types in other database engines offer greater precision, but store
|
||||||
|
data in a fixed point format,
|
||||||
|
* biology-related values differ by several orders of magnitude; storing them in
|
||||||
|
fixed point format would only make sense if required precision would be
|
||||||
|
greater than that offered by floating point format,
|
||||||
|
* even then, fixed point would mean either bigger memory requirements or
|
||||||
|
worse precision for numbers close to scale limit,
|
||||||
|
* for a fixed point format to use the same 8 bytes of storage as IEEE
|
||||||
|
754, precision would need to be limited to 18 digits (4 bytes/9 digits)
|
||||||
|
and scale approximately half of that - 9,
|
||||||
|
* double precision floating point guarantees 15 digits of precision, which
|
||||||
|
is more than enough for all expected use cases,
|
||||||
|
* single precision floating point only guarntees 6 digits of precision,
|
||||||
|
which is estimated to be too low for some use cases (e.g. storing
|
||||||
|
latitude/longitude with a resolution grater than 100m)
|
||||||
|
* double precision floating point (IEEE 754) is a standard that ensures
|
||||||
|
compatibility with all database engines,
|
||||||
|
* the same data format is used internally by Ruby as a `Float`; it
|
||||||
|
guarantees no conversions between storage and computation,
|
||||||
|
* as a standard with hardware implementations ensures both: computing
|
||||||
|
efficiency and hardware/3rd party library compatibility as opposed to Ruby
|
||||||
|
custom `BigDecimal` type
|
||||||
@@ -1 +1 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path fill="#ffffff" d="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" /></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" /></svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 152 B |
@@ -1 +1 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path fill="#ffffff" d="M12 2C6.5 2 2 6.5 2 12S6.5 22 12 22 22 17.5 22 12 17.5 2 12 2M12 20C7.59 20 4 16.41 4 12S7.59 4 12 4 20 7.59 20 12 16.41 20 12 20M16.59 7.58L10 14.17L7.41 11.59L6 13L10 17L18 9L16.59 7.58Z" /></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M12 2C6.5 2 2 6.5 2 12S6.5 22 12 22 22 17.5 22 12 17.5 2 12 2M12 20C7.59 20 4 16.41 4 12S7.59 4 12 4 20 7.59 20 12 16.41 20 12 20M16.59 7.58L10 14.17L7.41 11.59L6 13L10 17L18 9L16.59 7.58Z" /></svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 293 B After Width: | Height: | Size: 278 B |
@@ -18,10 +18,14 @@
|
|||||||
/* 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>; <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. */
|
||||||
|
/* TODO: review styles with multiple selectors and try to convert them to the same
|
||||||
|
* specificity. */
|
||||||
:root {
|
:root {
|
||||||
--color-focus-gray: #f3f3f3;
|
--color-focus-gray: #f3f3f3;
|
||||||
--color-border-gray: #dddddd;
|
--color-border-gray: #dddddd;
|
||||||
@@ -53,12 +57,28 @@
|
|||||||
:focus-visible {
|
:focus-visible {
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
|
/* NOTE: move to higher priority layer instead of using !important? */
|
||||||
|
/* TODO: add CSS @layer requirements in README */
|
||||||
|
[disabled] {
|
||||||
|
border-color: var(--color-border-gray) !important;
|
||||||
|
color: var(--color-border-gray) !important;
|
||||||
|
/* 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.
|
||||||
*/
|
*/
|
||||||
button,
|
button,
|
||||||
details,
|
details,
|
||||||
@@ -73,50 +93,17 @@ 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;
|
||||||
}
|
}
|
||||||
input[type=checkbox],
|
|
||||||
svg,
|
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 +111,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 +133,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);
|
|
||||||
}
|
}
|
||||||
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;
|
||||||
|
}
|
||||||
|
[name=cancel],
|
||||||
|
.auxiliary {
|
||||||
|
border-color: var(--color-border-gray);
|
||||||
|
color: var(--color-nav-gray);
|
||||||
|
fill: var(--color-nav-gray);
|
||||||
|
}
|
||||||
|
.button > svg,
|
||||||
|
.tab > svg {
|
||||||
|
height: 1.4em;
|
||||||
|
width: 1.4em;
|
||||||
|
}
|
||||||
|
.button > svg:not(:last-child),
|
||||||
|
.tab > svg:not(:last-child) {
|
||||||
|
margin-right: 0.2em;
|
||||||
|
}
|
||||||
|
.button:focus-visible,
|
||||||
|
.tab:focus-visible,
|
||||||
|
.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,23 +244,17 @@ 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,
|
table .button {
|
||||||
select:hover,
|
border-color: var(--color-border-gray);
|
||||||
summary:hover,
|
color: var(--color-table-gray);
|
||||||
textarea:hover {
|
font-weight: normal;
|
||||||
border-color: var(--color-blue);
|
height: 100%;
|
||||||
outline: solid 1px var(--color-blue);
|
padding: 0.4em;
|
||||||
}
|
|
||||||
select:hover,
|
|
||||||
summary:hover {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
input:invalid,
|
|
||||||
select:invalid,
|
|
||||||
textarea:invalid {
|
|
||||||
border-color: var(--color-red);
|
|
||||||
outline: solid 1px var(--color-red);
|
|
||||||
}
|
}
|
||||||
|
/* TODO: move normal, non-button links (<a>:hover/:focus) styling here (i.e.
|
||||||
|
* page-wide, top-level) and remove from `table.items` - as the style should be
|
||||||
|
* same everywhere. */
|
||||||
|
/* TODO: apply link class to non-button/-tab links. Add light underscore for links? */
|
||||||
input[type=text]:read-only,
|
input[type=text]:read-only,
|
||||||
textarea:read-only {
|
textarea:read-only {
|
||||||
border: none;
|
border: none;
|
||||||
@@ -206,8 +262,8 @@ textarea:read-only {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* 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;
|
||||||
@@ -240,18 +296,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 +335,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 +351,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 +403,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,183 +417,152 @@ 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;
|
||||||
|
}
|
||||||
|
.tabular-form table td {
|
||||||
|
border: none;
|
||||||
|
text-align: left;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
.tabular-form table td:first-child {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* 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-block: 0.75em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
table.items th,
|
.items-table th,
|
||||||
table.items td {
|
.items-table td {
|
||||||
padding-inline: 1em 0;
|
padding-inline: 1em 0;
|
||||||
}
|
}
|
||||||
/* For <a> to fill <td> completely, we use an ::after pseudoelement. */
|
/* For <a> to fill <td> completely, we use an `::after` pseudoelement. */
|
||||||
table.items td.link {
|
.items-table td.link {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
table.items td.link a {
|
.items-table td.link a {
|
||||||
color: inherit;
|
color: inherit;
|
||||||
font: inherit;
|
font: inherit;
|
||||||
}
|
}
|
||||||
table.items td.link a::after {
|
.items-table td.link a::after {
|
||||||
content: '';
|
content: '';
|
||||||
inset: 0;
|
inset: 0;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
table.items td:first-child {
|
.items-table td:first-child {
|
||||||
padding-inline-start: calc(1em + var(--depth) * 0.8em);
|
padding-inline-start: calc(1em + var(--depth) * 0.8em);
|
||||||
}
|
}
|
||||||
table.items td:has(input, select, textarea) {
|
.items-table td:has(input, select, textarea) {
|
||||||
padding-inline-start: calc(0.6em - 0.9px);
|
padding-inline-start: calc(0.6em - 0.9px);
|
||||||
}
|
}
|
||||||
table.items td:first-child:has(input, select, textarea) {
|
.items-table td:first-child:has(input, select, textarea) {
|
||||||
padding-inline-start: calc(0.6em + var(--depth) * 0.8em - 0.9px);
|
padding-inline-start: calc(0.6em + var(--depth) * 0.8em - 0.9px);
|
||||||
}
|
}
|
||||||
table.items th:last-child {
|
.items-table th:last-child {
|
||||||
padding-inline-end: 0.4em;
|
padding-inline-end: 0.4em;
|
||||||
}
|
}
|
||||||
table.items td:last-child {
|
.items-table td:last-child {
|
||||||
padding-inline-end: 0.1em;
|
padding-inline-end: 0.1em;
|
||||||
}
|
}
|
||||||
table.items td {
|
.items-table td {
|
||||||
border-top: solid 1px var(--color-border-gray);
|
border-top: 1px solid var(--color-border-gray);
|
||||||
height: 2.4em;
|
height: 2.4em;
|
||||||
padding-block: 0.1em;
|
padding-block: 0.1em;
|
||||||
}
|
}
|
||||||
table.items .actions {
|
.items-table .actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.4em;
|
gap: 0.4em;
|
||||||
justify-content: end;
|
justify-content: end;
|
||||||
}
|
}
|
||||||
table.items .actions.centered {
|
.items-table .actions.centered {
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
table.items tr.dropzone {
|
.items-table tr.dropzone {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
table.items tr.dropzone::after {
|
.items-table tr.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 td.handle {
|
||||||
cursor: move;
|
cursor: move;
|
||||||
}
|
}
|
||||||
table.items tr.form td {
|
.items-table tr.form td {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: replace :hover:focus-visible combos with proper LOVE stye order */
|
/* TODO: replace `:hover:focus-visible` combos with proper LOVE style order. */
|
||||||
/* TODO: Update table styling: simplify selectors, deduplicate, remove non-font rem. */
|
/* TODO: update table styling: simplify selectors, deduplicate, remove non-font rem. */
|
||||||
table.items td.link a:hover,
|
.items-table td.link a:hover,
|
||||||
table.items td.link a:focus-visible,
|
.items-table td.link a:focus-visible,
|
||||||
table.items td.link a:hover:focus-visible {
|
.items-table td.link a:hover:focus-visible {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
text-decoration-thickness: 0.05rem;
|
text-decoration-thickness: 0.05rem;
|
||||||
text-underline-offset: 0.2rem;
|
text-underline-offset: 0.2rem;
|
||||||
}
|
}
|
||||||
table.items td.link a:hover {
|
.items-table td.link a:hover {
|
||||||
color: var(--color-blue);
|
color: var(--color-blue);
|
||||||
}
|
}
|
||||||
table.items td.link a:focus-visible {
|
.items-table td.link a:focus-visible {
|
||||||
text-decoration-color: var(--color-gray);
|
text-decoration-color: var(--color-gray);
|
||||||
}
|
}
|
||||||
table.items td.link a:hover:focus-visible {
|
.items-table td.link a:hover:focus-visible {
|
||||||
color: var(--color-dark-blue);
|
color: var(--color-dark-blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
table.items td:not(:first-child),
|
.items-table td:not(:first-child),
|
||||||
.grayed {
|
.grayed {
|
||||||
color: var(--color-table-gray);
|
color: var(--color-table-gray);
|
||||||
fill: var(--color-table-gray);
|
fill: var(--color-table-gray);
|
||||||
}
|
}
|
||||||
table.items svg {
|
.items-table svg {
|
||||||
height: 1rem;
|
height: 1rem;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
width: 1rem;
|
width: 1rem;
|
||||||
}
|
}
|
||||||
table.items svg:last-child {
|
.items-table svg:last-child {
|
||||||
height: 1.2rem;
|
height: 1.2rem;
|
||||||
width: 1.2rem;
|
width: 1.2rem;
|
||||||
}
|
}
|
||||||
table.items td.svg {
|
.items-table td.svg {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
table.items td.number {
|
.items-table td.number {
|
||||||
text-align: right;
|
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 {
|
.centered {
|
||||||
@@ -575,22 +590,18 @@ form table.items td:first-child {
|
|||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
.hmin50 {
|
||||||
|
min-width: 50%;
|
||||||
|
}
|
||||||
|
.italic {
|
||||||
|
color: var(--color-gray);
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
.vflex {
|
.vflex {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.8em;
|
gap: 0.8em;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
[disabled] {
|
|
||||||
/* label:has(input[disabled]) {
|
|
||||||
* TODO: disabled checkbox blue square focus removal; disabled label styling;
|
|
||||||
* focused label styling (currently only checkbox has focus)
|
|
||||||
* */
|
|
||||||
border-color: var(--color-border-gray) !important;
|
|
||||||
color: var(--color-border-gray) !important;
|
|
||||||
cursor: not-allowed;
|
|
||||||
fill: var(--color-border-gray) !important;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
details {
|
details {
|
||||||
@@ -601,12 +612,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 +629,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 +640,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: 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 +670,15 @@ li input[type=checkbox] {
|
|||||||
li::marker {
|
li::marker {
|
||||||
content: '';
|
content: '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#measurement_form {
|
||||||
|
min-width: 66%;
|
||||||
|
width: max-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.
|
||||||
|
* */
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ class ApplicationController < ActionController::Base
|
|||||||
helper_method :current_user_disguised?
|
helper_method :current_user_disguised?
|
||||||
helper_method :current_tab
|
helper_method :current_tab
|
||||||
|
|
||||||
before_action :redirect_to_setup_if_needed
|
|
||||||
before_action :authenticate_user!
|
before_action :authenticate_user!
|
||||||
|
|
||||||
class AccessForbidden < StandardError; end
|
class AccessForbidden < StandardError; end
|
||||||
@@ -26,6 +25,18 @@ class ApplicationController < ActionController::Base
|
|||||||
# Turbo will reload 2nd time with HTML format and flashes will be lost.
|
# 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?
|
||||||
@@ -44,16 +55,6 @@ class ApplicationController < ActionController::Base
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# Redirect to the web setup wizard when the application has not yet been
|
|
||||||
# initialised (i.e. no admin account exists in the database).
|
|
||||||
def redirect_to_setup_if_needed
|
|
||||||
return if User.exists?(status: :admin)
|
|
||||||
redirect_to new_setup_path
|
|
||||||
rescue ActiveRecord::StatementInvalid
|
|
||||||
# Tables may not exist yet (migrations not run). Fall through and let the
|
|
||||||
# normal request handling surface a meaningful error.
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_no_content(record)
|
def render_no_content(record)
|
||||||
helpers.render_errors(record)
|
helpers.render_errors(record)
|
||||||
render html: nil, layout: true
|
render html: nil, layout: true
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
# Handles the one-time web-based installation wizard.
|
|
||||||
#
|
|
||||||
# The wizard is only accessible when no admin account exists yet. Once an
|
|
||||||
# admin has been created the controller redirects every request to the root
|
|
||||||
# path, so it can never be used to overwrite an existing installation.
|
|
||||||
class SetupController < ActionController::Base
|
|
||||||
# Use the full application layout (header, flash, etc.) so the page looks
|
|
||||||
# consistent with the rest of the site.
|
|
||||||
layout "application"
|
|
||||||
|
|
||||||
before_action :redirect_if_installed
|
|
||||||
|
|
||||||
def new
|
|
||||||
end
|
|
||||||
|
|
||||||
def create
|
|
||||||
email = params[:admin_email].to_s.strip
|
|
||||||
password = params[:admin_password].to_s
|
|
||||||
confirm = params[:admin_password_confirmation].to_s
|
|
||||||
|
|
||||||
errors = []
|
|
||||||
errors << t(".email_blank") if email.blank?
|
|
||||||
errors << t(".password_blank") if password.blank?
|
|
||||||
errors << t(".password_mismatch") if password != confirm
|
|
||||||
|
|
||||||
if errors.any?
|
|
||||||
flash.now[:alert] = errors.join(" ")
|
|
||||||
return render :new, status: :unprocessable_entity
|
|
||||||
end
|
|
||||||
|
|
||||||
user = User.new(email: email, password: password, status: :admin)
|
|
||||||
user.skip_confirmation!
|
|
||||||
|
|
||||||
unless user.save
|
|
||||||
flash.now[:alert] = user.errors.full_messages.join(" ")
|
|
||||||
return render :new, status: :unprocessable_entity
|
|
||||||
end
|
|
||||||
|
|
||||||
# Persist runtime settings chosen during setup.
|
|
||||||
Setting.set("skip_email_confirmation",
|
|
||||||
params[:skip_email_confirmation] == "1")
|
|
||||||
|
|
||||||
# Optionally seed the built-in default units.
|
|
||||||
if params[:seed_units] == "1"
|
|
||||||
load Rails.root.join("db/seeds/units.rb")
|
|
||||||
end
|
|
||||||
|
|
||||||
redirect_to new_user_session_path, notice: t(".success")
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def redirect_if_installed
|
|
||||||
redirect_to root_path if User.exists?(status: :admin)
|
|
||||||
rescue ActiveRecord::StatementInvalid
|
|
||||||
# Tables are not yet migrated — stay on the setup page so the user sees a
|
|
||||||
# meaningful error rather than a crash.
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
class RegistrationsController < Devise::RegistrationsController
|
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
|
||||||
@@ -8,15 +6,6 @@ class RegistrationsController < Devise::RegistrationsController
|
|||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def build_resource(hash = {})
|
|
||||||
super
|
|
||||||
# Skip the email confirmation step when the admin has enabled this option
|
|
||||||
# via the web setup wizard (stored as the "skip_email_confirmation" Setting).
|
|
||||||
# The account becomes active immediately so the user can sign in right after
|
|
||||||
# registering.
|
|
||||||
resource.skip_confirmation! if Setting.get("skip_email_confirmation") == "true"
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_resource(resource, params)
|
def update_resource(resource, params)
|
||||||
# Based on update_with_password()
|
# Based on update_with_password()
|
||||||
if params[:password].blank?
|
if params[:password].blank?
|
||||||
@@ -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) {
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ class Quantity < ApplicationRecord
|
|||||||
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
||||||
end
|
end
|
||||||
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
||||||
length: {maximum: type_for_attribute(:name).limit || Float::INFINITY}
|
length: {maximum: type_for_attribute(:name).limit}
|
||||||
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||||
|
|
||||||
# Update :depths of progenies after parent change
|
# Update :depths of progenies after parent change
|
||||||
before_save if: :parent_changed? do
|
before_save if: :parent_changed? do
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
# Key-value store for runtime application settings that are configured through
|
|
||||||
# the web setup wizard (or updated by an administrator) rather than hard-coded
|
|
||||||
# in application.rb.
|
|
||||||
#
|
|
||||||
# Known keys:
|
|
||||||
# skip_email_confirmation – "true"/"false", mirrors the homonymous option
|
|
||||||
# that was previously in application.rb.
|
|
||||||
class Setting < ApplicationRecord
|
|
||||||
validates :key, presence: true, uniqueness: true
|
|
||||||
|
|
||||||
# Return the string value stored for +key+, or +default+ when absent.
|
|
||||||
def self.get(key, default: nil)
|
|
||||||
find_by(key: key)&.value || default
|
|
||||||
end
|
|
||||||
|
|
||||||
# Persist +value+ for +key+, creating the record if it does not yet exist.
|
|
||||||
def self.set(key, value)
|
|
||||||
find_or_initialize_by(key: key).update!(value: value.to_s)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -12,8 +12,8 @@ class Unit < ApplicationRecord
|
|||||||
errors.add(:base, :multilevel_nesting) if base.base_id?
|
errors.add(:base, :multilevel_nesting) if base.base_id?
|
||||||
end
|
end
|
||||||
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
||||||
length: {maximum: type_for_attribute(:symbol).limit || Float::INFINITY}
|
length: {maximum: type_for_attribute(:symbol).limit}
|
||||||
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||||
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
||||||
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
||||||
|
|
||||||
@@ -26,8 +26,10 @@ class Unit < ApplicationRecord
|
|||||||
other_bases_units = arel_table.alias('other_bases_units')
|
other_bases_units = arel_table.alias('other_bases_units')
|
||||||
sub_units = arel_table.alias('sub_units')
|
sub_units = arel_table.alias('sub_units')
|
||||||
|
|
||||||
|
# TODO: move inner 'with' CTE to outer 'with recursive' - it can have multiple
|
||||||
|
# CTEs, even non recursive ones.
|
||||||
Unit.with_recursive(actionable_units: [
|
Unit.with_recursive(actionable_units: [
|
||||||
self.or(Unit.defaults).left_joins(:base)
|
Unit.with(units: self.or(Unit.defaults)).left_joins(:base)
|
||||||
.where.not(
|
.where.not(
|
||||||
# Exclude Units that are/have default counterpart
|
# Exclude Units that are/have default counterpart
|
||||||
Arel::SelectManager.new.project(1).from(other_units)
|
Arel::SelectManager.new.project(1).from(other_units)
|
||||||
@@ -63,14 +65,8 @@ class Unit < ApplicationRecord
|
|||||||
),
|
),
|
||||||
# Fill base Units to display proper hierarchy. Duplicates will be removed
|
# Fill base Units to display proper hierarchy. Duplicates will be removed
|
||||||
# by final group() - can't be deduplicated with UNION due to 'portable' field.
|
# by final group() - can't be deduplicated with UNION due to 'portable' field.
|
||||||
# Use ActiveRecord::Relation (not a raw SelectManager) so the SQLite Arel
|
arel_table.join(actionable_units).on(actionable_units[:base_id].eq(arel_table[:id]))
|
||||||
# visitor does not wrap it in parentheses inside the UNION ALL CTE body.
|
.project(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
||||||
Unit.joins(
|
|
||||||
arel_table.create_join(
|
|
||||||
actionable_units,
|
|
||||||
arel_table.create_on(actionable_units[:base_id].eq(arel_table[:id]))
|
|
||||||
)
|
|
||||||
).select(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
|
||||||
]).select(units: [:base_id, :symbol])
|
]).select(units: [:base_id, :symbol])
|
||||||
.select(
|
.select(
|
||||||
units[:id].minimum.as('id'), # can be ANY_VALUE()
|
units[:id].minimum.as('id'), # can be ANY_VALUE()
|
||||||
@@ -78,7 +74,7 @@ class Unit < ApplicationRecord
|
|||||||
Arel::Nodes.build_quoted(1).as('multiplier'), # disregard multiplier when sorting
|
Arel::Nodes.build_quoted(1).as('multiplier'), # disregard multiplier when sorting
|
||||||
units[:portable].minimum.as('portable')
|
units[:portable].minimum.as('portable')
|
||||||
)
|
)
|
||||||
.from(units).group(units[:base_id], units[:symbol])
|
.from(units).group(:base_id, :symbol)
|
||||||
}
|
}
|
||||||
scope :ordered, ->{
|
scope :ordered, ->{
|
||||||
left_outer_joins(:base).order(ordering)
|
left_outer_joins(:base).order(ordering)
|
||||||
@@ -87,8 +83,8 @@ class Unit < ApplicationRecord
|
|||||||
def self.ordering
|
def self.ordering
|
||||||
[arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
[arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
||||||
arel_table[:base_id].not_eq(nil),
|
arel_table[:base_id].not_eq(nil),
|
||||||
arel_table[:multiplier],
|
:multiplier,
|
||||||
arel_table[:symbol]]
|
:symbol]
|
||||||
end
|
end
|
||||||
|
|
||||||
before_destroy do
|
before_destroy do
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -1,12 +1,22 @@
|
|||||||
<%= 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 vflex centered',
|
||||||
<table class="items centered">
|
html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
||||||
<tbody id="readouts"></tbody>
|
|
||||||
|
<table class="items-table centered">
|
||||||
|
<tbody id="readouts">
|
||||||
|
<%= tabular_fields_for @measurement do |form| %>
|
||||||
|
<tr class="italic">
|
||||||
|
<td class="hexpand hmin50"><%= t '.taken_at_html' %></td>
|
||||||
|
<td colspan="3" class="number">
|
||||||
|
<%= 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="centered 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 -->
|
||||||
@@ -17,12 +27,11 @@
|
|||||||
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 %></ul>
|
<ul><%= quantities_check_boxes(@quantities) %></ul>
|
||||||
</details>
|
</details>
|
||||||
<%= form.button id: :create_measurement_button, disabled: true -%>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="hflex reverse">
|
<div class="hflex 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>
|
||||||
|
|||||||
@@ -8,9 +8,10 @@
|
|||||||
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>
|
||||||
|
|||||||
@@ -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>
|
||||||
|
<%# TODO: add grayed readout index (in separate column?) %>
|
||||||
|
<%= readout.quantity.relative_pathname(@superquantity) %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= form.number_field :value, required: true, autofocus: readout_counter == 0 %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= form.hidden_field :quantity_id %>
|
||||||
|
<%= form.collection_select :unit_id, @user_units, :id,
|
||||||
|
->(u){ sanitize(' ' * (u.base_id ? 1 : 0) + u.symbol) },
|
||||||
|
{prompt: '', disabled: '', selected: ''}, required: true %>
|
||||||
|
</td>
|
||||||
<td class="actions">
|
<td class="actions">
|
||||||
<%# 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 %>
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
<%= form_with url: setup_path, method: :post, class: "labeled-form main-area" do %>
|
|
||||||
|
|
||||||
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0;">
|
|
||||||
<%= t(".admin_account") %>
|
|
||||||
</h3>
|
|
||||||
|
|
||||||
<label for="admin_email"><%= t(".admin_email") %></label>
|
|
||||||
<%= email_field_tag :admin_email, params[:admin_email],
|
|
||||||
id: "admin_email", required: true, size: 30, autofocus: true,
|
|
||||||
autocomplete: "email" %>
|
|
||||||
|
|
||||||
<label for="admin_password"><%= t(".admin_password") %></label>
|
|
||||||
<%= password_field_tag :admin_password, nil,
|
|
||||||
id: "admin_password", required: true, size: 30,
|
|
||||||
autocomplete: "new-password" %>
|
|
||||||
|
|
||||||
<label for="admin_password_confirmation"><%= t(".admin_password_confirmation") %></label>
|
|
||||||
<%= password_field_tag :admin_password_confirmation, nil,
|
|
||||||
id: "admin_password_confirmation", required: true, size: 30,
|
|
||||||
autocomplete: "off" %>
|
|
||||||
|
|
||||||
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0.5em 0 0 0;">
|
|
||||||
<%= t(".options") %>
|
|
||||||
</h3>
|
|
||||||
|
|
||||||
<label for="skip_email_confirmation" style="grid-column: 1 / 3; text-align: left;">
|
|
||||||
<%= check_box_tag :skip_email_confirmation, "1",
|
|
||||||
params[:skip_email_confirmation] == "1",
|
|
||||||
id: "skip_email_confirmation" %>
|
|
||||||
<%= t(".skip_email_confirmation") %>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label for="seed_units" style="grid-column: 1 / 3; text-align: left;">
|
|
||||||
<%= check_box_tag :seed_units, "1", true, id: "seed_units" %>
|
|
||||||
<%= t(".seed_units") %>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<%= submit_tag t(".submit") %>
|
|
||||||
<% end %>
|
|
||||||
@@ -7,9 +7,10 @@
|
|||||||
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>
|
||||||
|
|||||||
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>
|
||||||
|
|||||||
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,
|
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||||
autocomplete: 'email' %>
|
autocomplete: 'email' %>
|
||||||
<%= f.password_field :password, required: true, size: 30,
|
<%= f.password_field :password, required: true, size: 30,
|
||||||
minlength: @minimum_password_length, autocomplete: 'current-password' %>
|
autocomplete: 'current-password' %>
|
||||||
|
|
||||||
<% if devise_mapping.rememberable? %>
|
<% if devise_mapping.rememberable? %>
|
||||||
<%= f.check_box :remember_me %>
|
<%= f.check_box :remember_me %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= f.submit t(:sign_in) %>
|
<%# /sign_in as HTML; /password as TURBO_STREAM %>
|
||||||
<% end %>
|
<%= f.submit t(:sign_in), data: {turbo: false} %>
|
||||||
|
|
||||||
<%= content_tag :p, t(:or), style: 'text-align: center;' %>
|
<%= image_button_tag t(:recover_password), 'lock-reset', class: 'auxiliary',
|
||||||
<%= image_link_to t(:recover_password), 'lock-reset', new_user_password_path,
|
formaction: user_password_path, formnovalidate: true,
|
||||||
class: 'centered' %>
|
data: {validate: f.field_id(:email)} %>
|
||||||
</div>
|
<% end %>
|
||||||
|
|||||||
@@ -54,9 +54,5 @@ module FixinMe
|
|||||||
|
|
||||||
# Sender address of account registration-related messages
|
# Sender address of account registration-related messages
|
||||||
Devise.mailer_sender = 'noreply@localhost'
|
Devise.mailer_sender = 'noreply@localhost'
|
||||||
|
|
||||||
# Whether to skip e-mail confirmation for new registrations is configured
|
|
||||||
# through the web setup wizard and stored in the database (Setting model),
|
|
||||||
# so it does not need to be set here.
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -58,7 +58,4 @@ Rails.application.configure do
|
|||||||
# config.action_view.annotate_rendered_view_with_filenames = true
|
# config.action_view.annotate_rendered_view_with_filenames = true
|
||||||
|
|
||||||
config.log_level = :info
|
config.log_level = :info
|
||||||
|
|
||||||
# Allow the default integration test host.
|
|
||||||
config.hosts << "www.example.com"
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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:'
|
||||||
@@ -163,30 +161,12 @@ en:
|
|||||||
<br><em>leave blank to keep unchanged</em>
|
<br><em>leave blank to keep unchanged</em>
|
||||||
%{password_length_hint_html}
|
%{password_length_hint_html}
|
||||||
actions: Actions
|
actions: Actions
|
||||||
setup:
|
|
||||||
new:
|
|
||||||
admin_account: Admin account
|
|
||||||
admin_email: 'E-mail:'
|
|
||||||
admin_password: 'Password:'
|
|
||||||
admin_password_confirmation: 'Retype password:'
|
|
||||||
options: Options
|
|
||||||
skip_email_confirmation: Skip e-mail confirmation for new registrations
|
|
||||||
seed_units: Seed built-in default units
|
|
||||||
submit: Set up
|
|
||||||
create:
|
|
||||||
email_blank: E-mail cannot be blank.
|
|
||||||
password_blank: Password cannot be blank.
|
|
||||||
password_mismatch: Passwords do not match.
|
|
||||||
success: >
|
|
||||||
Installation complete. You can now sign in with the admin account you
|
|
||||||
just created.
|
|
||||||
add: Add
|
add: Add
|
||||||
apply: Apply
|
apply: Apply
|
||||||
back: Back
|
back: Back
|
||||||
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
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
# Web-based installation wizard — only reachable when no admin exists yet.
|
|
||||||
resource :setup, only: [:new, :create], controller: :setup
|
|
||||||
|
|
||||||
resources :measurements
|
resources :measurements
|
||||||
|
|
||||||
resources :readouts, only: [:new] do
|
resources :readouts, only: [:new] do
|
||||||
@@ -27,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
|
||||||
@@ -37,10 +35,8 @@ 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
|
||||||
|
|
||||||
direct(:source_code) { 'https://gitea.michalczyk.pro/fixin.me/fixin.me' }
|
direct(:source_code) { 'https://gitea.michalczyk.pro/fixin.me/fixin.me' }
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
class CreateSettings < ActiveRecord::Migration[7.2]
|
|
||||||
def change
|
|
||||||
create_table :settings do |t|
|
|
||||||
t.string :key, null: false
|
|
||||||
t.string :value
|
|
||||||
|
|
||||||
t.timestamps
|
|
||||||
end
|
|
||||||
|
|
||||||
add_index :settings, :key, unique: true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
11
db/seeds.rb
11
db/seeds.rb
@@ -3,17 +3,6 @@
|
|||||||
# bin/rails db:seed
|
# bin/rails db:seed
|
||||||
# command (or created alongside the database with db:setup).
|
# command (or created alongside the database with db:setup).
|
||||||
# Seeding process should be idempotent.
|
# Seeding process should be idempotent.
|
||||||
#
|
|
||||||
# Admin account setup
|
|
||||||
# -------------------
|
|
||||||
# The preferred way to create the first admin account is through the web setup
|
|
||||||
# wizard, which is shown automatically on the first visit when no admin exists.
|
|
||||||
# The wizard also lets you configure runtime options (e.g. skip e-mail
|
|
||||||
# confirmation) and seed the default units without using the command line.
|
|
||||||
#
|
|
||||||
# The block below provides an alternative CLI path for headless / automated
|
|
||||||
# deployments. It is skipped when an admin account already exists (e.g. after
|
|
||||||
# the web wizard has run).
|
|
||||||
|
|
||||||
User.transaction do
|
User.transaction do
|
||||||
break if User.find_by status: :admin
|
break if User.find_by status: :admin
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
namespace :test do
|
|
||||||
desc "Run Rails tests against all supported database adapters (SQLite, MySQL)"
|
|
||||||
task :all_adapters do
|
|
||||||
# DATABASE_URL overrides the adapter from database.yml at runtime.
|
|
||||||
# MySQL requires the mysql2 gem: bundle install --with mysql
|
|
||||||
adapters = {
|
|
||||||
"SQLite" => {
|
|
||||||
"DATABASE_URL" => "sqlite3:db/test.sqlite3"
|
|
||||||
},
|
|
||||||
"MySQL" => {
|
|
||||||
"DATABASE_URL" => format(
|
|
||||||
"mysql2://%s:%s@%s/%s",
|
|
||||||
ENV.fetch("DATABASE_USERNAME", "root"),
|
|
||||||
ENV.fetch("DATABASE_PASSWORD", ""),
|
|
||||||
ENV.fetch("DATABASE_HOST", "127.0.0.1"),
|
|
||||||
ENV.fetch("DATABASE_NAME", "fixin_test")
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
failed = []
|
|
||||||
|
|
||||||
adapters.each do |name, extra_env|
|
|
||||||
puts "\n#{"=" * 60}"
|
|
||||||
puts " Running tests with #{name}"
|
|
||||||
puts "=" * 60
|
|
||||||
|
|
||||||
env = ENV.to_h.merge("RAILS_ENV" => "test").merge(extra_env)
|
|
||||||
|
|
||||||
# Reset test database; db:drop may fail on first run — that's fine
|
|
||||||
system(env, "bin/rails db:drop")
|
|
||||||
unless system(env, "bin/rails db:create db:schema:load")
|
|
||||||
failed << "#{name} (database setup)"
|
|
||||||
next
|
|
||||||
end
|
|
||||||
|
|
||||||
failed << name unless system(env, "bin/rails test")
|
|
||||||
end
|
|
||||||
|
|
||||||
puts "\n#{"=" * 60}"
|
|
||||||
if failed.any?
|
|
||||||
puts " FAILED: #{failed.join(", ")}"
|
|
||||||
puts "=" * 60
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
puts " All adapters passed!"
|
|
||||||
puts "=" * 60
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
require "test_helper"
|
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
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
require "test_helper"
|
require "test_helper"
|
||||||
|
|
||||||
class Default::UnitsControllerTest < ActionDispatch::IntegrationTest
|
class Default::UnitsControllerTest < ActionDispatch::IntegrationTest
|
||||||
setup do
|
|
||||||
sign_in users(:alice)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "should get index" do
|
test "should get index" do
|
||||||
get default_units_url
|
get units_defaults_index_url
|
||||||
assert_response :success
|
assert_response :success
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,9 +2,7 @@ require "test_helper"
|
|||||||
|
|
||||||
class UsersControllerTest < ActionDispatch::IntegrationTest
|
class UsersControllerTest < ActionDispatch::IntegrationTest
|
||||||
setup do
|
setup do
|
||||||
@admin = users(:admin)
|
@user = users(:one)
|
||||||
@user = users(:alice)
|
|
||||||
sign_in @admin
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should get index" do
|
test "should get index" do
|
||||||
@@ -12,25 +10,39 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
|
|||||||
assert_response :success
|
assert_response :success
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "should get new" do
|
||||||
|
get new_user_url
|
||||||
|
assert_response :success
|
||||||
|
end
|
||||||
|
|
||||||
|
test "should create user" do
|
||||||
|
assert_difference("User.count") do
|
||||||
|
post users_url, params: { user: { email: @user.email, status: @user.status } }
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_redirected_to user_url(User.last)
|
||||||
|
end
|
||||||
|
|
||||||
test "should show user" do
|
test "should show user" do
|
||||||
get user_url(@user)
|
get user_url(@user)
|
||||||
assert_response :success
|
assert_response :success
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "should get edit" do
|
||||||
|
get edit_user_url(@user)
|
||||||
|
assert_response :success
|
||||||
|
end
|
||||||
|
|
||||||
test "should update user" do
|
test "should update user" do
|
||||||
patch user_url(@user), params: { user: { status: :restricted } }, as: :turbo_stream
|
patch user_url(@user), params: { user: { email: @user.email, status: @user.status } }
|
||||||
assert_equal "restricted", @user.reload.status
|
assert_redirected_to user_url(@user)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should not update self" do
|
test "should destroy user" do
|
||||||
patch user_url(@admin), params: { user: { status: :active } }, as: :turbo_stream,
|
assert_difference("User.count", -1) do
|
||||||
headers: { "HTTP_REFERER" => users_url }
|
delete user_url(@user)
|
||||||
assert_response :redirect
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should forbid non-admin" do
|
assert_redirected_to users_url
|
||||||
sign_in @user
|
|
||||||
get users_url
|
|
||||||
assert_response :forbidden
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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
|
||||||
end
|
|
||||||
assert_text t("devise.passwords.updated")
|
assert_text t("devise.passwords.updated")
|
||||||
end
|
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
|
||||||
end
|
|
||||||
end
|
|
||||||
assert_text t("devise.registrations.signed_up_but_unconfirmed")
|
assert_text t("devise.registrations.signed_up_but_unconfirmed")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_changes ->{ User.last.confirmed? }, from: false, to: true do
|
||||||
with_last_email do |mail|
|
with_last_email do |mail|
|
||||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
||||||
end
|
|
||||||
assert_current_path new_user_session_path
|
assert_current_path new_user_session_path
|
||||||
assert_text t("devise.confirmations.confirmed")
|
assert_text t("devise.confirmations.confirmed")
|
||||||
assert User.last.confirmed?
|
end
|
||||||
|
end
|
||||||
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")
|
|
||||||
|
|
||||||
|
assert_changes ->{ user.reload.confirmed? }, from: false, to: true do
|
||||||
with_last_email do |mail|
|
with_last_email do |mail|
|
||||||
visit Capybara.string(mail.body.to_s).find_link("Confirm my account")[:href]
|
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
|
||||||
|
|
||||||
@@ -195,12 +229,12 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
user = User.find_by_email!(first(:link).text)
|
user = User.find_by_email!(first(:link).text)
|
||||||
inject_button_to first('td:not(.link)'), "update status", user_path(user), method: :patch,
|
inject_button_to first('td:not(.link)'), "update status", user_path(user), method: :patch,
|
||||||
params: {user: {status: User.statuses.keys.sample}}, data: {turbo: false}
|
params: {user: {status: User.statuses.keys.sample}}, data: {turbo: false}
|
||||||
click_on "update status"
|
execute_script("arguments[0].click()", find_button("update status"))
|
||||||
end
|
end
|
||||||
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,
|
||||||
|
|||||||
@@ -2,10 +2,6 @@ ENV["RAILS_ENV"] ||= "test"
|
|||||||
require_relative "../config/environment"
|
require_relative "../config/environment"
|
||||||
require "rails/test_help"
|
require "rails/test_help"
|
||||||
|
|
||||||
class ActionDispatch::IntegrationTest
|
|
||||||
include Devise::Test::IntegrationHelpers
|
|
||||||
end
|
|
||||||
|
|
||||||
class ActiveSupport::TestCase
|
class ActiveSupport::TestCase
|
||||||
# Run tests in parallel with specified workers
|
# Run tests in parallel with specified workers
|
||||||
parallelize(workers: :number_of_processors)
|
parallelize(workers: :number_of_processors)
|
||||||
|
|||||||
Reference in New Issue
Block a user