From 925229bbda50735aca5fcdd0c2aeebf95a9cf24d Mon Sep 17 00:00:00 2001 From: Andreev Gregory Date: Thu, 29 Aug 2024 20:46:29 +0300 Subject: [PATCH] Api updated. done everything except for system message sending, user registration and any testing --- .gitignore | 1 + assets/HypertextPages/chat-members.nytl.html | 29 +++ assets/HypertextPages/chat.nytl.html | 26 ++- assets/HypertextPages/edit-profile.nytl.html | 42 ++++ assets/HypertextPages/err-404.html | 10 + assets/HypertextPages/list-rooms.nytl.html | 8 +- assets/HypertextPages/login.nytl.html | 3 +- .../pass-pres-userinfo.nytl.html | 6 - assets/HypertextPages/profile.nytl.html | 39 ---- assets/HypertextPages/registration.nytl.html | 27 --- assets/HypertextPages/view-profile.nytl.html | 26 +++ assets/img/empty_avatar.png | Bin 82618 -> 0 bytes assets/img/logo0.png | Bin 0 -> 9908 bytes assets/js/chat-members.js | 0 assets/js/profile.js | 10 - building/main.cpp | 19 +- config/default.json | 0 example/config.json | 6 +- .../running_mainloop.cpp | 4 +- src/http_server/misc_tests/nytl_test1.cpp | 9 +- .../new_york_transit_line/parser.cpp | 10 +- .../new_york_transit_line/rendering.cpp | 9 +- .../backend_logic/admin_control_procedure.cpp | 30 +++ .../backend_logic/api_addmembertochat.cpp | 43 +++- .../backend_logic/api_createchat.cpp | 20 +- .../backend_logic/api_deletemessage.cpp | 23 +- .../backend_logic/api_getchatinfo.cpp | 19 -- .../backend_logic/api_getchatlist.cpp | 33 --- .../backend_logic/api_getchatmemberlist.cpp | 36 ---- .../backend_logic/api_getmessageinfo.cpp | 20 -- .../api_getmessageneighbours.cpp | 52 ----- .../backend_logic/api_getuserinfo.cpp | 13 -- .../backend_logic/api_leavechat.cpp | 14 ++ .../backend_logic/api_pollevents.cpp | 151 -------------- .../backend_logic/api_removechat.cpp | 11 - .../api_removememberfromchat.cpp | 32 ++- .../backend_logic/api_sendmessage.cpp | 35 ++-- .../backend_logic/client_server_interact.cpp | 61 ++---- .../backend_logic/client_server_interact.h | 28 +-- .../backend_logic/polling.cpp | 196 ++++++++++++++++++ .../backend_logic/server_data_interact.cpp | 166 ++++++++++++--- .../backend_logic/server_data_interact.h | 48 +++-- .../backend_logic/when_chat.cpp | 52 ++++- .../backend_logic/when_list_rooms.cpp | 4 +- .../backend_logic/when_login.cpp | 11 +- .../backend_logic/when_user.cpp | 107 +++++++++- src/web_chat/iu9_ca_web_chat_lib/find_db.cpp | 18 +- .../iu9_ca_web_chat_lib/initialize.cpp | 22 +- .../iu9_ca_web_chat_lib/login_cookie.cpp | 8 +- src/web_chat/iu9_ca_web_chat_lib/run.cpp | 105 ++++------ .../iu9_ca_web_chat_lib/str_fields.cpp | 10 +- src/web_chat/iu9_ca_web_chat_lib/str_fields.h | 1 + 52 files changed, 947 insertions(+), 706 deletions(-) create mode 100644 assets/HypertextPages/chat-members.nytl.html create mode 100644 assets/HypertextPages/edit-profile.nytl.html create mode 100644 assets/HypertextPages/err-404.html delete mode 100644 assets/HypertextPages/pass-pres-userinfo.nytl.html delete mode 100644 assets/HypertextPages/profile.nytl.html delete mode 100644 assets/HypertextPages/registration.nytl.html create mode 100644 assets/HypertextPages/view-profile.nytl.html delete mode 100644 assets/img/empty_avatar.png create mode 100644 assets/img/logo0.png create mode 100644 assets/js/chat-members.js delete mode 100644 assets/js/profile.js create mode 100644 config/default.json create mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/admin_control_procedure.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_getchatinfo.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_getchatlist.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_getchatmemberlist.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_getmessageinfo.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_getmessageneighbours.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_getuserinfo.cpp create mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_leavechat.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_pollevents.cpp delete mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/api_removechat.cpp create mode 100644 src/web_chat/iu9_ca_web_chat_lib/backend_logic/polling.cpp diff --git a/.gitignore b/.gitignore index fb75514..d84e34d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ iu9-ca-web-chat.db log/ core +config/example.json \ No newline at end of file diff --git a/assets/HypertextPages/chat-members.nytl.html b/assets/HypertextPages/chat-members.nytl.html new file mode 100644 index 0000000..176acab --- /dev/null +++ b/assets/HypertextPages/chat-members.nytl.html @@ -0,0 +1,29 @@ +{% ELDEF main JSON pres JSON userinfo JSON openedchat JSON initial_chatUpdResp %} + + + + + + Веб-Чат Members + + + +{% PUT chat.pass pres userinfo openedchat initial_chatUpdResp %} + +
+
+
+ × +

