paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Paul Schneider
2023-04-02 14:53:31 +01:00
parent 02d80795ca
commit 908d461552
12 changed files with 28 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Create.cshtml
View File

@ -9,14 +9,14 @@
else if (Model.IsLayoutPageSelected) else if (Model.IsLayoutPageSelected)
{ {
@:@@{ @:@@{
@:ViewData["Title"] = @@Model.ViewName"]; @:ViewData["Title"] = @@Model.ViewName;
if (!string.IsNullOrEmpty(Model.LayoutPageFile)) if (!string.IsNullOrEmpty(Model.LayoutPageFile))
{ {
@:Layout = "@Model.LayoutPageFile"; @:Layout = "@Model.LayoutPageFile";
} }
@:} @:}
@: @:
@:<h2>@@Model.ViewName"]</h2> @:<h2>@@Model.ViewName</h2>
@: @:
} }
else else

4
scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Delete.cshtml
View File

@ -9,14 +9,14 @@
else if (Model.IsLayoutPageSelected) else if (Model.IsLayoutPageSelected)
{ {
@:@@{ @:@@{
@:ViewData["Title"] = @@Model.ViewName"]; @:ViewData["Title"] = @@Model.ViewName;
if (!string.IsNullOrEmpty(Model.LayoutPageFile)) if (!string.IsNullOrEmpty(Model.LayoutPageFile))
{ {
@:Layout = "@Model.LayoutPageFile"; @:Layout = "@Model.LayoutPageFile";
} }
@:} @:}
@: @:
@:<h2>@@Model.ViewName"]</h2> @:<h2>@@Model.ViewName</h2>
@: @:
} }
else else

4
scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Details.cshtml
View File

@ -9,14 +9,14 @@
else if (Model.IsLayoutPageSelected) else if (Model.IsLayoutPageSelected)
{ {
@:@@{ @:@@{
@:ViewData["Title"] = @@Model.ViewName"]; @:ViewData["Title"] = @@Model.ViewName;
if (!string.IsNullOrEmpty(Model.LayoutPageFile)) if (!string.IsNullOrEmpty(Model.LayoutPageFile))
{ {
@:Layout = "@Model.LayoutPageFile"; @:Layout = "@Model.LayoutPageFile";
} }
@:} @:}
@: @:
@:<h2>@@Model.ViewName"]</h2> @:<h2>@@Model.ViewName</h2>
@: @:
} }
else else

6
scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Edit.cshtml
View File

@ -9,14 +9,14 @@
else if (Model.IsLayoutPageSelected) else if (Model.IsLayoutPageSelected)
{ {
@:@@{ @:@@{
@:ViewData["Title"] = @@Model.ViewName"]; @:ViewData["Title"] = @@Model.ViewName;
if (!string.IsNullOrEmpty(Model.LayoutPageFile)) if (!string.IsNullOrEmpty(Model.LayoutPageFile))
{ {
@:Layout = "@Model.LayoutPageFile"; @:Layout = "@Model.LayoutPageFile";
} }
@:} @:}
@: @:
@:<h2>@@Model.ViewName"]</h2> @:<h2>@@Model.ViewName</h2>
@: @:
} }
else else
@ -30,7 +30,7 @@
@:<html> @:<html>
@:<head> @:<head>
@:<meta name="viewport" content="width=device-width" /> @:<meta name="viewport" content="width=device-width" />
@:<title>@@Model.ViewName"]</title> @:<title>@@Model.ViewName</title>
@:</head> @:</head>
@:<body> @:<body>
@: @:

6
scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/List.cshtml
View File

@ -9,14 +9,14 @@
else if (Model.IsLayoutPageSelected) else if (Model.IsLayoutPageSelected)
{ {
@:@@{ @:@@{
@:ViewData["Title"] = @@Model.ViewName"]; @:ViewData["Title"] = @@Model.ViewName;
if (!string.IsNullOrEmpty(Model.LayoutPageFile)) if (!string.IsNullOrEmpty(Model.LayoutPageFile))
{ {
@:Layout = "@Model.LayoutPageFile"; @:Layout = "@Model.LayoutPageFile";
} }
@:} @:}
@: @:
@:<h2>@@Model.ViewName"]</h2> @:<h2>@@Model.ViewName</h2>
@: @:
} }
else else
@ -30,7 +30,7 @@
@:<html> @:<html>
@:<head> @:<head>
@:<meta name="viewport" content="width=device-width" /> @:<meta name="viewport" content="width=device-width" />
@:<title>@@Model.ViewName"]</title> @:<title>@@Model.ViewName</title>
@:</head> @:</head>
@:<body> @:<body>
// PushIndent(" "); // PushIndent(" ");

1
src/Yavsc.Server/ViewModels/Account/LoginViewModel.cs
View File

