Stevan/criminalmindsapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: Stevan/criminalmindsapi:master
Branches Tags
Stevan/criminalmindsapi:master Stevan/criminalmindsapi:production Stevan/criminalmindsapi:add-datasets-to-home-page
..
pull from: Stevan/criminalmindsapi:production
Branches Tags
Stevan/criminalmindsapi:master Stevan/criminalmindsapi:production Stevan/criminalmindsapi:add-datasets-to-home-page
2 Commits
master .. production
Author SHA1 Message Date
Stevan Freeborn a6b949eb9c Merge pull request #31 from StevanFreeborn/master 
Update production_criminalmindsapi.yml
 2024-03-25 10:20:06 -05:00
Stevan Freeborn 7278658356 Merge pull request #30 from StevanFreeborn/master 
merge changes
 2024-03-25 10:16:04 -05:00
7 changed files with 3633 additions and 5992 deletions
Expand all files Collapse all files
.github/workflows/azure-static-web-apps-zealous-cliff-09a0a7b10.yml
+2 -3
View File
@@ -8,10 +8,10 @@ on:
types: [closed] types: [closed]
branches: branches:
- production - production
workflow_dispatch:
jobs: jobs:
build_and_deploy_job: build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'workflow_dispatch' if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Build and Deploy Job name: Build and Deploy Job
steps: steps:
@@ -43,4 +43,3 @@ jobs:
with: with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ZEALOUS_CLIFF_09A0A7B10 }} azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ZEALOUS_CLIFF_09A0A7B10 }}
action: "close" action: "close"
app_location: "/client"
.github/workflows/production_criminalmindsapi.yml
+9 -8
View File
@@ -12,31 +12,32 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up .NET Core - name: Set up .NET Core
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: '8.0.x' dotnet-version: '6.0.x'
include-prerelease: true
- name: Build with dotnet - name: Build with dotnet
run: dotnet build --configuration Release run: dotnet build --configuration Release
working-directory: ${{ env.WORKING_DIRECTORY }} working-directory: ${{ env.WORKING_DIRECTORY }}
- name: dotnet publish - name: dotnet publish
run: dotnet publish -c Release -o release run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/server
working-directory: ${{ env.WORKING_DIRECTORY }} working-directory: ${{ env.WORKING_DIRECTORY }}
- name: Upload artifact for deployment job - name: Upload artifact for deployment job
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v3
with: with:
name: server name: server
path: ./server/release path: ${{env.DOTNET_ROOT}}/server
deploy: deploy:
runs-on: windows-latest runs-on: windows-latest
needs: build needs: build
environment: environment:
name: 'production' name: 'Production'
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
permissions: permissions:
id-token: write id-token: write
steps: steps:
- name: Download artifact from build job - name: Download artifact from build job
uses: actions/download-artifact@v4.1.7 uses: actions/download-artifact@v3
with: with:
name: server name: server
- name: Login to Azure - name: Login to Azure
@@ -50,6 +51,6 @@ jobs:
uses: azure/webapps-deploy@v2 uses: azure/webapps-deploy@v2
with: with:
app-name: 'criminalmindsapi' app-name: 'criminalmindsapi'
slot-name: 'production' slot-name: 'Production'
package: . package: .
client/package-lock.json
Generated
+3598 -5956
View File
File diff suppressed because it is too large Load Diff
client/package.json
+7 -7
View File
@@ -12,9 +12,7 @@
"@testing-library/react": "^13.3.0", "@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",
"http-proxy-middleware": "^2.0.7", "http-proxy-middleware": "^2.0.6",
"loader-utils": ">=2.0.3",
"minimatch": ">=3.0.5",
"nth-check": ">=2.0.1", "nth-check": ">=2.0.1",
"react": "^18.2.0", "react": "^18.2.0",
"react-bootstrap": "^2.4.0", "react-bootstrap": "^2.4.0",
@@ -23,9 +21,11 @@
"react-loading-icons": "^1.1.0", "react-loading-icons": "^1.1.0",
"react-router": "^6.3.0", "react-router": "^6.3.0",
"react-router-dom": "^6.3.0", "react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1", "react-scripts": "5.0.1",
"web-vitals": "^2.1.4",
"terser": ">=5.14.2", "terser": ">=5.14.2",
"web-vitals": "^2.1.4" "minimatch": ">=3.0.5",
"loader-utils": ">=2.0.3"
}, },
"scripts": { "scripts": {
"start": "set HTTPS=true&&react-scripts start", "start": "set HTTPS=true&&react-scripts start",
@@ -56,8 +56,8 @@
"devDependencies": { "devDependencies": {
"eslint-config-react-app": "^7.0.1", "eslint-config-react-app": "^7.0.1",
"jest-editor-support": "^30.1.0", "jest-editor-support": "^30.1.0",
"loader-utils": ">=2.0.3", "terser": ">=5.14.2",
"minimatch": ">=3.0.5", "minimatch": ">=3.0.5",
"terser": ">=5.14.2" "loader-utils": ">=2.0.3"
} }
} }
server.tests/server.tests.csproj
+7 -8
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
@@ -9,16 +9,15 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.1" /> <PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="moq" Version="4.20.72" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.9.2" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2"> <PackageReference Include="coverlet.collector" Version="3.1.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
server.tests/v1/unitTests/QuotesControllerUnitTests.cs
-1
View File
@@ -92,7 +92,6 @@ namespace server.tests.v1.UnitTests
character.Should().BeOfType<Quote>(); character.Should().BeOfType<Quote>();
} }
[Fact]
public async Task GetQuoteByIdAsync_ValidIdForNonExistentQuote_Returns404StatusCodeWithProblemDetails() public async Task GetQuoteByIdAsync_ValidIdForNonExistentQuote_Returns404StatusCodeWithProblemDetails()
{ {
var quoteId = "62b7d5506c1b407771829926"; var quoteId = "62b7d5506c1b407771829926";
server/server.csproj
+7 -6
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -12,11 +12,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.29.0" /> <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" /> <PackageReference Include="Moq" Version="4.18.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>