diff --git a/src/users/users.cpp b/src/users/users.cpp index 3cdec7f..42eb212 100644 --- a/src/users/users.cpp +++ b/src/users/users.cpp @@ -111,18 +111,18 @@ void add_user(const httplib::Request& request, httplib::Response& response) { const std::string password = json_body["password"]; for (auto& user : all_users) { - if ((user["username"] == username) && (user["password"] == password)) { + if ((user["username"] == username)) { response.set_content("{\"status\":\"user already exists\"}", "application/json");return; } } std::stringstream new_user_data; - new_user_data << "{\"id\":\"" << get_random_string(ALPHABET, 50) << "\",\"username\":\"" << username << "\",\"password\":\"" << password << "\",\"group\":\""; - (json_body["group"] != nullptr) ? new_user_data << json_body["group"] : new_user_data << "users"; - new_user_data << "\",\"is_superuser\":\""; - (json_body["is_superuser"] != nullptr) ? new_user_data << json_body["is_superuser"] : new_user_data << "0"; - new_user_data << "\"}"; + new_user_data << "{\"id\":\"" << get_random_string(ALPHABET, 50) << "\",\"username\":\"" << username << "\",\"password\":\"" << password << "\",\"group\":"; + (json_body["group"] != nullptr) ? new_user_data << json_body["group"] : new_user_data << "\"users\""; + new_user_data << ",\"is_superuser\":"; + (json_body["is_superuser"] != nullptr) ? new_user_data << json_body["is_superuser"] : new_user_data << "\"0\""; + new_user_data << "}"; all_users.push_back(nlohmann::json::parse(new_user_data)); std::ofstream usersfilew("users.json"); diff --git a/src/web/css/index.css b/src/web/css/index.css index 27ad75c..e811ff1 100644 --- a/src/web/css/index.css +++ b/src/web/css/index.css @@ -10,4 +10,4 @@ body { background-color: black; color: white; position: relative; -} \ No newline at end of file +} diff --git a/src/web/css/loginform.css b/src/web/css/loginform.css index 530eefb..37261fd 100644 --- a/src/web/css/loginform.css +++ b/src/web/css/loginform.css @@ -1,4 +1,4 @@ -.loginform { +.form { position: absolute; width: 100%; height: 0; @@ -11,14 +11,19 @@ pointer-events: none; transition: 0.3s; background-color: black; + z-index: 10; } -.loginform.active { +.form.confirmform { + background-color: transparent; +} + +.form.active { height: 100%; pointer-events: all; } -.loginformbody { +.formbody { padding: 10px; background-color: gray; border-radius: 10px; @@ -40,6 +45,18 @@ transition: 0.3s; } +.loginforminputbody { + +} + +.loginforminputbodyflex { + display: flex; +} + +.loginforminputbodyflex>button { + margin: 10px; +} + .loginformbutton { padding: 10px; border: none; @@ -50,6 +67,7 @@ background-color: rgb(59, 59, 197); color: white; transition: 0.3s; + margin: 5px 0; } .loginformbutton:hover { diff --git a/src/web/css/userstable.css b/src/web/css/userstable.css index fd55e27..edee8a8 100644 --- a/src/web/css/userstable.css +++ b/src/web/css/userstable.css @@ -24,9 +24,29 @@ tbody { } th { + position: relative; border-radius: 10px; padding: 10px; - width: 25%; + width: 16%; + text-overflow: auto; + overflow-x: auto; +} + +.thbutton { + position: absolute; + width: 100%; + height: 100%; + cursor: pointer; + left: 0; + top: 0; + background-color: rgb(48, 44, 44); + color: white; + border: none; + transition: 0.3s; +} + +.thbutton:hover { + background-color: rgb(145, 77, 77); } ::-webkit-scrollbar { diff --git a/src/web/index.html b/src/web/index.html index d61f2a2..888980c 100644 --- a/src/web/index.html +++ b/src/web/index.html @@ -13,17 +13,18 @@