diff --git a/src/auth/auth.cpp b/src/auth/auth.cpp index b2cf523..36259fa 100644 --- a/src/auth/auth.cpp +++ b/src/auth/auth.cpp @@ -1,7 +1,9 @@ #include "auth.hpp" +#include "../colors.h" // function for authorization users void auth(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content("{\"required\":\"[username,password]\"}", "application/json");return;} nlohmann::json json_body = nlohmann::json::parse(request.body); diff --git a/src/auth_service.cpp b/src/auth_service.cpp index 19562a3..be82972 100644 --- a/src/auth_service.cpp +++ b/src/auth_service.cpp @@ -6,6 +6,7 @@ #include "auth/auth.hpp" #include "users/users.hpp" +#include "colors.h" #define CORS_ENABLE @@ -28,7 +29,9 @@ int main() { srv.set_mount_point("/admin", "../src/web"); srv.set_mount_point("/js", "../src/web/js"); srv.set_mount_point("/css", "../src/web/css"); - + + std::cout << GREEN << "Starting" << RESET << " server on [ " << YELLOW \ + << "localhost" << RESET << ":" << CYAN << "43243" << RESET << " ]" << std::endl; srv.listen("localhost", 43243); return 0; } diff --git a/src/colors.h b/src/colors.h new file mode 100644 index 0000000..fa6270b --- /dev/null +++ b/src/colors.h @@ -0,0 +1,77 @@ +#ifndef C_COLORS_H +#define C_COLORS_H + +// reset +#define RESET "\033[0m" + +// regular colrs +#define GREEN "\033[0;32m" // GREEN +#define BLUE "\033[0;34m" // BLUE +#define YELLOW "\033[1;33m" // YELLOW +#define RED "\033[0;31m" // RED +#define BLACK "\033[0;30m" // BLACK +#define PURPLE "\033[0;35m" // PURPLE +#define CYAN "\033[0;36m" // CYAN +#define WHITE "\033[0;37m" // WHITE + +// bold +#define BBLACK "\033[1;30m" // BLACK +#define BRED "\033[1;31m" // RED +#define BGREEN "\033[1;32m" // GREEN +#define BYELLOW "\033[1;33m" // YELLOW +#define BBLUE "\033[1;34m" // BLUE +#define BPURPLE "\033[1;35m" // PURPLE +#define BCYAN "\033[1;36m" // CYAN +#define BWHITE "\033[1;37m" // WHITE + +// Underline +#define UBLACK "\033[4;30m" // BLACK +#define URED "\033[4;31m" // RED +#define UGREEN "\033[4;32m" // GREEN +#define UYELLOW "\033[4;33m" // YELLOW +#define UBLUE "\033[4;34m" // BLUE +#define UPURPLE "\033[4;35m" // PURPLE +#define UCYAN "\033[4;36m" // CYAN +#define UWHITE "\033[4;37m" // WHITE + +// Background +#define ON_BLACK "\033[40m" // BLACK +#define ON_RED "\033[41m" // RED +#define ON_GREEN "\033[42m" // GREEN +#define ON_YELLOW "\033[43m" // YELLOW +#define ON_BLUE "\033[44m" // BLUE +#define ON_PURPLE "\033[45m" // PURPLE +#define ON_CYAN "\033[46m" // CYAN +#define ON_WHITE "\033[47m" // WHITE + +// High Intensity +#define IBLACK "\033[0;90m" // BLACK +#define IRED "\033[0;91m" // RED +#define IGREEN "\033[0;92m" // GREEN +#define IYELLOW "\033[0;93m" // YELLOW +#define IBLUE "\033[0;94m" // BLUE +#define IPURPLE "\033[0;95m" // PURPLE +#define ICYAN "\033[0;96m" // CYAN +#define IWHITE "\033[0;97m" // WHITE + +// Bold High Intensity +#define BIBLACK "\033[1;90m" // BLACK +#define BIRED "\033[1;91m" // RED +#define BIGREEN "\033[1;92m" // GREEN +#define BIYELLOW "\033[1;93m" // YELLOW +#define BIBLUE "\033[1;94m" // BLUE +#define BIPURPLE "\033[1;95m" // PURPLE +#define BICYAN "\033[1;96m" // CYAN +#define BIWHITE "\033[1;97m" // WHITE + +// High Intensity backgrounds +#define ON_IBLACK "\033[0;100m" // BLACK +#define ON_IRED "\033[0;101m" // RED +#define ON_IGREEN "\033[0;102m" // GREEN +#define ON_IYELLOW "\033[0;103m" // YELLOW +#define ON_IBLUE "\033[0;104m" // BLUE +#define ON_IPURPLE "\033[0;105m" // PURPLE +#define ON_ICYAN "\033[0;106m" // CYAN +#define ON_IWHITE "\033[0;107m" // WHITE + +#endif // C_COLORS_H \ No newline at end of file diff --git a/src/security/cors.cpp b/src/security/cors.cpp index b935070..773b5e3 100644 --- a/src/security/cors.cpp +++ b/src/security/cors.cpp @@ -1,6 +1,8 @@ #include "cors.hpp" +#include "../colors.h" void set_cors_headers(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << " " << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); response.set_header("Access-Control-Allow-Methods", "GET,POST,OPTIONS"); response.set_header("Access-Control-Allow-Headers", "Authorization,X-Custom,Content-Type"); diff --git a/src/users/access_request.cpp b/src/users/access_request.cpp index 5261c66..85f0ad1 100644 --- a/src/users/access_request.cpp +++ b/src/users/access_request.cpp @@ -1,7 +1,9 @@ #include "users.hpp" +#include "../colors.h" // function for access or reject authorization void user_access(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content("{\"required\":\"[token]\"}", "application/json");return;} nlohmann::json json_body = nlohmann::json::parse(request.body); diff --git a/src/users/add_user.cpp b/src/users/add_user.cpp index aecf36c..725d378 100644 --- a/src/users/add_user.cpp +++ b/src/users/add_user.cpp @@ -1,4 +1,5 @@ #include "users.hpp" +#include "../colors.h" #define ALPHABET "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" @@ -14,6 +15,7 @@ std::string get_random_string(const char *alphabet, int quantity) { // function for add user void add_user(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content("{\"required\":\"[token,username,password]\",\"optional\":\"[group,is_superuser]\"}", "application/json");return;} nlohmann::json json_body = nlohmann::json::parse(request.body); diff --git a/src/users/change_password.cpp b/src/users/change_password.cpp index 1b8ddb8..84fdf58 100644 --- a/src/users/change_password.cpp +++ b/src/users/change_password.cpp @@ -1,7 +1,9 @@ #include "users.hpp" +#include "../colors.h" // functtion for change password for user void change_password(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content( "{\"required\":\"[token,old_password,new_password] or if you superuser [token,userid,new_password]\"}", diff --git a/src/users/change_user.cpp b/src/users/change_user.cpp index c0ee6f3..854cc14 100644 --- a/src/users/change_user.cpp +++ b/src/users/change_user.cpp @@ -1,6 +1,9 @@ #include "users.hpp" +#include "../colors.h" +// function for change user data void change_user(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content( "{\"required\":\"[token] or if you superuser [token,userid]\",\"optional\":\"[username,password,is_superuser,group]\"}", diff --git a/src/users/delete_user.cpp b/src/users/delete_user.cpp index f7ab759..b45ecc5 100644 --- a/src/users/delete_user.cpp +++ b/src/users/delete_user.cpp @@ -1,7 +1,9 @@ #include "users.hpp" +#include "../colors.h" // function for delete user void delete_user(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content("{\"required\":\"[token] or if you superuser [token,userid]\"}", "application/json");return;} nlohmann::json json_body = nlohmann::json::parse(request.body); diff --git a/src/users/get_all_users.cpp b/src/users/get_all_users.cpp index 0d2474f..00c09d3 100644 --- a/src/users/get_all_users.cpp +++ b/src/users/get_all_users.cpp @@ -1,7 +1,9 @@ #include "users.hpp" +#include "../colors.h" // function for get all users data without password void get_all_users(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content("{\"required\":\"[token]\"}", "application/json");return;} nlohmann::json json_body = nlohmann::json::parse(request.body); diff --git a/src/users/get_user.cpp b/src/users/get_user.cpp index 2b41f65..42f5dce 100644 --- a/src/users/get_user.cpp +++ b/src/users/get_user.cpp @@ -1,7 +1,9 @@ #include "users.hpp" +#include "../colors.h" // function for get user data without password void get_user(const httplib::Request& request, httplib::Response& response) { + std::cout << GREEN << request.path << RESET << " " << request.method << std::endl; response.set_header("Access-Control-Allow-Origin", "*"); if (request.body == "") {response.set_content("{\"required\":\"[token]\"}", "application/json");return;} nlohmann::json json_body = nlohmann::json::parse(request.body);