refactoring

This commit is contained in:
Anna Sudnitsina 2017-02-15 18:52:40 +03:00
parent fa02fa8e42
commit 3f5394cd2a
5 changed files with 262 additions and 311 deletions

View File

@ -1,85 +1,85 @@
@media screen and (max-width: 600px){
.lessmore {right: 0px;
font-size: 20pt;
}
select {height: 50px}
.msg {padding: 0; margin: 0}
}
#menu {display: block;
position: absolute;
right: 10px;
top: 17px;
font-size:0.7em}
body {
background-color: #2E3436;
color: #eeeeec;
font-family: "Arial", sans-serif;
font-size: 1em;
}
a, a:visited, a:active {
color: #eeeeec;
//border-bottom: 1px #eeeeec dotted;
text-decoration-style: dotted;
}
//#faq {display: block;
// position: absolute; left: 10px; top: 17px; font-size:0.7em}
//#menu{display:none}
.msg {
display: block; margin: 1em 0;
background-color:#272C2D;
padding: 1.5em 3em 1.5em;
word-wrap: break-word;
}
@media screen and (max-width: 600px){
.lessmore {
display: block;
color: #babdb6;
position:fixed;
top: 0px;
height:70px;
width:100%;
text-decoration: none;
margin-bottom: 5pt;
text-align: center;
font-size: 40pt;
background-color: #2E3436;
border-bottom: none;
right: 0px;
font-size: 20pt;
}
select {height: 50px}
.msg {
padding: 0;
margin: 0;
}
#faq {margin: 80px 0 0;
}
select {
padding:9px 0;
margin: 80px 0 0;
width: 100%;
color:#000;
border:1px solid transparent;
border-bottom:1px solid #009688;
font-size: 1em;}
a, a:visited, a:active {
color: #eeeeec;
text-decoration-style: dotted;
}
body {
background-color: #2E3436;
color: #eeeeec;
font: normal 1em Arial, sans-serif;
//font-family: "Arial", sans-serif;
//font-size: 1em;
}
#dropdown-content {
background-color:#2E3436;
display: none;
font-size: 0.5em;
position:absolute;
right: 0;
top: 70px;
width: 300px;
//z-index:1;
}
#dropdown-content {
display: none;
position:absolute;
right: 0;
top: 70px;
height: auto;
width: 300px;
background-color:#2E3436;
//padding: 20px;
font-size: 0.5em;
z-index:1;
}
#dropdown-content>a {
border:1px solid #eeeeec;
display: block;
padding: 10px
border:1px solid #eeeeec;
display: block;
padding: 10px
}
#faq {
margin: 80px 0 0;
}
.lessmore {
background-color: #2E3436;
border-bottom: none;
color: #babdb6;
display: block;
font-size: 40pt;
height:70px;
position:fixed;
text-align: center;
text-decoration: none;
top: 0px;
margin-bottom: 5pt;
width:100%;
}
#menu {
display: block;
font-size:0.7em;
position: absolute;
right: 10px;
top: 17px;
}
.msg {
background-color:#272C2D;
display: block; margin: 1em 0;
padding: 1.5em 3em 1.5em;
word-wrap: break-word;
}
select {
font-size: 1em;
margin: 80px 0 0;
padding:9px 0;
width: 100%;
}

View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<html>
<head>
<head>
<title>dynamic|LESS</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=0.7">
@ -8,46 +8,22 @@
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="js/script.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head>
<body>
<div class="lessmore">
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
<a href="/">На главную</a>
<a href="/" onclick="clearFilter()">Сбросить фильтр</a>
<a href="/lessmorefaq.html">FAQ</a>
</head>
<body>
</div>
<a href = "/" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
<div class="lessmore">
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
<a href="/">На главную</a>
<a href="/" onclick="clearFilter()">Сбросить фильтр</a>
<a href="lessmorefaq.html">FAQ</a>
</div>
<!--form><select id="echoSelector" multiple size="5"></select></form-->
<div id="echoSelected"style="margin:100px 0 0"></div>
<input type="text" placeholder="Search..." id="myInput" onkeyup="searchEcho()">
<div id="echoCheckBox"></div>
<!--div id="mes"></div>
<div align="center" >
<img src="/img/preload.gif" onclick="showMore()" height="20em"> </div-->
<!--div id="paginator" align="center" onclick="showMore()">Show more</div-->
</body>
<script>
function searchEcho() {
var input, filter, box, row;
input = $("#myInput").val();
input = input.toLowerCase();
<a href = "/" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
</div>
box = $("label");
row = $(".row");
console.log(box);
for (i = 0; i<box.length; i++) {
if (box[i].innerHTML.indexOf(input) > -1) {
row[i].style.display = "";
} else {
row[i].style.display = "none";
}
}
}
</script>
<div id="echoSelected"style="margin:100px 0 0"></div>
<input type="text" placeholder="Search..." id="myInput" onkeyup="searchEcho()">
<div id="echoCheckBox"></div>
</body>
</html>

