From bc42dec0247ae023f4467c37d8db5e615465d5fe Mon Sep 17 00:00:00 2001 From: poiuty Date: Fri, 16 Jun 2023 15:16:25 +0300 Subject: [PATCH] update --- css/statbate.css | 53 +++++++++++++++++++++++++++++++++++------ index.html | 33 ++++++++++++++++++++++++-- js/statbate.js | 62 +++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 131 insertions(+), 17 deletions(-) diff --git a/css/statbate.css b/css/statbate.css index 3ae53df..25f3393 100644 --- a/css/statbate.css +++ b/css/statbate.css @@ -418,12 +418,31 @@ table.dataTable { border-radius: 6px; } +.DonTable > tbody > tr > td, .DonTable > tbody > tr > th, .DonTable > tfoot > tr > td, .DonTable > tfoot > tr > th, .DonTable > thead > tr > td, .DonTable > thead > tr > th { + padding: 0px; + line-height: 1.42857143; + vertical-align: top; + border-top: 0px; +} + +td, th { + text-align: center; +} + +a { + text-decoration: none; + color: black; +} + +.table>:not(:first-child) { + border-top: 0 !important; +} + @media (max-width: 805px) { .promo-block, .dataTables_paginate, .dataTables_info, .dataTables_length, - .income_chart, .content_nav, .header { display: none; @@ -438,14 +457,18 @@ table.dataTable { .content_nav_mobile { display: block; } - .content_center { - flex-direction: column-reverse; - padding-top: 0; - } - .content_wslog, - .content_table { + + .content_wslog { width: 100%; } + .content_table { + width: 75%; + } + + .content_center { + grid-gap: 8px; + padding-top: 0; + } .form-control-sm[type=search] { width: 100% !important; @@ -459,6 +482,22 @@ table.dataTable { } } +@media (max-width: 690px) { + .content_center { + flex-direction: column-reverse; + grid-gap: 12px; + } + .content_table { + width: 100%; + } +} + +@media (max-width: 568px) { + .income_chart { + display: none; + } +} + @media (any-hover: hover) { .promo-block:hover, .footer_social i:hover, diff --git a/index.html b/index.html index 576b34f..88e6722 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ Statbate - + @@ -194,7 +194,7 @@ online 1909 1601 - 51546 + 51759 @@ -235,6 +235,35 @@ + + + + + + + + diff --git a/js/statbate.js b/js/statbate.js index 7fa7f22..30db7c0 100644 --- a/js/statbate.js +++ b/js/statbate.js @@ -1,17 +1,17 @@ var mobile = false; -var income_chart = false; +var income_chart = $('.income_chart').width(); var tables = []; window.addEventListener("resize", function() { + if($('.income_chart').width() != income_chart){ + showStat(); + } if(window.innerWidth > 805){ if(mobile){ mobile = false; $(".icon-menu").removeClass("_active"); $(".header_mobile_nav").hide(); } - if(!income_chart){ - showStat(); - } if(tables["main"]["status"] == "mobile"){ tables["main"]["status"] = "desktop"; tables["main"].page.len(10).draw(); @@ -42,6 +42,53 @@ $('.dropdown-menu').on( 'click', 'a', function() { $(this).closest('.dropdown').find('.dropdown-toggle').html(htmlText); }); +$(document).on("click", "[data-modal-info]", function (e) { + $(this).blur(); + e.preventDefault(); + + var id = $(this).data('modal-id'); + var name = $(this).data('modal-name'); + var type = $(this).data('modal-type'); + + $.post("/public/info.php", {'type': type, 'id': id, 'cam': "chaturbate"}, function(json){ + data = JSON.parse(json); + if (data.table.length != 0) { + $("#donRoomTable tr:first th:first").html(name); + $("#donRoomTable tbody").html(data.table); + $('#donRoomModal').modal('show'); + } + + if (data.amount.length != 0) { + $("#allIncome").html('
'); + $("#allIncome").append("
All time " + type + ": " + data.amount + " USD
"); + } + + if (data.chart.length != 0) { + xx11 = JSON.parse(data.chart); + //if(xx11.length > 28){ + // xx11.pop(); + //} + var xx22 = MG.convert.date(xx11, 'date'); + MG.data_graphic({ + data: xx22, + width: 380, + height: 120, + right: 10, + missing_is_zero: true, + top: 30, + bottom: 0, + left: 40, + target: document.getElementById('modelChart'), + x_accessor: 'date', + y_accessor: 'value', + //color: ['#25639a'], + x_axis: false, + }); + } + + }); +}); + function choose() { if(mobile) { $(".icon-menu").removeClass("_active"); @@ -55,10 +102,10 @@ function choose() { } function showStat() { - if(window.innerWidth < 805){ + if($('.income_chart').css('display') == 'none'){ return; } - income_chart = true; + income_chart = $('.income_chart').width(); var hcData = [[{"date":"2023-04-15","value":611401},{"date":"2023-04-16","value":542622},{"date":"2023-04-17","value":508451},{"date":"2023-04-18","value":448885},{"date":"2023-04-19","value":449757},{"date":"2023-04-20","value":478368},{"date":"2023-04-21","value":556165},{"date":"2023-04-22","value":594264},{"date":"2023-04-23","value":556086},{"date":"2023-04-24","value":472581},{"date":"2023-04-25","value":473237},{"date":"2023-04-26","value":452373},{"date":"2023-04-27","value":498521},{"date":"2023-04-28","value":611532},{"date":"2023-04-29","value":603044},{"date":"2023-04-30","value":585702},{"date":"2023-05-01","value":529474},{"date":"2023-05-02","value":458794},{"date":"2023-05-03","value":501437},{"date":"2023-05-04","value":475846},{"date":"2023-05-05","value":533249},{"date":"2023-05-06","value":555556},{"date":"2023-05-07","value":536512},{"date":"2023-05-08","value":476952},{"date":"2023-05-09","value":473070},{"date":"2023-05-10","value":482595},{"date":"2023-05-11","value":467818},{"date":"2023-05-12","value":547682},{"date":"2023-05-13","value":563308},{"date":"2023-05-14","value":564947},{"date":"2023-05-15","value":511957},{"date":"2023-05-16","value":465036},{"date":"2023-05-17","value":470769},{"date":"2023-05-18","value":487401},{"date":"2023-05-19","value":500960},{"date":"2023-05-20","value":444352},{"date":"2023-05-21","value":566856},{"date":"2023-05-22","value":479135},{"date":"2023-05-23","value":455659},{"date":"2023-05-24","value":441327},{"date":"2023-05-25","value":454033},{"date":"2023-05-26","value":490206},{"date":"2023-05-27","value":514307},{"date":"2023-05-28","value":508170},{"date":"2023-05-29","value":513296},{"date":"2023-05-30","value":476432},{"date":"2023-05-31","value":586540},{"date":"2023-06-01","value":578479},{"date":"2023-06-02","value":628258},{"date":"2023-06-03","value":716208},{"date":"2023-06-04","value":695595},{"date":"2023-06-05","value":521118},{"date":"2023-06-06","value":524064},{"date":"2023-06-07","value":538274},{"date":"2023-06-08","value":571806},{"date":"2023-06-09","value":589876},{"date":"2023-06-10","value":654360},{"date":"2023-06-11","value":669770},{"date":"2023-06-12","value":568407},{"date":"2023-06-13","value":538083},{"date":"2023-06-14","value":240397}],[{"date":"2023-04-15","value":825870},{"date":"2023-04-16","value":752896},{"date":"2023-04-17","value":677303},{"date":"2023-04-18","value":602592},{"date":"2023-04-19","value":608448},{"date":"2023-04-20","value":636208},{"date":"2023-04-21","value":732764},{"date":"2023-04-22","value":794373},{"date":"2023-04-23","value":763830},{"date":"2023-04-24","value":627110},{"date":"2023-04-25","value":627214},{"date":"2023-04-26","value":597290},{"date":"2023-04-27","value":663497},{"date":"2023-04-28","value":792787},{"date":"2023-04-29","value":803355},{"date":"2023-04-30","value":798347},{"date":"2023-05-01","value":712626},{"date":"2023-05-02","value":612538},{"date":"2023-05-03","value":651328},{"date":"2023-05-04","value":628044},{"date":"2023-05-05","value":704011},{"date":"2023-05-06","value":744721},{"date":"2023-05-07","value":723472},{"date":"2023-05-08","value":642650},{"date":"2023-05-09","value":622403},{"date":"2023-05-10","value":630316},{"date":"2023-05-11","value":623568},{"date":"2023-05-12","value":707595},{"date":"2023-05-13","value":768155},{"date":"2023-05-14","value":747945},{"date":"2023-05-15","value":675697},{"date":"2023-05-16","value":612555},{"date":"2023-05-17","value":614103},{"date":"2023-05-18","value":639054},{"date":"2023-05-19","value":651719},{"date":"2023-05-20","value":600948},{"date":"2023-05-21","value":753067},{"date":"2023-05-22","value":634702},{"date":"2023-05-23","value":600097},{"date":"2023-05-24","value":588924},{"date":"2023-05-25","value":613074},{"date":"2023-05-26","value":637395},{"date":"2023-05-27","value":684562},{"date":"2023-05-28","value":673938},{"date":"2023-05-29","value":681694},{"date":"2023-05-30","value":638914},{"date":"2023-05-31","value":770956},{"date":"2023-06-01","value":775108},{"date":"2023-06-02","value":842605},{"date":"2023-06-03","value":969958},{"date":"2023-06-04","value":945070},{"date":"2023-06-05","value":701636},{"date":"2023-06-06","value":705509},{"date":"2023-06-07","value":724719},{"date":"2023-06-08","value":764781},{"date":"2023-06-09","value":797942},{"date":"2023-06-10","value":884101},{"date":"2023-06-11","value":913266},{"date":"2023-06-12","value":765003},{"date":"2023-06-13","value":726132},{"date":"2023-06-14","value":319781}],[{"date":"2023-04-15","value":214469},{"date":"2023-04-16","value":210274},{"date":"2023-04-17","value":168852},{"date":"2023-04-18","value":153707},{"date":"2023-04-19","value":158691},{"date":"2023-04-20","value":157840},{"date":"2023-04-21","value":176599},{"date":"2023-04-22","value":200109},{"date":"2023-04-23","value":207744},{"date":"2023-04-24","value":154529},{"date":"2023-04-25","value":153977},{"date":"2023-04-26","value":144917},{"date":"2023-04-27","value":164976},{"date":"2023-04-28","value":181255},{"date":"2023-04-29","value":200311},{"date":"2023-04-30","value":212645},{"date":"2023-05-01","value":183152},{"date":"2023-05-02","value":153744},{"date":"2023-05-03","value":149891},{"date":"2023-05-04","value":152198},{"date":"2023-05-05","value":170762},{"date":"2023-05-06","value":189165},{"date":"2023-05-07","value":186960},{"date":"2023-05-08","value":165698},{"date":"2023-05-09","value":149333},{"date":"2023-05-10","value":147721},{"date":"2023-05-11","value":155750},{"date":"2023-05-12","value":159913},{"date":"2023-05-13","value":204847},{"date":"2023-05-14","value":182998},{"date":"2023-05-15","value":163740},{"date":"2023-05-16","value":147519},{"date":"2023-05-17","value":143334},{"date":"2023-05-18","value":151653},{"date":"2023-05-19","value":150759},{"date":"2023-05-20","value":156596},{"date":"2023-05-21","value":186211},{"date":"2023-05-22","value":155567},{"date":"2023-05-23","value":144438},{"date":"2023-05-24","value":147597},{"date":"2023-05-25","value":159041},{"date":"2023-05-26","value":147189},{"date":"2023-05-27","value":170255},{"date":"2023-05-28","value":165768},{"date":"2023-05-29","value":168398},{"date":"2023-05-30","value":162482},{"date":"2023-05-31","value":184416},{"date":"2023-06-01","value":196629},{"date":"2023-06-02","value":214347},{"date":"2023-06-03","value":253750},{"date":"2023-06-04","value":249475},{"date":"2023-06-05","value":180518},{"date":"2023-06-06","value":181445},{"date":"2023-06-07","value":186445},{"date":"2023-06-08","value":192975},{"date":"2023-06-09","value":208066},{"date":"2023-06-10","value":229741},{"date":"2023-06-11","value":243496},{"date":"2023-06-12","value":196596},{"date":"2023-06-13","value":188049},{"date":"2023-06-14","value":79384}]]; var data = []; for (var i = 0; i < hcData.length; i++) { @@ -93,8 +140,7 @@ function printWsText(text) { time = date.getUTCHours() + ":" + xMin + ":" + xSec; message = text; - - if(window.innerWidth > 805){ + if($('.wstext').width() > 450){ message = '[' + time + '] ' + message; }