Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion docker/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/dotnet/core/aspnet:latest
COPY shippingrecorder.api-1.9.0.0 /opt/shippingrecorder.api
ARG VERSION
COPY shippingrecorder.api-${VERSION}.0 /opt/shippingrecorder.api
WORKDIR /opt/shippingrecorder.api/bin
ENTRYPOINT [ "./ShippingRecorder.Api" ]
3 changes: 2 additions & 1 deletion docker/ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/dotnet/aspnet:latest AS runtime
COPY shippingrecorder.mvc-1.9.0.0 /opt/shippingrecorder.mvc
ARG VERSION
COPY shippingrecorder.mvc-${VERSION}.0 /opt/shippingrecorder.mvc
WORKDIR /opt/shippingrecorder.mvc/bin
ENTRYPOINT [ "./ShippingRecorder.Mvc" ]
4 changes: 2 additions & 2 deletions src/ShippingRecorder.Api/ShippingRecorder.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<FileVersion>1.9.0.0</FileVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<FileVersion>1.10.0.0</FileVersion>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<NoWarn>NU1900</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<PackageId>ShippingRecorder.BusinessLogic</PackageId>
<PackageVersion>1.9.0.0</PackageVersion>
<PackageVersion>1.10.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) Dave Walker 2025</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -15,7 +15,7 @@
<PackageProjectUrl>https://github.com/davewalker5/ShippingRecorder</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<NoWarn>NU1900</NoWarn>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/ShippingRecorder.Client/ShippingRecorder.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<PackageId>ShippingRecorder.Client</PackageId>
<PackageVersion>1.9.0.0</PackageVersion>
<PackageVersion>1.10.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) Dave Walker 2025</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -15,7 +15,7 @@
<PackageProjectUrl>https://github.com/davewalker5/ShippingRecorder</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<NoWarn>NU1900</NoWarn>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/ShippingRecorder.Data/ShippingRecorder.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<PackageId>ShippingRecorder.Data</PackageId>
<PackageVersion>1.9.0.0</PackageVersion>
<PackageVersion>1.10.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) Dave Walker 2025</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -15,7 +15,7 @@
<PackageProjectUrl>https://github.com/davewalker5/ShippingRecorder</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<NoWarn>NU1900</NoWarn>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<PackageId>ShippingRecorder.DataExchange</PackageId>
<PackageVersion>1.9.0.0</PackageVersion>
<PackageVersion>1.10.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) Dave Walker 2025</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -15,7 +15,7 @@
<PackageProjectUrl>https://github.com/davewalker5/ShippingRecorder</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<NoWarn>NU1900</NoWarn>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<PackageId>ShippingRecorder.Entities</PackageId>
<PackageVersion>1.9.0.0</PackageVersion>
<PackageVersion>1.10.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) Dave Walker 2025</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -15,7 +15,7 @@
<PackageProjectUrl>https://github.com/davewalker5/ShippingRecorder</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<NoWarn>NU1900</NoWarn>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/ShippingRecorder.Manager/ShippingRecorder.Manager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<FileVersion>1.9.0.0</FileVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<FileVersion>1.10.0.0</FileVersion>
<Configurations>Release;Debug</Configurations>
<NoWarn>NU1900</NoWarn>
</PropertyGroup>
Expand Down
6 changes: 2 additions & 4 deletions src/ShippingRecorder.Mvc/ShippingRecorder.Mvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ReleaseVersion>1.9.0.0</ReleaseVersion>
<FileVersion>1.9.0.0</FileVersion>
<ReleaseVersion>1.10.0.0</ReleaseVersion>
<FileVersion>1.10.0.0</FileVersion>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<NoWarn>NU1900</NoWarn>
Expand All @@ -23,8 +23,6 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="AutoMapper" Version="12.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions src/ShippingRecorder.Mvc/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@ public void ConfigureServices(IServiceCollection services)

services.AddControllersWithViews();

// Configure automapper
services.AddAutoMapper(typeof(Startup));