View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<html>
<head>
<head>
<title>dynamic|LESS</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=0.7">
@ -8,24 +8,28 @@
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="js/script.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head>
<body>
<div class="lessmore">
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
<a href="/filter.html">Настроить фильтр</a>
<a href="/" onclick="clearFilter()">Сбросить фильтр</a>
<a href="/lessmorefaq.html">FAQ</a>
</head>
<body>
</div>
<a href = "" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
<div class="lessmore">
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
<a href="filter.html">Настроить фильтр</a>
<a href="" onclick="clearFilter()">Сбросить фильтр</a>
<a href="lessmorefaq.html">FAQ</a>
</div>
<!--a href = "javascript:void(0)" onclick="filterByEcho()">Filter</a-->
<form><select id="echoSelector" multiple size="5"></select></form>
<div id="echoSelected"></div>
<div id="mes"></div>
<div align="center" >
<div id = "preloader"> <img src="/img/preload.gif" onclick="showMore()" height="20em"> </div></div>
<!--div id="paginator" align="center" onclick="showMore()">Show more</div-->
</body>
<a href = "" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
</div>
<form><select id="echoSelector" multiple size="5"></select></form>
<div id="echoSelected"></div>
<div id="mes"></div>
<div id = "preloader" align="center">
<img src="/img/preload.gif" onclick="showMore()" height="20em">
</div>
</body>
</html>

View File

