main
EonaCat 2 months ago
parent 0697318d13
commit 4e89724646

@ -6,9 +6,9 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v7.0": {
"EonaCat.Blocky/3.3.5": {
"EonaCat.Blocky/3.3.6": {
"dependencies": {
"EonaCat.Dns": "3.3.5",
"EonaCat.Dns": "3.3.6",
"EonaCat.Logger": "1.0.9",
"Microsoft.AspNet.SignalR": "2.4.3",
"System.IO": "4.3.0"
@ -598,7 +598,7 @@
}
}
},
"EonaCat.Dns/3.3.5": {
"EonaCat.Dns/3.3.6": {
"dependencies": {
"EonaCat.Cache.Memory": "1.0.1",
"EonaCat.Controls": "1.0.2",
@ -617,7 +617,7 @@
}
},
"libraries": {
"EonaCat.Blocky/3.3.5": {
"EonaCat.Blocky/3.3.6": {
"type": "project",
"serviceable": false,
"sha512": ""
@ -1014,7 +1014,7 @@
"path": "system.windows.extensions/7.0.0",
"hashPath": "system.windows.extensions.7.0.0.nupkg.sha512"
},
"EonaCat.Dns/3.3.5": {
"EonaCat.Dns/3.3.6": {
"type": "project",
"serviceable": false,
"sha512": ""

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -6,7 +6,6 @@
<tr>
<th>Id</th>
<th>Name</th>
<th>Url</th>
<th>Enabled</th>
<th>Last result</th>
<th>Last updated</th>
@ -37,7 +36,6 @@
columns: [
{ 'data': 'Id' },
{ 'data': 'Name' },
{ 'data': 'Url' },
{ 'data': 'IsEnabled' },
{ 'data': 'LastResult' },
{ 'data': 'LastUpdated' },

@ -66,7 +66,7 @@
var route = '@Url.Action("GetById", "Category")?id=' + id;
$('#partial').load(route);
});
$('.addCategory').on("click", function () {
var route = '@Url.Action("GetById", "Category")?id=0';
$('#partial').load(route);

@ -65,12 +65,12 @@ limitations under the License
if (Model.IsLoggedIn)
{
<ul class="nav nav-tabs">
<li id="board" class="nav-item">
<li id="board" class="nav-item">
<a href="#switchDashboardButton" class="active" data-bs-toggle="tab" onclick="return showDashboard();">Dashboard</a>
</li>
<li id="board" class="nav-item">
</li>
<li id="board" class="nav-item">
<a href="#switchInfoButton" class="active" data-bs-toggle="tab" onclick="return showInfo();">Info</a>
</li>
</li>
</ul>
<div id="divInfo" style="display: none;">
@ -192,53 +192,96 @@ limitations under the License
}
}
</div>
<div class="statsMenu row">
<div class="col-md-3 stats-item total-queries">
<div class="number" id="totalQueriesStats">100</div>
<div class="percentage" id="totalQueriesStatsPercentage">0%</div>
<div class="title">Total Queries</div>
</div>
<div class="col-md-3 stats-item no-error">
<div class="number" id="totalNoErrorStats">100</div>
<div class="percentage" id="totalNoErrorStatsPercentage">0%</div>
<div class="title">No Error</div>
</div>
<div class="col-md-3 stats-item cached">
<div class="number" id="totalCachedStats">100</div>
<div class="percentage" id="totalCachedStatsPercentage">0%</div>
<div class="title">Cached</div>
</div>
<div class="col-md-3 stats-item server-failure">
<div class="number" id="totalServerFailuresStats">100</div>
<div class="percentage" id="totalServerFailuresStatsPercentage">0%</div>
<div class="title">Server Failure</div>
</div>
<div class="col-md-3 stats-item name-error">
<div class="number" id="totalNameErrorsStats">100</div>
<div class="percentage" id="totalNameErrorsStatsPercentage">0%</div>
<div class="title">Name Error</div>
</div>
<div class="col-md-3 stats-item refused">
<div class="number" id="totalRefusedStats">100</div>
<div class="percentage" id="totalRefusedStatsPercentage">0%</div>
<div class="title">Refused</div>
</div>
<div class="col-md-3 stats-item blocked">
<div class="number" id="totalBlockedStats">100</div>
<div class="percentage" id="totalBlockedStatsPercentage">0%</div>
<div class="title">Blocked</div>
</div>
<div class="col-md-3 stats-item clients">
<div class="number" id="totalClientsStats">100</div>
<div class="percentage">&nbsp;</div>
<div class="title">Clients</div>
<div class="container">
<div class="row statsMenu">
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card total-queries" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">Total Queries:</h5>
<div id="totalQueriesStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalQueriesStats" class="number">100</div>
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card no-error" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">No Error:</h5>
<div id="totalNoErrorStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalNoErrorStats" class="number">100</div>
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card cached" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">Cached:</h5>
<div id="totalCachedStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalCachedStats" class="number">100</div>
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card server-failure" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">Server Failure:</h5>
<div id="totalServerFailuresStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalServerFailuresStats" class="number">100</div>
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card name-error" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">Name Error:</h5>
<div id="totalNameErrorsStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalNameErrorsStats" class="number">100</div>
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card refused" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">Refused:</h5>
<div id="totalRefusedStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalRefusedStats" class="number">100</div>
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card blocked" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">Blocked:</h5>
<div id="totalBlockedStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalBlockedStats" class="number">100</div>
</p>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 stats-item mb-4">
<div class="card clients" style="width: 100%;">
<div class="card-body">
<h5 class="card-title title">Clients:</h5>
<div id="totalClientsStatsPercentage" class="card-subtitle percentage">0%</div>
<p class="card-text">
<div id="totalClientsStats" class="number">100</div>
</p>
</div>
</div>
</div>
</div>
</div>
<canvas id="stats" style="height:200px"></canvas>

@ -14,10 +14,18 @@
</button>
}
@using (Html.BeginForm("UpdateBlockySetup", "Domain"))
{
<label>&nbsp;</label>
<button type="submit" title="Update blocky setup" class="btn btn-primary btn-sm" style="float: right; margin-right: 5px" onclick="return confirm('Are you sure you want to update the blockList with the the URL from the blocky setup? (this will download the newest blocky setup from the internet)')">
<i class="fas fa-undo"></i>
</button>
}
@using (Html.BeginForm("UpdateBlockList", "Domain"))
{
<label>&nbsp;</label>
<button type="submit" title="Update blocklist" class="editCategory btn btn-warning btn-sm" style="float: right; margin-right: 5px" onclick="return confirm('Are you sure you want to update blockList with the URLs specified in the database? (this will download new entries from the internet)')">
<button type="submit" title="Update blocklist" class="btn btn-warning btn-sm" style="float: right; margin-right: 5px" onclick="return confirm('Are you sure you want to update blockList with the URLs specified in the database? (this will download new entries from the internet)')">
<i class="fas fa-undo"></i>
</button>
}

@ -189,6 +189,19 @@ a {
max-width: 100%;
}
.card {
background: #222;
border: 1px solid #dd2476;
color: rgba(250, 250, 250, 0.8);
margin-bottom: 2rem;
}
.center {
justify-content: center;
text-align: -webkit-center;
display: grid;
}
.center-iframe {
display: block;
margin-left: auto;

@ -24,13 +24,17 @@ a {
color: #8ebf42;
}
.center {
justify-content: center;
text-align: -webkit-center;
display: grid;
}
.card {
width: 20%;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
border-radius: 50px;
text-align: center;
margin: 0 auto;
background: #222;
border: 1px solid #dd2476;
color: rgba(250, 250, 250, 0.8);
margin-bottom: 2rem;
}
.total {

Loading…
Cancel
Save