mirror of
https://github.com/aaru-dps/Aaru.Server.git
synced 2025-12-16 19:24:27 +00:00
Rename miscellaneous places.
This commit is contained in:
@@ -93,5 +93,5 @@
|
|||||||
<br />
|
<br />
|
||||||
<a asp-action="Index" asp-controller="UsbVendors">USB vendors</a>
|
<a asp-action="Index" asp-controller="UsbVendors">USB vendors</a>
|
||||||
<br />
|
<br />
|
||||||
<a asp-action="Index" asp-controller="Versions">DiscImageChef versions used</a>
|
<a asp-action="Index" asp-controller="Versions">Aaru versions used</a>
|
||||||
<br/>
|
<br/>
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<header>
|
<header>
|
||||||
Welcome to
|
Welcome to
|
||||||
<i>
|
<i>
|
||||||
<a href="http://github.com/claunia/discimagechef" target="_blank">
|
<a href="http://github.com/aaru-dps/aaru" target="_blank">
|
||||||
DiscImageChef
|
DiscImageChef
|
||||||
</a>
|
</a>
|
||||||
</i> Server Administrative Area
|
</i> Server Administrative Area
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
// Copyright © 2011-2020 Natalia Portillo
|
// Copyright © 2011-2020 Natalia Portillo
|
||||||
// ****************************************************************************/
|
// ****************************************************************************/
|
||||||
}
|
}
|
||||||
<h4>DiscImageChef versions</h4>
|
<h4>Aaru versions</h4>
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ namespace Aaru.Server.Controllers
|
|||||||
|
|
||||||
public UpdateController(DicServerContext ctx) => _ctx = ctx;
|
public UpdateController(DicServerContext ctx) => _ctx = ctx;
|
||||||
|
|
||||||
/// <summary>Receives a report from DiscImageChef.Core, verifies it's in the correct format and stores it on the server</summary>
|
/// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
|
||||||
/// <returns>HTTP response</returns>
|
/// <returns>HTTP response</returns>
|
||||||
[Route("api/update"), HttpGet]
|
[Route("api/update"), HttpGet]
|
||||||
public ActionResult Update(long timestamp)
|
public ActionResult Update(long timestamp)
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ namespace Aaru.Server.Controllers
|
|||||||
_ctx = ctx;
|
_ctx = ctx;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Receives a report from DiscImageChef.Core, verifies it's in the correct format and stores it on the server</summary>
|
/// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
|
||||||
/// <returns>HTTP response</returns>
|
/// <returns>HTTP response</returns>
|
||||||
[Route("api/uploadreport"), HttpPost]
|
[Route("api/uploadreport"), HttpPost]
|
||||||
public async Task<IActionResult> UploadReport()
|
public async Task<IActionResult> UploadReport()
|
||||||
@@ -235,7 +235,7 @@ namespace Aaru.Server.Controllers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Receives a report from DiscImageChef.Core, verifies it's in the correct format and stores it on the server</summary>
|
/// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
|
||||||
/// <returns>HTTP response</returns>
|
/// <returns>HTTP response</returns>
|
||||||
[Route("api/uploadreportv2"), HttpPost]
|
[Route("api/uploadreportv2"), HttpPost]
|
||||||
public async Task<IActionResult> UploadReportV2()
|
public async Task<IActionResult> UploadReportV2()
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ namespace Aaru.Server.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Receives statistics from DiscImageChef.Core, processes them and adds them to a server-side global statistics
|
/// Receives statistics from Aaru.Core, processes them and adds them to a server-side global statistics
|
||||||
/// XML
|
/// XML
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>HTTP response</returns>
|
/// <returns>HTTP response</returns>
|
||||||
@@ -108,7 +108,7 @@ namespace Aaru.Server.Controllers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Receives a report from DiscImageChef.Core, verifies it's in the correct format and stores it on the server</summary>
|
/// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
|
||||||
/// <returns>HTTP response</returns>
|
/// <returns>HTTP response</returns>
|
||||||
[Route("api/uploadstatsv2"), HttpPost]
|
[Route("api/uploadstatsv2"), HttpPost]
|
||||||
public async Task<IActionResult> UploadStatsV2()
|
public async Task<IActionResult> UploadStatsV2()
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"DiscImageChef.Server": {
|
"Aaru.Server": {
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
"applicationUrl": "http://localhost:5000",
|
"applicationUrl": "http://localhost:5000",
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ namespace Aaru.Server
|
|||||||
|
|
||||||
app.Map("/metrics", metricsApp =>
|
app.Map("/metrics", metricsApp =>
|
||||||
{
|
{
|
||||||
metricsApp.UseMiddleware<BasicAuthMiddleware>("DiscImageChef");
|
metricsApp.UseMiddleware<BasicAuthMiddleware>("Aaru");
|
||||||
|
|
||||||
// We already specified URL prefix in .Map() above, no need to specify it again here.
|
// We already specified URL prefix in .Map() above, no need to specify it again here.
|
||||||
metricsApp.UseMetricServer("");
|
metricsApp.UseMetricServer("");
|
||||||
|
|||||||
@@ -37,6 +37,6 @@
|
|||||||
}
|
}
|
||||||
<p>
|
<p>
|
||||||
@Html.ActionLink("Return to main page.", "Index")<br />
|
@Html.ActionLink("Return to main page.", "Index")<br />
|
||||||
DiscImageChef's code of conduct:
|
Aaru's code of conduct:
|
||||||
</p>
|
</p>
|
||||||
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
||||||
@@ -37,6 +37,6 @@
|
|||||||
}
|
}
|
||||||
<p>
|
<p>
|
||||||
@Html.ActionLink("Return to main page.", "Index")<br />
|
@Html.ActionLink("Return to main page.", "Index")<br />
|
||||||
DiscImageChef list of changes:
|
Aaru list of changes:
|
||||||
</p>
|
</p>
|
||||||
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
||||||
@@ -38,8 +38,8 @@
|
|||||||
<header>
|
<header>
|
||||||
Welcome to
|
Welcome to
|
||||||
<i>
|
<i>
|
||||||
<a href="http://github.com/claunia/discimagechef" target="_blank">
|
<a href="http://github.com/aaru-dps/aaru" target="_blank">
|
||||||
DiscImageChef
|
Aaru
|
||||||
</a>
|
</a>
|
||||||
</i> Server version @ViewBag.lblVersion
|
</i> Server version @ViewBag.lblVersion
|
||||||
</header>
|
</header>
|
||||||
|
|||||||
@@ -37,6 +37,6 @@
|
|||||||
}
|
}
|
||||||
<p>
|
<p>
|
||||||
@Html.ActionLink("Return to main page.", "Index")<br />
|
@Html.ActionLink("Return to main page.", "Index")<br />
|
||||||
DiscImageChef list of hardware and software needed:
|
Aaru list of hardware and software needed:
|
||||||
</p>
|
</p>
|
||||||
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
||||||
@@ -37,6 +37,6 @@
|
|||||||
}
|
}
|
||||||
<p>
|
<p>
|
||||||
@Html.ActionLink("Return to main page.", "Index")<br />
|
@Html.ActionLink("Return to main page.", "Index")<br />
|
||||||
DiscImageChef's template for pull requests:
|
Aaru's template for pull requests:
|
||||||
</p>
|
</p>
|
||||||
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
||||||
@@ -37,6 +37,6 @@
|
|||||||
}
|
}
|
||||||
<p>
|
<p>
|
||||||
@Html.ActionLink("Return to main page.", "Index")<br />
|
@Html.ActionLink("Return to main page.", "Index")<br />
|
||||||
DiscImageChef list of things to do:
|
Aaru list of things to do:
|
||||||
</p>
|
</p>
|
||||||
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
<div class="container">@Html.Raw(ViewBag.Markdown)</div>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
@using Aaru.CommonTypes.Metadata
|
@using Aaru.CommonTypes.Metadata
|
||||||
@{
|
@{
|
||||||
Layout = "~/Views/Shared/_Layout.cshtml";
|
Layout = "~/Views/Shared/_Layout.cshtml";
|
||||||
ViewBag.Title = "DiscImageChef Device Report";
|
ViewBag.Title = "Aaru Device Report";
|
||||||
}
|
}
|
||||||
@{
|
@{
|
||||||
// /***************************************************************************
|
// /***************************************************************************
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
// ****************************************************************************/
|
// ****************************************************************************/
|
||||||
}
|
}
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
DiscImageChef Report for
|
Aaru Report for
|
||||||
@ViewBag.lblManufacturer
|
@ViewBag.lblManufacturer
|
||||||
@ViewBag.lblModel
|
@ViewBag.lblModel
|
||||||
@ViewBag.lblRevision
|
@ViewBag.lblRevision
|
||||||
|
|||||||
@@ -33,14 +33,14 @@
|
|||||||
// ****************************************************************************/
|
// ****************************************************************************/
|
||||||
}
|
}
|
||||||
@{
|
@{
|
||||||
ViewBag.Title = "DiscImageChef Statistics";
|
ViewBag.Title = "Aaru Statistics";
|
||||||
Layout = "~/Views/Shared/_Layout.cshtml";
|
Layout = "~/Views/Shared/_Layout.cshtml";
|
||||||
}
|
}
|
||||||
<header>
|
<header>
|
||||||
Welcome to
|
Welcome to
|
||||||
<i>
|
<i>
|
||||||
<a href="http://github.com/claunia/discimagechef" target="_blank">
|
<a href="http://github.com/aaru-dps/aaru" target="_blank">
|
||||||
DiscImageChef
|
Aaru
|
||||||
</a>
|
</a>
|
||||||
</i> Server version @ViewBag.Version
|
</i> Server version @ViewBag.Version
|
||||||
</header>
|
</header>
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
<div class="card-header" id="osHeading">
|
<div class="card-header" id="osHeading">
|
||||||
<h2 class="mb-0">
|
<h2 class="mb-0">
|
||||||
<button aria-controls="osCollapse" aria-expanded="true" class="btn btn-link card-button collapsed" data-target="#osCollapse" data-toggle="collapse" type="button">
|
<button aria-controls="osCollapse" aria-expanded="true" class="btn btn-link card-button collapsed" data-target="#osCollapse" data-toggle="collapse" type="button">
|
||||||
All operating systems DiscImageChef has run on...
|
All operating systems Aaru has run on...
|
||||||
</button>
|
</button>
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
{
|
{
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-left">
|
<td class="text-left">
|
||||||
DiscImageChef has run on
|
Aaru has run on
|
||||||
<i class="table-dark-em">@os.name</i> @os.Value times.
|
<i class="table-dark-em">@os.name</i> @os.Value times.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
<div class="card-header" id="versionsHeading">
|
<div class="card-header" id="versionsHeading">
|
||||||
<h2 class="mb-0">
|
<h2 class="mb-0">
|
||||||
<button aria-controls="versionsCollapse" aria-expanded="true" class="btn btn-link card-button collapsed" data-target="#versionsCollapse" data-toggle="collapse" type="button">
|
<button aria-controls="versionsCollapse" aria-expanded="true" class="btn btn-link card-button collapsed" data-target="#versionsCollapse" data-toggle="collapse" type="button">
|
||||||
All DiscImageChef versions...
|
All Aaru versions...
|
||||||
</button>
|
</button>
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
{
|
{
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-left">
|
<td class="text-left">
|
||||||
DiscImageChef version
|
Aaru version
|
||||||
<i class="table-dark-em">@version.name</i> has been used @version.Value times.
|
<i class="table-dark-em">@version.name</i> has been used @version.Value times.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -159,7 +159,7 @@
|
|||||||
<div class="card-header" id="commandsHeading">
|
<div class="card-header" id="commandsHeading">
|
||||||
<h2 class="mb-0">
|
<h2 class="mb-0">
|
||||||
<button aria-controls="commandsCollapse" aria-expanded="true" class="btn btn-link card-button collapsed" data-target="#commandsCollapse" data-toggle="collapse" type="button">
|
<button aria-controls="commandsCollapse" aria-expanded="true" class="btn btn-link card-button collapsed" data-target="#commandsCollapse" data-toggle="collapse" type="button">
|
||||||
All DiscImageChef commands...
|
All Aaru commands...
|
||||||
</button>
|
</button>
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
2
Aaru.Server/package-lock.json
generated
2
Aaru.Server/package-lock.json
generated
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "DiscImageChef.Server",
|
"name": "Aaru.Server",
|
||||||
"version": "4.5.99.1663",
|
"version": "4.5.99.1663",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "DiscImageChef.Server",
|
"name": "Aaru.Server",
|
||||||
"version": "4.5.99.1663",
|
"version": "4.5.99.1663",
|
||||||
"description": "Server component for Aaru Data Preservation Suite",
|
"description": "Server component for Aaru Data Preservation Suite",
|
||||||
"private": true,
|
"private": true,
|
||||||
"author": "Natalia Portillo <claunia@claunia.com>",
|
"author": "Natalia Portillo <claunia@claunia.com>",
|
||||||
"homepage": "https://discimagechef.app",
|
"homepage": "https://www.aaru.app",
|
||||||
"license": "LGPL",
|
"license": "LGPL",
|
||||||
"repository": "github:discimagechef/DiscImageChef.Server",
|
"repository": "github:aaru-dps/Aaru.Server",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bootstrap": "^4.3.1"
|
"bootstrap": "^4.3.1"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user