bit-badger/jobs-jobs-jobs
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 19 Activity

Merge pull request 'Version 3.2' (#46) from 3point2 into main

Browse Source 
Reviewed-on: #46
This commit is contained in:
Daniel J. Summers 2024-06-21 00:09:35 +00:00
commit 3a12478312
12 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Dockerfile
View File

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /jjj WORKDIR /jjj
COPY ./JobsJobsJobs.sln ./ COPY ./JobsJobsJobs.sln ./
COPY ./JobsJobsJobs/Directory.Build.props ./JobsJobsJobs/ COPY ./JobsJobsJobs/Directory.Build.props ./JobsJobsJobs/
@ -14,13 +14,13 @@ RUN dotnet restore
COPY . ./ COPY . ./
WORKDIR /jjj/JobsJobsJobs/Application WORKDIR /jjj/JobsJobsJobs/Application
RUN dotnet publish -c Release -r linux-x64 RUN dotnet publish -c Release -r linux-x64
RUN rm bin/Release/net7.0/linux-x64/publish/appsettings.*.json RUN rm bin/Release/net8.0/linux-x64/publish/appsettings.*.json
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine as final FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine as final
WORKDIR /app WORKDIR /app
RUN apk add --no-cache icu-libs RUN apk add --no-cache icu-libs
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
COPY --from=build /jjj/JobsJobsJobs/Application/bin/Release/net7.0/linux-x64/publish/ ./ COPY --from=build /jjj/JobsJobsJobs/Application/bin/Release/net8.0/linux-x64/publish/ ./
EXPOSE 80 EXPOSE 80
CMD [ "dotnet", "/app/JobsJobsJobs.Application.dll" ] CMD [ "dotnet", "/app/JobsJobsJobs.Application.dll" ]

6
src/JobsJobsJobs/Application/JobsJobsJobs.Application.fsproj
View File

@ -26,11 +26,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" /> <PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BitBadger.AspNetCore.CanonicalDomains" Version="1.0.0" /> <PackageReference Include="BitBadger.AspNetCore.CanonicalDomains" Version="1.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj
View File

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" /> <PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/JobsJobsJobs/Citizens/Views.fs
View File

@ -360,7 +360,7 @@ let registered =
txt "register again." txt "register again."
] ]
p [] [ p [] [
txt "If you encounter issues, feel free to reach out to @danieljsummers on No Agenda Social for assistance." txt "If you encounter issues, feel free to reach out to @daniel@fedi.summershome.org for assistance."
] ]
] ]

2
src/JobsJobsJobs/Common/Domain.fs
View File

@ -146,7 +146,7 @@ type OtherContact =
{ /// The type of contact { /// The type of contact
ContactType : ContactType ContactType : ContactType
/// The name of the contact (Email, No Agenda Social, LinkedIn, etc.) /// The name of the contact (Email, Mastodon, LinkedIn, etc.)
Name : string option Name : string option
/// The value for the contact (e-mail address, user name, URL, etc.) /// The value for the contact (e-mail address, user name, URL, etc.)

20
src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj
View File

@ -16,18 +16,18 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BitBadger.Npgsql.FSharp.Documents" Version="1.0.0-beta3" /> <PackageReference Include="BitBadger.Npgsql.FSharp.Documents" Version="1.0.0-beta3" />
<PackageReference Include="FSharp.SystemTextJson" Version="1.1.23" /> <PackageReference Include="FSharp.SystemTextJson" Version="1.3.13" />
<PackageReference Include="Giraffe" Version="6.0.0" /> <PackageReference Include="Giraffe" Version="6.4.0" />
<PackageReference Include="Giraffe.Htmx" Version="1.9.2" /> <PackageReference Include="Giraffe.Htmx" Version="2.0.0" />
<PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" /> <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
<PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.2" /> <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="2.0.0" />
<PackageReference Include="MailKit" Version="4.1.0" /> <PackageReference Include="MailKit" Version="4.6.0" />
<PackageReference Include="Markdig" Version="0.31.0" /> <PackageReference Include="Markdig" Version="0.37.0" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.1.0" />
<PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.0.0" /> <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.2.0" />
<PackageReference Include="Npgsql.FSharp" Version="5.7.0" /> <PackageReference Include="Npgsql.FSharp" Version="5.7.0" />
<PackageReference Include="Npgsql.NodaTime" Version="7.0.4" /> <PackageReference Include="Npgsql.NodaTime" Version="8.0.3" />
<PackageReference Update="FSharp.Core" Version="7.0.300" /> <PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/JobsJobsJobs/Directory.Build.props
View File

@ -1,10 +1,10 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<DebugType>embedded</DebugType> <DebugType>embedded</DebugType>
<GenerateDocumentationFile>false</GenerateDocumentationFile> <GenerateDocumentationFile>false</GenerateDocumentationFile>
<AssemblyVersion>3.1.2.0</AssemblyVersion> <AssemblyVersion>3.2.0.0</AssemblyVersion>
<FileVersion>3.1.2.0</FileVersion> <FileVersion>3.2.0.0</FileVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj
View File

@ -14,7 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" /> <PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
</Project> </Project>

9
src/JobsJobsJobs/Home/Views.fs
View File

@ -984,12 +984,9 @@ module Help =
h4 [ mainHeading ] [ txt "Help / Suggestions" ] h4 [ mainHeading ] [ txt "Help / Suggestions" ]
p [] [ p [] [
txt "This is open-source software " txt "This is open-source software "
a [ _href "https://github.com/bit-badger/jobs-jobs-jobs"; _target "_blank"; _rel "noopener" ] [ a [ _href "https://git.bitbadger.solutions/bit-badger/jobs-jobs-jobs"; _target "_blank"
txt "developed on Github" _rel "noopener" ] [ txt "developed in Git" ]
]; txt "; feel free to " txt "; feel free to ping @daniel@fedi.summershome.org if you run into any issues."
a [ _href "https://github.com/bit-badger/jobs-jobs-jobs/issues"; _target "_blank"; _rel "noopener" ] [
txt "create an issue there"
]; txt ", or look up @danieljsummers on No Agenda Social."
] ]
] ]

2
src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj
View File

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" /> <PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj
View File

@ -16,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" /> <PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj
View File

@ -18,7 +18,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" /> <PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
</Project> </Project>