Все участники

+
+
+
    + +
+
+
+
+ + + +{% ENDELDEF %} diff --git a/assets/HypertextPages/chat.nytl.html b/assets/HypertextPages/chat.nytl.html index cc6617b..3519f47 100644 --- a/assets/HypertextPages/chat.nytl.html +++ b/assets/HypertextPages/chat.nytl.html @@ -1,4 +1,13 @@ -{% ELDEF main JSON pres JSON userinfo %} +{% ELDEF pass JSON pres JSON userinfo JSON openedchat JSON initial_chatUpdResp %} + +{% ENDELDEF %} + +{% ELDEF main JSON pres JSON userinfo JSON openedchat JSON initial_chatUpdResp %} @@ -8,6 +17,8 @@ +{% PUT chat.pass pres userinfo openedchat initial_chatUpdResp %} +
Веб чат @@ -21,19 +32,6 @@
-
-
-
- × -

Все участники

-
-
-
    - -
-
-
-
diff --git a/assets/HypertextPages/edit-profile.nytl.html b/assets/HypertextPages/edit-profile.nytl.html new file mode 100644 index 0000000..63cfe07 --- /dev/null +++ b/assets/HypertextPages/edit-profile.nytl.html @@ -0,0 +1,42 @@ +{% ELDEF main JSON pres JSON userprofile JSON errors %} + + + + + + Профиль + + +
+ {% FOR error IN errors %} +
+

{% WRITE error.text %}

+
+ {% ENDFOR %} +
+

Редактирование профиля

+
+
+
+
+

{% WRITE userprofile.name %} ( {% WRITE userprofile.nickname %} )

+ + +
+ + +
+
+
+
+

О себе

+

{% WRITE userprofile.bio %}


+ + +
+ +
+
+ + +{% ENDELDEF%} diff --git a/assets/HypertextPages/err-404.html b/assets/HypertextPages/err-404.html new file mode 100644 index 0000000..a54d561 --- /dev/null +++ b/assets/HypertextPages/err-404.html @@ -0,0 +1,10 @@ + + + + + Not found + + +

Page not found

+ + diff --git a/assets/HypertextPages/list-rooms.nytl.html b/assets/HypertextPages/list-rooms.nytl.html index ddc4923..ff71a87 100644 --- a/assets/HypertextPages/list-rooms.nytl.html +++ b/assets/HypertextPages/list-rooms.nytl.html @@ -1,4 +1,4 @@ -{% ELDEF main JSON pres JSON userinfo %} +{% ELDEF main JSON pres JSON userinfo JSON initial_chatListUpdResp %} @@ -8,7 +8,11 @@ -{% PUT pass-pres-userinfo pres userinfo %} +

Выберите Чат-Комнату