mirror of
https://github.com/claunia/marechai.git
synced 2025-12-16 19:14:25 +00:00
Move licenses admin index to Blazor.
This commit is contained in:
@@ -42,8 +42,6 @@
|
|||||||
<br />
|
<br />
|
||||||
<a asp-controller="InstructionSetExtensionsByProcessor">Instruction set extensions by processor</a>
|
<a asp-controller="InstructionSetExtensionsByProcessor">Instruction set extensions by processor</a>
|
||||||
<br />
|
<br />
|
||||||
<a asp-controller="Licenses">Licenses</a>
|
|
||||||
<br />
|
|
||||||
<a asp-controller="MachineFamilies">Machine families</a>
|
<a asp-controller="MachineFamilies">Machine families</a>
|
||||||
<br />
|
<br />
|
||||||
<a asp-controller="Machines">Machines</a>
|
<a asp-controller="Machines">Machines</a>
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
@model IEnumerable<Marechai.Database.Models.License>
|
|
||||||
|
|
||||||
@{
|
|
||||||
ViewData["Title"] = "Index";
|
|
||||||
}
|
|
||||||
<h1>Licenses</h1>
|
|
||||||
<p>
|
|
||||||
<a asp-action="Create" class="btn btn-primary">
|
|
||||||
Create new
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
<table class="table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>
|
|
||||||
@Html.DisplayNameFor(model => model.Name)
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
@Html.DisplayNameFor(model => model.SPDX)
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
@Html.DisplayNameFor(model => model.FsfApproved)
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
@Html.DisplayNameFor(model => model.OsiApproved)
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
@Html.DisplayNameFor(model => model.Link)
|
|
||||||
</th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach (var item in Model)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
@Html.DisplayFor(modelItem => item.Name)
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
@Html.DisplayFor(modelItem => item.SPDX)
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
@Html.DisplayFor(modelItem => item.FsfApproved)
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
@Html.DisplayFor(modelItem => item.OsiApproved)
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
@if (item.Link != null)
|
|
||||||
{
|
|
||||||
<a href="@item.Link" target="_blank">
|
|
||||||
Link
|
|
||||||
</a>
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">
|
|
||||||
Details
|
|
||||||
</a>
|
|
||||||
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">
|
|
||||||
Edit
|
|
||||||
</a>
|
|
||||||
<a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">
|
|
||||||
Delete
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||||
<Version>3.0.99.1056</Version>
|
<Version>3.0.99.1057</Version>
|
||||||
<Company>Canary Islands Computer Museum</Company>
|
<Company>Canary Islands Computer Museum</Company>
|
||||||
<Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
|
<Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
|
||||||
<Product>Canary Islands Computer Museum Website</Product>
|
<Product>Canary Islands Computer Museum Website</Product>
|
||||||
@@ -58,6 +58,9 @@
|
|||||||
<Content Update="Pages\Admin\InstructionSets.razor">
|
<Content Update="Pages\Admin\InstructionSets.razor">
|
||||||
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
|
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Update="Pages\Admin\Licenses.razor">
|
||||||
|
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
|
||||||
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<_ContentIncludedByDefault Remove="Areas\Admin\Views\BrowserTests\Delete.cshtml" />
|
<_ContentIncludedByDefault Remove="Areas\Admin\Views\BrowserTests\Delete.cshtml" />
|
||||||
|
|||||||
@@ -56,6 +56,9 @@
|
|||||||
<li>
|
<li>
|
||||||
<a href="/admin/instruction_set_extensions">@L["Instruction set extensions"]</a>
|
<a href="/admin/instruction_set_extensions">@L["Instruction set extensions"]</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="/admin/licenses">@L["Licenses"]</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
|
|||||||
119
Marechai/Pages/Admin/Licenses.razor
Normal file
119
Marechai/Pages/Admin/Licenses.razor
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
@{
|
||||||
|
/******************************************************************************
|
||||||
|
// MARECHAI: Master repository of computing history artifacts information
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
//
|
||||||
|
// Filename : Licenses.razor
|
||||||
|
// Author(s) : Natalia Portillo <claunia@claunia.com>
|
||||||
|
//
|
||||||
|
// --[ Description ] ----------------------------------------------------------
|
||||||
|
//
|
||||||
|
// List of licenses
|
||||||
|
//
|
||||||
|
// --[ License ] --------------------------------------------------------------
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as
|
||||||
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
|
// License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
//
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// Copyright © 2003-2020 Natalia Portillo
|
||||||
|
*******************************************************************************/
|
||||||
|
}
|
||||||
|
|
||||||
|
@page "/admin/licenses"
|
||||||
|
@using Marechai.Database.Models
|
||||||
|
@inherits OwningComponentBase<LicensesService>
|
||||||
|
@inject IStringLocalizer<LicensesService> L
|
||||||
|
@attribute [Authorize(Roles = "UberAdmin, Admin")]
|
||||||
|
<h3>@L["Licenses"]</h3>
|
||||||
|
@if (_licenses is null)
|
||||||
|
{
|
||||||
|
<p>@L["Loading..."]</p>
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
<p>
|
||||||
|
<span class="btn btn-primary">
|
||||||
|
@L["Create new"]
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
<table class="table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>
|
||||||
|
@L["Name"]
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
@L["SPDX"]
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
@L["Approved by FSF"]
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
@L["Approved by OSI"]
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
@L["Link"]
|
||||||
|
</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@foreach (var item in _licenses)
|
||||||
|
{
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
@item.Name
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
@item.SPDX
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
@item.FsfApproved
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
@item.OsiApproved
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
@if (item.Link != null)
|
||||||
|
{
|
||||||
|
<a href="@item.Link" target="_blank">
|
||||||
|
@L["Link"]
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<span class="btn btn-primary">
|
||||||
|
@L["Details"]
|
||||||
|
</span>
|
||||||
|
<span class="btn btn-secondary">
|
||||||
|
@L["Edit"]
|
||||||
|
</span>
|
||||||
|
<span class="btn btn-danger">
|
||||||
|
@L["Delete"]
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
@code
|
||||||
|
{
|
||||||
|
List<License> _licenses;
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
_licenses = await Service.GetAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -174,4 +174,8 @@
|
|||||||
<value>Arquitecturas</value>
|
<value>Arquitecturas</value>
|
||||||
<comment>Instruction sets.</comment>
|
<comment>Instruction sets.</comment>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Licenses" xml:space="preserve">
|
||||||
|
<value>Licencias</value>
|
||||||
|
<comment>Licenses.</comment>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
165
Marechai/Resources/Services/LicensesService.es.resx
Normal file
165
Marechai/Resources/Services/LicensesService.es.resx
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- ReSharper disable MarkupTextTypo -->
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<data name="Licenses" xml:space="preserve">
|
||||||
|
<value>Licencias</value>
|
||||||
|
<comment>Licenses</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Loading..." xml:space="preserve">
|
||||||
|
<value>Cargando...</value>
|
||||||
|
<comment>Message that appears while data is being loaded from database</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Name" xml:space="preserve">
|
||||||
|
<value>Nombre</value>
|
||||||
|
<comment>Name</comment>
|
||||||
|
</data>
|
||||||
|
<data name="SPDX" xml:space="preserve">
|
||||||
|
<value>SPDX</value>
|
||||||
|
<comment>SPDX</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Approved by FSF" xml:space="preserve">
|
||||||
|
<value>Aprobada por la FSF</value>
|
||||||
|
<comment>Approved by FSF</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Approved by OSI" xml:space="preserve">
|
||||||
|
<value>Aprobada por la OSI</value>
|
||||||
|
<comment>Approved by OSI</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Link" xml:space="preserve">
|
||||||
|
<value>Enlace</value>
|
||||||
|
<comment>Link</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Create new" xml:space="preserve">
|
||||||
|
<value>Crear nueva</value>
|
||||||
|
<comment>Create new</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Details" xml:space="preserve">
|
||||||
|
<value>Detalles</value>
|
||||||
|
<comment>Details</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Edit" xml:space="preserve">
|
||||||
|
<value>Editar</value>
|
||||||
|
<comment>Edit</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Delete" xml:space="preserve">
|
||||||
|
<value>Eliminar</value>
|
||||||
|
<comment>Delete</comment>
|
||||||
|
</data>
|
||||||
|
</root>
|
||||||
18
Marechai/Services/LicensesService.cs
Normal file
18
Marechai/Services/LicensesService.cs
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Marechai.Database.Models;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace Marechai.Services
|
||||||
|
{
|
||||||
|
public class LicensesService
|
||||||
|
{
|
||||||
|
readonly MarechaiContext _context;
|
||||||
|
|
||||||
|
public LicensesService(MarechaiContext context) => _context = context;
|
||||||
|
|
||||||
|
public async Task<List<License>> GetAsync() =>
|
||||||
|
await _context.Licenses.OrderBy(l => l.Name).Select(l => new License(){FsfApproved = l.FsfApproved, Id= l.Id, Link = l.Link, Name = l.Name, OsiApproved = l.OsiApproved, SPDX = l.SPDX}).ToListAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -53,6 +53,7 @@ namespace Marechai.Services
|
|||||||
services.AddScoped<GpusService>();
|
services.AddScoped<GpusService>();
|
||||||
services.AddScoped<InstructionSetExtensionsService>();
|
services.AddScoped<InstructionSetExtensionsService>();
|
||||||
services.AddScoped<InstructionSetsService>();
|
services.AddScoped<InstructionSetsService>();
|
||||||
|
services.AddScoped<LicensesService>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user