@ -5,6 +5,7 @@ using Yavsc.Attributes.Validation;
namespace Yavsc.ViewModels.Account namespace Yavsc.ViewModels.Account
{ {
// TODO external autentication providers
public class SignInViewModel public class SignInViewModel
{ {
/// <summary> /// <summary>

4
src/Yavsc/Controllers/Accounting/AccountController.cs
View File

@ -99,7 +99,6 @@ namespace Yavsc.Controllers
return View(new SignInViewModel return View(new SignInViewModel
{ {
ReturnUrl = returnUrl ?? "/", ReturnUrl = returnUrl ?? "/",
ExternalProviders = HttpContext.GetExternalProviders()
}); });
/* /*
Note: When using an external login provider, redirect the query : Note: When using an external login provider, redirect the query :
@ -173,11 +172,11 @@ namespace Yavsc.Controllers
else else
{ {
ModelState.AddModelError(string.Empty, $"Invalid login attempt. ({model.UserName}, {model.Password})"); ModelState.AddModelError(string.Empty, $"Invalid login attempt. ({model.UserName}, {model.Password})");
model.ExternalProviders = HttpContext.GetExternalProviders();
return this.ViewOk(model); return this.ViewOk(model);
} }
} }
// If we got this far, something failed, redisplay form // If we got this far, something failed, redisplay form
ModelState.AddModelError(string.Empty, "Unexpected behavior: something failed ... you could try again, or contact me ..."); ModelState.AddModelError(string.Empty, "Unexpected behavior: something failed ... you could try again, or contact me ...");
} }
@ -212,7 +211,6 @@ namespace Yavsc.Controllers
} }
} }
model.ExternalProviders = HttpContext.GetExternalProviders();
return View(model); return View(model);
} }

38
src/Yavsc/Helpers/AuthHelpers.cs
View File

@ -1,38 +0,0 @@
using System;
using System.Linq;
using System.Collections.Generic;
using Microsoft.AspNetCore.Http;
using Yavsc.ViewModels.Account;
namespace Yavsc.Helpers
{
public static class HttpContextExtensions {
public static IEnumerable<YaAuthenticationDescription> GetExternalProviders(this HttpContext context) {
if (context == null) {
throw new ArgumentNullException(nameof(context));
}
return from description in context.GetExternalProviders()
where !string.IsNullOrEmpty(description.DisplayName)
select
( new YaAuthenticationDescription
{
DisplayName = description.DisplayName,
AuthenticationScheme = description.AuthenticationScheme,
Items = description.Items
});;
}
public static bool IsProviderSupported(this HttpContext context, string provider) {
if (context == null) {
throw new ArgumentNullException(nameof(context));
}
return (from description in context.GetExternalProviders()
where string.Equals(description.AuthenticationScheme, provider, StringComparison.OrdinalIgnoreCase)
select description).Any();
}
}
}

2
src/Yavsc/Views/Shared/Components/BlogIndex/Default.cshtml
View File

@ -12,7 +12,7 @@
$("tr.hiddenpost").addClass("hidden"); $("tr.hiddenpost").addClass("hidden");
} }
}); });
</script> </script>
} }
<table class="table"> <table class="table">

13
src/Yavsc/Yavsc.csproj
View File

@ -7,7 +7,17 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.60.0.2987" /> <PackageReference Include="Google.Apis.Compute.v1" Version="1.60.0.2987" />
<PackageReference Include="MarkdownDeep-av.NET" Version="1.5.27" /> <PackageReference Include="MarkdownDeep-av.NET" Version="1.5.27" />
@ -19,6 +29,7 @@
<PackageReference Include="RazorEngine.NetCore" Version="3.1.0" /> <PackageReference Include="RazorEngine.NetCore" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.5" />
</ItemGroup> </ItemGroup>

195
src/Yavsc/project.json
View File

@ -1,195 +0,0 @@
{
"version": "1.0.6-*",
"description": "encore une très petite entreprise",
"authors": [
"Paul Schneider <paul@pschneider.fr>"
],
"packOptions": {
"repository": {
"type": "git",
"url": "https://github.com/pazof/yavsc"
},
"licenseUrl": "https://github.com/pazof/yavsc/blob/vnext/LICENSE",
"requireLicenseAcceptance": true,
"owners": [
"Paul Schneider <paul@pschneider.fr>"
],
"summary": "Yet another very small company",
"projectUrl": "http://yavsc.pschneider.fr",
"tags": [
"Blog",
"PoS",
"Chat"
]
},
"userSecretsId": "aspnet5-YavscWeb-a0dadd21-2ced-43d3-96f9-7e504345102f",
"exclude": [
"bin",
"wwwroot",
"node_modules",
"bower_components",
"contrib"
],
"buildOptions": {
"debugType": "portable",
"emitEntryPoint": false,
"outputName": "Yavsc",
"compile": {
"include": "*.cs",
"exclude": [
"wwwroot",
"node_modules",
"bower_components",
"contrib",
"Blog-Dev",
"Temp-Dev"
]
},
"embed": [
"Resources/**/*.resx"
]
},
"configurations": {
"Debug": {
"compilationOptions": {
"emitEntryPoint": true,
"define": [
"DEBUG",
"TRACE"
],
"optimize": false,
"debugType": "full",
"platform": "anycpu"
}
},
"Release": {
"compilationOptions": {
"define": [
"RELEASE",
"TRACE"
],
"optimize": true
}
}
},
"webroot": "wwwroot",
"tooling": {
"defaultNamespace": "Yavsc"
},
"dependencies": {
"MarkdownDeep-av.NET": "1.5.27",
"EntityFramework.Commands": "7.0.0-rc1-final",
"EntityFramework.Core": "7.0.0-rc1-final",
"EntityFramework.MicrosoftSqlServer": "7.0.0-rc1-final",
"EntityFramework.Relational": "7.0.0-rc1-final",
"EntityFramework7.Npgsql": "3.1.0-rc1-3",
"EntityFramework7.Npgsql.Design": "3.1.0-rc1-5",
"MailKit": "1.12.0",
"Microsoft.AspNet.Authentication.Cookies": "1.0.0-rc1-final",
"Microsoft.AspNet.Authentication.Facebook": "1.0.0-rc1-final",
"Microsoft.AspNet.Authentication.Twitter": "1.0.0-rc1-final",
"Microsoft.AspNet.Authorization": "1.0.0-rc1-final",
"Microsoft.AspNet.Diagnostics.Entity": "7.0.0-rc1-final",
"Microsoft.AspNet.Http.Abstractions": "1.0.0-rc1-final",
"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*",
"Microsoft.AspNet.Localization": "1.0.0-rc1-final",
"Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final",
"Microsoft.AspNet.SignalR.Core": "2.2.1",
"Microsoft.AspNet.SignalR.JS": "2.2.1",
"Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
"Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*",
"Microsoft.AspNet.Session": "1.0.0-rc1-final",
"Microsoft.AspNet.Web.Optimization": "1.1.3",
"Microsoft.AspNet.Http.Extensions": "1.0.0-rc1-final",
"Microsoft.AspNet.DataProtection": "1.0.0-rc1-final",
"Microsoft.AspNet.DataProtection.SystemWeb": "1.0.0-rc1-final",
"Microsoft.AspNet.Authentication.OAuth": "1.0.0-rc1-final",
"Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-rc1-final",
"Microsoft.AspNet.WebSockets.Server": "1.0.0-rc1-final",
"Microsoft.AspNet.OWin": "1.0.0-rc1-final",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
"Microsoft.Framework.Configuration.Abstractions": "1.0.0-beta8",
"Microsoft.Framework.Configuration.Binder": "1.0.0-beta8",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
"Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final",
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final",
"Microsoft.Extensions.Options": "0.0.1-alpha",
"Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final",
"Microsoft.Extensions.CodeGeneration": "1.0.0-rc1-final",
"Microsoft.Extensions.CodeGenerators.Mvc": "1.0.0-rc1-final",
"System.Json": "4.0.20126.16343",
"OAuth.AspNet.Token": {
"target": "project",
"type": "build"
},
"OAuth.AspNet.AuthServer": {
"target": "project",
"type": "build"
},
"PayPalMerchant-net451": {
"version": "2.7.109"
},
"Gapi.net45": "1.0.1",
"Yavsc.Abstract": {
"target": "project",
"type": "build"
},
"Yavsc.Server": {
"target": "project",
"type": "build"
},
"pazof.rules": "1.1.3"
},
"commands": {
"ef": "EntityFramework.Commands",
"gen": "Microsoft.Extensions.CodeGeneration",
"yavscpre": "Microsoft.AspNet.Server.Kestrel --server.urls http://*:84",
"lua": "Microsoft.AspNet.Server.Kestrel --server.urls http://*:85",
"yavsc": "Microsoft.AspNet.Server.Kestrel --server.urls http://*:86",
"coiffure": "Microsoft.AspNet.Server.Kestrel --server.urls http://*:88",
"freespeech": "Microsoft.AspNet.Server.Kestrel --server.urls http://*:89",
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5000"
},
"frameworks": {
"dnx451": {
"frameworkAssemblies": {
"System.Drawing": "4.0.0",
"System.Net": "4.0.0.0",
"System.Xml": "4.0.0.0",
"System": "4.0.0.0"
}
}
},
"publishOptions": {
"exclude": [
"**.user",
"**.vspscc",
"contrib/**/*.*",
"Blog-Dev/**/*.*",
"Temp-Dev/**/*.*"
]
},
"scripts": {
"prepublish": "make minify",
"postrestore": [
"grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
"mv new.project.lock.json project.lock.json"
]
},
"embed": "Views/**/*.cshtml"
}