Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.1
1.2.0-beta.3
13 changes: 9 additions & 4 deletions Wrap.slnx
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<Solution>
<Folder Name="/apps/">
<File Path="apps/.editorconfig" />
<File Path="apps/Directory.Build.props" />
<Project Path="apps/AppMvc/AppMvc.csproj" Id="c6311ce6-256f-4930-abc1-f5065b03d288" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".github/FUNDING.yml" />
Expand All @@ -18,13 +23,13 @@
<File Path="src/.editorconfig" />
<File Path="src/Directory.Build.props" />
<File Path="src/Local.pack.props" />
<Project Path="src/All.Mvc/All.Mvc.csproj" />
<Project Path="src/All.Testing/All.Testing.csproj" />
<Project Path="src/All/All.csproj" />
<Project Path="src/Caching/Caching.csproj" />
<Project Path="src/Common/Common.csproj" />
<Project Path="src/Either/Either.csproj" />
<Project Path="src/Id.Dapper/Id.Dapper.csproj" />
<Project Path="src/Id.Mvc/Id.Mvc.csproj" />
<Project Path="src/Id.Testing/Id.Testing.csproj" />
<Project Path="src/Id/Id.csproj" />
<Project Path="src/Maybe.Testing/Maybe.Testing.csproj" />
Expand All @@ -35,6 +40,9 @@
<Folder Name="/tests/">
<File Path="tests/.editorconfig" />
<File Path="tests/Directory.Build.props" />
<Project Path="tests/Tests.All.Mvc/Tests.All.Mvc.csproj">
<Build Solution="Release|*" Project="false" />
</Project>
<Project Path="tests/Tests.All/Tests.All.csproj">
<Build Solution="Release|*" Project="false" />
</Project>
Expand All @@ -47,9 +55,6 @@
<Project Path="tests/Tests.Id.Dapper/Tests.Id.Dapper.csproj">
<Build Solution="Release|*" Project="false" />
</Project>
<Project Path="tests/Tests.Id.Mvc/Tests.Id.Mvc.csproj">
<Build Solution="Release|*" Project="false" />
</Project>
<Project Path="tests/Tests.Id/Tests.Id.csproj">
<Build Solution="Release|*" Project="false" />
</Project>
Expand Down
3 changes: 3 additions & 0 deletions apps/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[*.{cs,csx,cake,vb,vbx}]

file_header_template = Wrap: Test Apps.\nCopyright (c) bfren - licensed under https://mit.bfren.dev/2019
5 changes: 5 additions & 0 deletions apps/AppMvc/AppMvc.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<ItemGroup>
<ProjectReference Include="..\..\src\All.Mvc\All.Mvc.csproj" />
</ItemGroup>
</Project>
46 changes: 46 additions & 0 deletions apps/AppMvc/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Wrap: Test Apps.
// Copyright (c) bfren - licensed under https://mit.bfren.dev/2019

using System.Diagnostics;
using AppMvc.Models;
using Microsoft.AspNetCore.Mvc;
using Wrap.Ids;

namespace AppMvc.Controllers;

public class HomeController : Controller
{
public IActionResult Index() =>
View();

public IActionResult Privacy() =>
View();

[HttpGet("/monad/{testId}|{pc0}|{shouldBeTrue}/{pc1?}")]
public IActionResult Monad(TestId testId, Postcode pc0, Maybe<bool> shouldBeTrue, Maybe<Postcode> pc1) =>
View("Monad", new { testId, pc0, shouldBeTrue, pc1 });

[HttpGet("/id/{testId}")]
public IActionResult Id(TestId testId) =>
View("Monad", testId);

[HttpGet("/postcode/{postcode}")]
public IActionResult Postcode(Postcode postcode) =>
View("Monad", postcode);

[HttpGet("/maybeBool/{maybe?}")]
public IActionResult MaybeBool(Maybe<bool> maybe) =>
View("Monad", maybe);

[HttpGet("/maybePostcode/{postcode?}")]
public IActionResult MaybePostcode(Maybe<Postcode> postcode) =>
View("Monad", postcode);

[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error() =>
View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
}

public sealed record class TestId : LongId<TestId>;

public sealed record class Postcode : Monad<Postcode, string>;
11 changes: 11 additions & 0 deletions apps/AppMvc/Models/ErrorViewModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Wrap: Unit Tests.
// Copyright (c) bfren - licensed under https://mit.bfren.dev/2019

namespace AppMvc.Models;

public class ErrorViewModel
{
public string? RequestId { get; set; }

public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
}
33 changes: 33 additions & 0 deletions apps/AppMvc/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Wrap: Test Apps.
// Copyright (c) bfren - licensed under https://mit.bfren.dev/2019

using Wrap.Mvc;

var builder = WebApplication.CreateBuilder(args);

// Add services to the container.
builder.Services.AddControllersWithViews().AddMvcOptions(o => o.ModelBinderProviders.AddWrapModelBinders());

var app = builder.Build();

// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())
{
app.UseExceptionHandler("/Home/Error");
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
app.UseHsts();
}

app.UseHttpsRedirection();
app.UseRouting();

app.UseAuthorization();

app.MapStaticAssets();

app.MapControllerRoute(
name: "default",
pattern: "{controller=Home}/{action=Index}/{id?}")
.WithStaticAssets();

app.Run();
23 changes: 23 additions & 0 deletions apps/AppMvc/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5001",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:7238;http://localhost:5001",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}
9 changes: 9 additions & 0 deletions apps/AppMvc/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@{
ViewData["Title"] = "Home Page";
}