// Set up the configuration reader
// Set up the configuration reader
IConfigurationRoot configuration = new ConfigurationBuilder()
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true)
Expand Down
63 changes: 38 additions & 25 deletions src/ShippingRecorder.Mvc/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - Shiping Recorder</title>
<title>@ViewData["Title"] - Shipping Recorder</title>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" />
<link rel="stylesheet" href="~/lib/fontawesome/css/all.min.css" />
Expand All @@ -12,38 +12,44 @@
<script src="~/lib/jquery/dist/jquery.js" type="text/javascript"></script>
<script src="~/lib/jquery-confirm/jquery-confirm.js" type="text/javascript"></script>
</head>
<body>
<div style="width: 90%; margin: 0 auto;">
<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">Shipping Recorder</a>
<body>
<div class="app-shell">
<header class="app-header">
<nav class="navbar navbar-expand-lg navbar-dark">
<div class="app-container">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index" aria-label="Shipping Recorder home">
<span class="brand-mark" aria-hidden="true"><i class="fas fa-ship"></i></span>
<span class="brand-copy">
<strong>Shipping Recorder</strong>
<small>Personal vessel log</small>
</span>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-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 flex-sm-row-reverse">
<ul class="navbar-nav">
<div class="navbar-collapse collapse">
<ul class="navbar-nav ml-auto">
@if (User?.Identity?.IsAuthenticated == true)
{
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Log Sighting</a>
<a class="nav-link" asp-area="" asp-controller="Home" asp-action="Index">Log Sighting</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link text-dark dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle" href="#" id="sightingSearchMenu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Sighting Search
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="dropdown-menu" aria-labelledby="sightingSearchMenu">
<a class="dropdown-item" asp-area="" asp-controller="SearchSightingsByVessel" asp-action="Index">Sightings By Vessel</a>
<a class="dropdown-item" asp-area="" asp-controller="SearchSightingsByLocation" asp-action="Index">Sightings By Location</a>
<a class="dropdown-item" asp-area="" asp-controller="SearchSightingsByDate" asp-action="Index">Sightings By Date</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link text-dark dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle" href="#" id="reportsMenu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Reports
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="dropdown-menu" aria-labelledby="reportsMenu">
<a class="dropdown-item" asp-area="" asp-controller="LocationStatistics" asp-action="Index">Location Statistics</a>
<a class="dropdown-item" asp-area="" asp-controller="OperatorStatistics" asp-action="Index">Operator Statistics</a>
<a class="dropdown-item" asp-area="" asp-controller="VesselTypeStatistics" asp-action="Index">Vessel Type Statistics</a>
Expand All @@ -54,10 +60,10 @@
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link text-dark dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle" href="#" id="maintenanceMenu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Data Maintenance
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="dropdown-menu" aria-labelledby="maintenanceMenu">
<a class="dropdown-item" asp-area="" asp-controller="Countries" asp-action="Index">Countries</a>
<a class="dropdown-item" asp-area="" asp-controller="Locations" asp-action="Index">Locations</a>
<a class="dropdown-item" asp-area="" asp-controller="Operators" asp-action="Index">Operators</a>
Expand All @@ -68,40 +74,47 @@
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link text-dark dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle" href="#" id="jobsMenu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Jobs
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="jobsMenu">
<a class="dropdown-item" asp-area="" asp-controller="Import" asp-action="Index">Import</a>
<a class="dropdown-item" asp-area="" asp-controller="Export" asp-action="Index">Export</a>
<a class="dropdown-item" asp-area="" asp-controller="JobStatus" asp-action="Index">Job Status</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Login" asp-action="LogOut">Log Out</a>
<a class="nav-link" asp-area="" asp-controller="Login" asp-action="LogOut">Log Out</a>
</li>
}
else
{
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Login" asp-action="Index">Log In</a>
<a class="nav-link" asp-area="" asp-controller="Login" asp-action="Index">Log In</a>
</li>
}
</ul>
</div>
</div>
</nav>
</header>
<div class="container-fluid">
<main role="main" class="pb-3">
<div class="app-container app-content">
<div class="page-heading">
<div>
<p class="eyebrow">Shipping Recorder</p>
<h1>@ViewData["Title"]</h1>
</div>
</div>
<main role="main">
@RenderBody()
@await Html.PartialAsync("_AjaxModalDialog")
</main>
</div>

<footer class="border-top footer text-muted">
<div class="container">
Shipping Recorder @ViewData["Version"] &copy; 2025-2026 - David Walker
<footer class="app-footer">
<div class="app-container footer-content">
<span><i class="fas fa-ship" aria-hidden="true"></i> Shipping Recorder @ViewData["Version"]</span>
<span>&copy; 2025-2026 David Walker</span>
</div>
</footer>
</div>
Expand Down
Loading
Loading