This was intended to be a JS-fix-only PR but I had a lapse in discipline and some CSS+HTML changes slipped into the mix.
@notplants previously did the great work of separating the flashMsg JS function into common.rs. This PR removes all the duplicate instances of that function which remained in the codebase.
This also fixes some of the JS functions which were named incorrectly (in change_password.js and configure_dns.js).
JS for updating network status has been removed from network_card.js. This is no longer necessary, since we have separated settings and status into different templates.
Minor HTML and CSS updates were introduced to a few templates:
I'd rather leave styling updates to the end - after we've added all the backend functionality and UI - but I sometimes I get carried away 😅
This was intended to be a JS-fix-only PR but I had a lapse in discipline and some CSS+HTML changes slipped into the mix.
@notplants previously did the great work of separating the `flashMsg` JS function into `common.rs`. This PR removes all the duplicate instances of that function which remained in the codebase.
This also fixes some of the JS functions which were named incorrectly (in `change_password.js` and `configure_dns.js`).
JS for updating network status has been removed from `network_card.js`. This is no longer necessary, since we have separated settings and status into different templates.
Minor HTML and CSS updates were introduced to a few templates:
```
catchers/not_found.html.tera
settings/admin/change_password.html.tera
settings/admin/forgot_password.html.tera
settings/admin/menu.html.tera
settings/menu.html.tera
settings/scuttlebutt.html.tera
```
I'd rather leave styling updates to the end - after we've added all the backend functionality and UI - but I sometimes I get carried away 😅
OK, I merged main into this branch and pushed a commit. Seems like the conflict has been resolved and I don't think I've introduced any unwanted code.
OK, I merged `main` into this branch and pushed a commit. Seems like the conflict has been resolved and I don't think I've introduced any unwanted code.
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
notplants
This was intended to be a JS-fix-only PR but I had a lapse in discipline and some CSS+HTML changes slipped into the mix.
@notplants previously did the great work of separating the
flashMsgJS function intocommon.rs. This PR removes all the duplicate instances of that function which remained in the codebase.This also fixes some of the JS functions which were named incorrectly (in
change_password.jsandconfigure_dns.js).JS for updating network status has been removed from
network_card.js. This is no longer necessary, since we have separated settings and status into different templates.Minor HTML and CSS updates were introduced to a few templates:
I'd rather leave styling updates to the end - after we've added all the backend functionality and UI - but I sometimes I get carried away 😅
Ah, there's a conflict here but I don't see any difference between
src/routes/authentication.rsin the current PR andmain? -_-OK, I merged
maininto this branch and pushed a commit. Seems like the conflict has been resolved and I don't think I've introduced any unwanted code.LG
a lil styling sometimes slips in, I understand
glad to see more code abstracted and less duplication