<div class="text-center">
<h1 class="display-4">Welcome</h1>
<p>Learn about <a href="https://learn.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
<p><a href="/monad/65|fred0|true/">Monad Test</a></p>
</div>
1 change: 1 addition & 0 deletions apps/AppMvc/Views/Home/Monad.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>Value is @Model</p>
6 changes: 6 additions & 0 deletions apps/AppMvc/Views/Home/Privacy.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@{
ViewData["Title"] = "Privacy Policy";
}
<h1>@ViewData["Title"]</h1>

<p>Use this page to detail your site's privacy policy.</p>
25 changes: 25 additions & 0 deletions apps/AppMvc/Views/Shared/Error.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@model ErrorViewModel
@{
ViewData["Title"] = "Error";
}

<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>

@if (Model.ShowRequestId)
{
<p>
<strong>Request ID:</strong> <code>@Model.RequestId</code>
</p>
}

<h3>Development Mode</h3>
<p>
Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
</p>
<p>
<strong>The Development environment shouldn't be enabled for deployed applications.</strong>
It can result in displaying sensitive information from exceptions to end users.
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
and restarting the app.
</p>
50 changes: 50 additions & 0 deletions apps/AppMvc/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - AppMvc</title>
<script type="importmap"></script>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
<link rel="stylesheet" href="~/AppMvc.styles.css" asp-append-version="true" />
</head>
<body>
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container-fluid">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">AppMvc</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</li>
</ul>
</div>
</div>
</nav>
</header>
<div class="container">
<main role="main" class="pb-3">
@RenderBody()
</main>
</div>

<footer class="border-top footer text-muted">
<div class="container">
&copy; 2026 - AppMvc - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</div>
</footer>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
@await RenderSectionAsync("Scripts", required: false)
</body>
</html>
48 changes: 48 additions & 0 deletions apps/AppMvc/Views/Shared/_Layout.cshtml.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */

a.navbar-brand {
white-space: normal;
text-align: center;
word-break: break-all;
}

a {
color: #0077cc;
}

.btn-primary {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}

.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}

.border-top {
border-top: 1px solid #e5e5e5;
}
.border-bottom {
border-bottom: 1px solid #e5e5e5;
}

.box-shadow {
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
}

button.accept-policy {
font-size: 1rem;
line-height: inherit;
}

.footer {
position: absolute;
bottom: 0;
width: 100%;
white-space: nowrap;
line-height: 60px;
}
2 changes: 2 additions & 0 deletions apps/AppMvc/Views/Shared/_ValidationScriptsPartial.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
<script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.min.js"></script>
3 changes: 3 additions & 0 deletions apps/AppMvc/Views/_ViewImports.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@using AppMvc
@using AppMvc.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
3 changes: 3 additions & 0 deletions apps/AppMvc/Views/_ViewStart.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@{
Layout = "_Layout";
}
8 changes: 8 additions & 0 deletions apps/AppMvc/appsettings.Development.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}
9 changes: 9 additions & 0 deletions apps/AppMvc/appsettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
}
31 changes: 31 additions & 0 deletions apps/AppMvc/wwwroot/css/site.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
html {
font-size: 14px;
}

@media (min-width: 768px) {
html {
font-size: 16px;
}
}

.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
}

html {
position: relative;
min-height: 100%;
}

body {
margin-bottom: 60px;
}

.form-floating > .form-control-plaintext::placeholder, .form-floating > .form-control::placeholder {
color: var(--bs-secondary-color);
text-align: end;
}

.form-floating > .form-control-plaintext:focus::placeholder, .form-floating > .form-control:focus::placeholder {
text-align: start;
}
Binary file added apps/AppMvc/wwwroot/favicon.ico
Binary file not shown.
4 changes: 4 additions & 0 deletions apps/AppMvc/wwwroot/js/site.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
// for details on configuring this project to bundle and minify static web assets.

// Write your JavaScript code.
Loading