Fix broken JS and tweak styling (CSS & HTML) #33

glyph · 2021-11-22T13:40:59Z

glyph commented

2021-11-22 13:40:59 +00:00

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 😅

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 😅

glyph added 9 commits 2021-11-22 13:41:00 +00:00

tweak styling bae3b7c2ce

fix js 380ee2683a

improve not_found template 925051a379

improve template styling consistency da51070ccd

fix context back and title 554997a5c0

remove duplicate flashMsg code e54ff8829a

remove duplicate flashMsg code e5f9a9be83

remove status update logic ee1da0599c

fix function names and remove flashMsg code duplication b59eb22082

glyph added the

peach-web

maintenance

labels 2021-11-22 13:41:24 +00:00

glyph requested review from notplants 2021-11-22 13:41:30 +00:00

glyph commented

2021-11-22 13:44:07 +00:00

Ah, there's a conflict here but I don't see any difference between src/routes/authentication.rs in the current PR and main? -_-

Ah, there's a conflict here but I don't see any difference between `src/routes/authentication.rs` in the current PR and `main`? -_-

glyph added 1 commit 2021-11-22 13:59:14 +00:00

Merge branch 'main' into js_and_style_fixes 7e3c500b1e

glyph commented

2021-11-22 14:00:45 +00:00

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.

notplants commented

2021-11-24 09:05:24 +00:00

LG

a lil styling sometimes slips in, I understand

glad to see more code abstracted and less duplication

LG a lil styling sometimes slips in, I understand glad to see more code abstracted and less duplication

🎉 1

glyph merged commit b3c6138e03 into main

2021-11-24 09:15:51 +00:00

glyph deleted branch js_and_style_fixes

2021-11-24 09:15:51 +00:00

glyph referenced this issue from a commit