diff --git a/Cargo.lock b/Cargo.lock index e59f99a..fc08e8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1094,6 +1094,7 @@ dependencies = [ "async-std", "chrono", "http-types", + "openssl", "serde", "sqlx 0.4.0-beta.1", "tide", @@ -1274,6 +1275,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +[[package]] +name = "openssl-src" +version = "111.10.2+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.58" @@ -1283,6 +1293,7 @@ dependencies = [ "autocfg 1.0.0", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/src/forms.rs b/src/forms.rs index 71707ff..c39efb6 100644 --- a/src/forms.rs +++ b/src/forms.rs @@ -83,7 +83,7 @@ impl ChangeForm { .execute(&request.state().pool) .await { - Ok(_) => (Level::Info, "updated device".to_string()), + Ok(_) => (Level::Info, format!("updated device \"{}\"", device.descr)), Err(_) => (Level::Error, "unable to update device".to_string()), } } @@ -101,13 +101,17 @@ impl ChangeForm { ) } }; + let descr = device.descr.clone(); match device .delete() .unwrap() .execute(&request.state().pool) .await { - Ok(_) => (Level::Info, "delete device".to_string()), + Ok(_) => ( + Level::Info, + format!("device \"{}\" has been deleted", descr), + ), Err(_) => (Level::Error, "unable to delete device".to_string()), } } diff --git a/templates/index.html b/templates/index.html index 7f79dff..cd5ba64 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,40 +3,53 @@ - + + macnickenson - +
-

macnickenson

+
+
+
+

macnickenson

+
+
+
{% for message in messages %} -
{{ message.1 }}
+
+ + {{ message.1 }} +
{% endfor %} -
-

Your ({{ nickname }}) Devices:

- +
+

{{ nickname }}'s Devices:

+
- + - + {% for device in my %} - - - + - @@ -68,28 +81,28 @@
Mac-AddressMAC-Address Description PrivacyCommandsActions
- {{ device.macaddr }} + + {{ device.macaddr }} {% if device.present %} - on + on {% endif %} + + + -
+
+
+ class="button is-info is-small">Update + class="button is-danger is-small">Delete
-
-

Unregistred Devices:

- +
+

Unregistred Devices:

+
- + {% for device in unassinged %} - - - + - - {% endfor %}
MAC-Address IP-Address Description PrivacyCommandsActions
- {{ device.macaddr }} + + {{ device.macaddr }} {{ device.ip() }} + {{ device.ip() }} + + + class="button is-success is-small">Register
-
- footer -
+
+ +