@ -6,146 +6,147 @@ var this_page = 1;
var show_rows = 5;
var from = 0;
function clearFilter(){
document.cookie = "";
console.log("test");
}
function showMenu() {
console.log($("#dropdown-content").css("display"));
if($("#dropdown-content").css("display") == "none") {
$("#dropdown-content").css("display","block");
}else {
$("#dropdown-content").css("display","none");
}
console.log("Menu");
}
//var date = new Date(new Date().getTime() + 60 * 1000);
var date = new Date;
date.setDate(date.getDate() + 7);
var echo = document.cookie;
console.log("echo: " + echo);
console.log("cookie: " + document.cookie);
if("lenta.rss".indexOf(echo) > -1 ) {
console.log(echo);}
//console.log("echoes: "+ echo );
$(function() {
//extentions
$.ajax({
//extentions
$.ajax({
url:"https://dynamic.lessmore.pw/idec/x/features",
success:function(data){console.log(data); $("#extentions").html("<b>" + data.replace("\n","<br>") + "</b>")}
})
//initial load
if (echo != '') {
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["echo"], "query" :"' + echo + '"}}, "size":'+ 5 + '}',
//data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}],"size":5}',
success:function(messages){callback(messages);$("#mes").html(html);
}
})
} else {
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
//data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["echo"], "query" :"' + echo + '"}}, "size":'+ 5 + '}',
data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}],"size":5}',
success:function(messages){callback(messages);$("#mes").html(html);}
})
success:function(data) {
$("#extentions").html("<b>" + data.replace("\n","<br>") + "</b>");
}
//create echoes list
})
//initial load
if (echo != '') { requestEcho();
} else {
requestEmptyEcho();
}
//create echoes list
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}],"aggs": {"my_fields": { "terms": { "field": "echo","size": 1000}}}}}',
success:function(messages){for (i in messages['aggregations']['my_fields']['buckets']){
var msg = messages['aggregations']['my_fields']['buckets'][i]['key'];
var doc_count = messages['aggregations']['my_fields']['buckets'][i]['doc_count'];
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}],"aggs": {"my_fields": { "terms": { "field": "echo","size": 1000}}}}}',
success:function(messages){for (i in messages['aggregations']['my_fields']['buckets']){
var msg = messages['aggregations']['my_fields']['buckets'][i]['key'];
var doc_count = messages['aggregations']['my_fields']['buckets'][i]['doc_count'];
msg_test = msg + " ";
echo_test = echo + " ";
if((echo_test).indexOf(msg_test) > -1 && echo != '') {
options += '<option value="' + msg + '" selected>' + msg + " (<b>" + doc_count + "</b>)</option>";
checks += '<span class="row"><input type="checkbox" class="echoes" name="ec" value="' + msg + '" checked><label>'
msg_test = msg + " ";
echo_test = echo + " ";
if((echo_test).indexOf(msg_test) > -1 && echo != '') {
options += '<option value="' + msg + '" selected>' + msg + " (<b>" + doc_count + "</b>)</option>";
checks += '<span class="row"><input type="checkbox" class="echoes" name="ec" value="' + msg + '" checked><label>'
+ msg
+ '</label> <span style="color:#838784">('+ doc_count
+ ')</span><br></span>';}
else
{
+ ')</span><br></span>';
} else {
options += '<option value="' + msg + '" >' + msg + " (<b>" + doc_count + "</b>)</option>";
checks += '<span class="row"><input type="checkbox" class="echoes" name="ec" value="' + msg + '"><label>'
+ msg
+ '</label> <span style="color:#838784">('+ doc_count
+ ')</span><br></span>';}
}
$('#echoSelected').html("Выбранные эхи: " + document.cookie);
$('#echoSelector').html(options);
$('#echoCheckBox').html(checks);}
}
$('#echoSelected').html("Выбранные эхи: " + document.cookie);
$('#echoSelector').html(options);
$('#echoCheckBox').html(checks);}
})
//show msgs when echo is selected
$('.echoes:checked').each(function() {
echo = '';
echo += $(this).val()[i] + " ";
});
$('.echoes:checked').each(function() {
echo = '';
console.log(echo);
echo += $(this).val()[i] + " ";
});
var boxes = $("input[type=checkbox]");
var boxes = $("input[type=checkbox]");
$("#echoCheckBox").on('change', function() {
echo = '';
for (var i=0; i<$("input[type=checkbox]:checked").length; i++) {
echo += $("input[type=checkbox]:checked")[i]["defaultValue"] + " ";}
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
$('#echoSelected').html("Выбранные эхи: " + echo);
});
$("#echoCheckBox").on('change', function() {
echo = '';
console.log($("input[type=checkbox]:checked")[0]["defaultValue"]);
console.log($("input[type=checkbox]:checked").length);
for (var i=0; i<$("input[type=checkbox]:checked").length; i++) {
console.log($("input[type=checkbox]:checked")[i]["defaultValue"]);
echo += $("input[type=checkbox]:checked")[i]["defaultValue"] + " ";}
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
$('#echoSelector').on('change', function() {
echo = '';
html = '';
for (i in $(this).val()) {
echo += $(this).val()[i] + " ";
}
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
requestEcho();
$('#echoSelected').html("Выбранные эхи: " + echo)
//echo += $(this).val()[i] + " "};
//console.log(echo);
$('#echoSelected').html("Выбранные эхи: " + echo);
if (echo == "") requestEmptyEcho();
});
});
$('#echoSelector').on('change', function() {
echo = '';
for (i in $(this).val()) {echo += $(this).val()[i] + " "};
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data:'{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["echo"], "query" :"' + echo + '"}}, "size":5}',
success:function(messages){html = ''; callback(messages);$("#mes").html(html);$('#echoSelected').html("Выбранные эхи: " + echo); }
});
});
//scroll
$(window).scroll(function() {
//scroll to show more messages
$(window).scroll(function() {
// console.log($(document).height() - $(window).height()-$(window).scrollTop());
if ($(document).height() - $(window).height() - $(window).scrollTop() < 1.5) {
showMore();
//console.log($(document).height() - $(window).height() - $(window).scrollTop());
}
});
});
})
}) //end of .ready() method
function ajaxRequest(data) {
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data: data,
success:function(messages){
callback(messages);
$("#mes").html(html);
}
})
}
function requestEmptyEcho() {
var data = '{"sort": [{"date": {"order": "desc"}}, {"_score": {"order": "desc" }}], "size": 5}';
ajaxRequest(data);
}
function requestEcho() {
var data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + 5 + '}';
ajaxRequest(data);
}
function requestEchoOffset() {
var data = '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["echo"], "query" :"' + echo + '"}}, "size":'+ show_rows + ', "from":'+ from + '}';
ajaxRequest(data);
}
//show messages
function callback(messages) {
var msgArray = messages["hits"]["hits"];
for (hit in msgArray) {
var msgItem = msgArray[hit]['_source'];
var t = new Date(msgItem['date'] * 1000);
var t_formatted = t.getFullYear() + "/" + (t.getMonth() + 1) + "/" + t.getDate() + " " + t.getHours() + ":" + t.getMinutes() + ":" + t.getSeconds();
msg = msgItem['message'].replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(new RegExp("\n",'g'), "<br>\n");
var to =
html += '<div class="msg"><p align="right">' + t_formatted + '</p> <p style="font: 1.5em Open Sans, sans-serif;">'
+ msgItem['subg'] + '</p><p>Echo: '
+ msgItem['echo'] + '<br>Author: ' + msgItem['author']
+ '<br>To: ' + msgItem['to']
+ '</p><p>' + msg
+ '</p><p align="right">' + msgItem['msgid'] + '</p></div>' ;
}
}
//show more messages
function showMore(){
@ -153,66 +154,39 @@ function showMore(){
from += show_rows;
var author = "(author:Difrex)";
if (echo != '') {
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["echo"], "query" :"' + echo + '"}}, "size":'+ show_rows + ', "from":'+ from + '}',
success:function(messages){callback(messages);
$("#mes").html(html);
// if(messages.hits.hits.length == 0){$("#preloader")[0].style.display = "none"} else {$("#preloader").css("display", "block")}
}
})
requestEchoOffset();
} else {
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}],"size":'+ show_rows + ', "from":'+ from + '}',
success:function(messages){callback(messages); $("#mes").html(html); }
})
requestEmptyEcho();
}
}
}
function searchEcho() {
var input, filter, box, row;
input = $("#myInput").val();
input = input.toLowerCase();
//show messages
function callback(messages) {
for (hit in messages["hits"]["hits"]) {
var t = new Date(messages['hits']['hits'][hit]['_source']['date'] * 1000);
var t_formatted = t.getFullYear() + "/" + (t.getMonth() + 1) + "/" + t.getDate() + " " + t.getHours() + ":" + t.getMinutes() + ":" + t.getSeconds();
// Replace new line with <br>
msg = messages['hits']['hits'][hit]['_source']['message'].replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(new RegExp("\n",'g'), "<br>\n");
html += '<div class="msg"><p align="right">' + t_formatted + '</p> <p style="font-size: 1.5em; font-family: "Open Sans", sans-serif;">'
+ messages['hits']['hits'][hit]['_source']['subg']
+ '</p><p>Echo: '
+ messages['hits']['hits'][hit]['_source']['echo']
+ '<br>Author: '
+ messages['hits']['hits'][hit]['_source']['author']
+ '<br>To: '
+ messages['hits']['hits'][hit]['_source']['to']
+ '</p><p>'
+ msg
// + messages['hits']['hits'][hit]['_source']['message']
+ '</p><p align="right">'
+ messages['hits']['hits'][hit]['_source']['msgid'] + '</p></div>' ;
box = $("label");
row = $(".row");
for (i = 0; i<box.length; i++) {
if (box[i].innerHTML.indexOf(input) > -1) {
row[i].style.display = "";
} else {
row[i].style.display = "none";
}
}
}
//not used
/*
function filterByEcho() {
console.log('func');
var author = "(echo:develop.16)";
var from = 0;
$.ajax({
url:"https://dynamic.lessmore.pw/search",
type:"POST",
data: '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["author"], "query" : ""}}, "size":5}',
success:function(messages){html=''; callback(messages); $("#mes").html(html);
function clearFilter() {
document.cookie = "";
}
})
function showMenu() {
if ($("#dropdown-content").css("display") == "none") {
$("#dropdown-content").css("display","block");
} else {
$("#dropdown-content").css("display","none");
}
}
*/

View File

@ -6,30 +6,28 @@
<head>
<title>dynamic|LESS</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=0.7">
<link rel="stylesheet" href="css/style.css">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=0.7">
<link rel="stylesheet" href="css/style.css">
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="js/script.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head>
<body>
<!--div class="lessmore"><a href = "" style="text-decoration: none; color: #babdb6;"><u>FAQ</u> | <a href="/">dynamic</a></a></div-->
<div class="lessmore">
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
<a href="/">На главную</a>
<a href="/filter.html">Настроить фильтр</a>
<a href="/" onclick="clearFilter()">Сбросить фильтр</a>
</div>
<a href = "/" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
<a href="/">На главную</a>
<a href="/filter.html">Настроить фильтр</a>
<a href="/" onclick="clearFilter()">Сбросить фильтр</a>
</div>
<a href = "/" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
</div>
<div style= "margin: 100px 0 0">
<h1 class="faq" align = "center">FAQ</h1>
<h2>Что это?</h2>
@ -50,8 +48,7 @@
<h2>А клиентом можно читать?</h2>
<p>Можно. Пока что реализовано простейшее(скоро будет больше) ii API, а точнее схемы <b>/e/</b> и <b>/m/</b>. Из расширений доступны: <span id="extentions">/list.txt </span> <br><br>
Строка для подключения: <b>https://dynamic.lessmore.pw/idec/</b>
</p>
Строка для подключения: <b>https://dynamic.lessmore.pw/idec/</b></p>
<h2>А API есть?</h2>