collarbone-annihilation/iu9-ca-web-chat
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

master #6

Closed
karimov-adel wants to merge 39 commits from master into adel_branch_2.0
pull from: master
merge into: collarbone-annihilation:adel_branch_2.0
Conversation 0 Commits 39 Files Changed 97 +1 -127
3 changed files with 1 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit febf3af534 - Show all commits

75
assets/HypertextPages/list-rooms.nytl.html
View File

@ -1,75 +0,0 @@
{% ELDEF main JSON pres JSON userinfo JSON initial_chatListUpdResp %}
<!DOCTYPE html>
<html lang="{% W pres.lang %}">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{%w pres.list-rooms.header %}</title>
<link rel="icon" type="image/png" href="/assets/img/favicon.png">
<link rel="stylesheet" href="/assets/css/common.css">
<link rel="stylesheet" href="/assets/css/common-popup.css">
<link rel="stylesheet" href="/assets/css/list-rooms.css">
</head>
<body>
<script>
let pres = {% PUT jsinsert pres %};
let userinfo = {% PUT jsinsert userinfo %};
let initial_chatListUpdResp = {% PUT jsinsert initial_chatListUpdResp %};
</script>
<div id="chat-creation-win" class="popup-window">
<h1 class="popup-window-msg">{%w pres.list-rooms.new-chat-header %}</h1>
<table class="id-str-input-table">
<tr>
<td class="id-str-input-td1">
<label for="chat-nickname-input">{%w pres.list-rooms.directive-nickname %}</label>
</td>
<td class="id-str-input-td2">
<input id="chat-nickname-input" type="text" class="one-line-input"
placeholder="{%w pres.list-rooms.placeholder-nickname %}" required>
</td>
</tr>
<tr>
<td class="id-str-input-td1">
<label for="chat-name-input">{%w pres.list-rooms.directive-name %}</label>
</td>
<td class="id-str-input-td2">
<input id="chat-name-input" type="text" class="one-line-input"
placeholder="{%w pres.list-rooms.placeholder-name %}" required>
</td>
</tr>
</table>
<h1 class="popup-window-msg">{%w pres.list-rooms.reask-create-new-chat %}</h1>
<button class="popup-window-btn-yes" id="chat-creation-win-yes">{%w pres.list-rooms.yes-create %}</button>
<button class="popup-window-btn-no" id="chat-creation-win-no">{%w pres.list-rooms.no-create %}</button>
</div>
<div id="chat-renunciation-win" class="popup-window">
<!-- header will actually be rewritten before showing the window to include chat nickname -->
<h1 id="chat-renunciation-win-title" class="popup-window-msg">||||||||||</h1>
<button class="popup-window-btn-yes" id="chat-renunciation-win-yes">{%w pres.list-rooms.yes-leave %}</button>
<button class="popup-window-btn-no" id="chat-renunciation-win-no">{%w pres.list-rooms.no-leave %}</button>
</div>
<div class="document-container resp-container">
<div id="navigation-panel" class="panel">
<a href="/user/{%w userinfo.nickname %}" id="go-to-my-profile" class="panel-thing">
<img alt="Go to my profile" src="/assets/img/user.svg" width="32px">
</a>
<p class="panel-thing panel-header-txt">
{%w pres.list-rooms.page-description %}
</p>
</div>
<div class="dynamic-block-list">
<img id="CL-bacbe" class="button-add centered-block-el" alt="New chat" src="/assets/img/add.svg">
<div class="dynamic-block-list-el-container" id="CL-dblec">
</div>
</div>
</div>
<script src="/assets/js/common.js"></script>
<script src="/assets/js/common-popup.js"></script>
<script src="/assets/js/list-rooms.js"></script>
</body>
</html>
{% ENDELDEF %}

51
assets/css/list-rooms.css
View File

@ -1,51 +0,0 @@
#CL-bacbe {
margin-top: 6px;
margin-bottom: 4px;
}
.CL-my-chat-box {
display: flex;
flex-direction: row;
}
.CL-my-chat-box-nickname {
margin-left: 8px;
justify-self: flex-start;
}
.CL-my-chat-box-name {
margin-left: 14px;
justify-self: flex-start;
}
.CL-my-chat-box-my-role {
margin-left: auto;
justify-self: flex-end;
}
.CL-my-chat-box-leave-btn {
margin-left: 10px;
margin-right: 8px;
justify-self: flex-end;
width: 16px;
cursor: pointer;
}
/* The morbid thing */
table.id-str-input-table {
width: 100%;
border-collapse: collapse; /* Combine borders */
}
.id-str-input-td1, .id-str-input-td2 {
border: none;
}
.id-str-input-td1 {
text-align: left;
padding-right: 5px;
white-space: nowrap; /* Prevent text wrap, keeping it in one line */
overflow: hidden; /* Hide overflow content */
text-overflow: ellipsis; /* Show ellipsis for overflowing text */
}
.id-str-input-td2 {
width: 100%;
}

2
src/web_chat/iu9_ca_web_chat_lib/sqlite3_wrapper.cpp
View File

@ -76,7 +76,7 @@ namespace iu9cawebchat {
int ret = sqlite3_prepare_v2(connection.hand, req_statement.c_str(), -1, &stmt_obj, NULL);
if (ret != 0) {
int err_pos = sqlite3_error_offset(connection.hand);
int err_pos = -1;
een9_THROW("Compilation of request\n" + req_statement + "\nfailed" +
((err_pos >= 0) ? " with offset " + std::to_string(err_pos) : ""));
}