Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GZTimeWalker/GZCTF
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.12.9.1
Choose a base ref
..
head repository: GZTimeWalker/GZCTF
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.12.9.2
Choose a head ref
Showing with 1,700 additions and 332 deletions.
  1. +1 −1 GZCTF.Test/CTFServer.Test.csproj
  2. +1 −1 GZCTF.sln
  3. +9 −11 GZCTF/CTFServer.csproj
  4. +15 −15 GZCTF/ClientApp/package.json
  5. +229 −229 GZCTF/ClientApp/pnpm-lock.yaml
  6. +4 −4 GZCTF/ClientApp/src/Api.ts
  7. +3 −3 GZCTF/ClientApp/src/components/MobilePostCard.tsx
  8. +3 −3 GZCTF/ClientApp/src/components/PostCard.tsx
  9. +7 −7 GZCTF/ClientApp/src/pages/games/[id]/monitor/Events.tsx
  10. +6 −6 GZCTF/ClientApp/src/pages/posts/[postId]/Index.tsx
  11. +2 −2 GZCTF/ClientApp/src/utils/usePageTitle.ts
  12. +2 −2 GZCTF/Controllers/GameController.cs
  13. +1,310 −0 GZCTF/Migrations/20221116064912_FixModelTypo.Designer.cs
  14. +62 −0 GZCTF/Migrations/20221116064912_FixModelTypo.cs
  15. +5 −5 GZCTF/Migrations/AppDbContextModelSnapshot.cs
  16. +3 −3 GZCTF/Models/AppDbContext.cs
  17. +4 −4 GZCTF/Models/Data/Post.cs
  18. +4 −4 GZCTF/Models/Request/Info/PostDetailModel.cs
  19. +4 −4 GZCTF/Models/Request/Info/PostInfoModel.cs
  20. +2 −0 GZCTF/Program.cs
  21. +1 −1 GZCTF/Repositories/GameNoticeRepository.cs
  22. +2 −2 GZCTF/Repositories/GameRepository.cs
  23. +1 −1 GZCTF/Repositories/Interface/ITeamRepository.cs
  24. +1 −1 GZCTF/Repositories/PostRepository.cs
  25. +1 −1 GZCTF/Repositories/TeamRepository.cs
  26. +1 −1 GZCTF/Services/Assets/URLEmailTemplate.html
  27. +2 −2 GZCTF/Services/Interface/IMailSender.cs
  28. +4 −4 GZCTF/Services/MailSender.cs
  29. +7 −3 GZCTF/Utils/CacheHelper.cs
  30. +4 −1 README.md
  31. BIN assets/demo-1.png
  32. BIN assets/demo-2.png
  33. BIN assets/demo-3.png
  34. BIN assets/demo-4.png
  35. BIN assets/demo-5.png
  36. BIN assets/demo-6.png
  37. BIN assets/demo-7.png
  38. BIN assets/demo-8.png
  39. BIN assets/demo-9.png
  40. +0 −11 nuget.config
2 changes: 1 addition & 1 deletion GZCTF.Test/CTFServer.Test.csproj
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<IsPackable>false</IsPackable>
<CollectCoverage>true</CollectCoverage>
<Configurations>Debug;Release;GenAPI</Configurations>
<ReleaseVersion>0.11.2</ReleaseVersion>
<ReleaseVersion>0.12.9</ReleaseVersion>
<EnablePreviewFeatures>True</EnablePreviewFeatures>
</PropertyGroup>

2 changes: 1 addition & 1 deletion GZCTF.sln
Original file line number Diff line number Diff line change
@@ -42,6 +42,6 @@ Global
SolutionGuid = {643F6AF8-C22F-4E8E-9AB2-504B7C560CD6}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
version = 0.11.2
version = 0.12.9
EndGlobalSection
EndGlobal
20 changes: 9 additions & 11 deletions GZCTF/CTFServer.csproj
Original file line number Diff line number Diff line change
@@ -18,9 +18,7 @@
<SpaProxyServerUrl>http://localhost:3000</SpaProxyServerUrl>
<SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
<Configurations>Debug;Release;GenAPI</Configurations>
<FrontendBuildTool>pnpm</FrontendBuildTool>
<FrontendBuildTool Condition="'$(UseNpm)'=='true'">npm</FrontendBuildTool>
<ReleaseVersion>0.11.2</ReleaseVersion>
<ReleaseVersion>0.12.9</ReleaseVersion>
<WarningLevel>4</WarningLevel>
<LangVersion>preview</LangVersion>
<EnablePreviewFeatures>True</EnablePreviewFeatures>
@@ -39,9 +37,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
<PackageReference Include="NPOI" Version="2.5.6" />
<PackageReference Include="NSwag.AspNetCore" Version="13.17.0" />
<PackageReference Include="NSwag.MSBuild" Version="13.17.0">
<PackageReference Include="NPOI" Version="2.6.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.18.0" />
<PackageReference Include="NSwag.MSBuild" Version="13.18.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@@ -59,7 +57,7 @@
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="MemoryPack" Version="1.7.1" />
<PackageReference Include="MemoryPack" Version="1.8.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
</ItemGroup>
@@ -118,14 +116,14 @@
</Target>

<Target Name="NSwag" AfterTargets="Build" Condition="'$(Configuration)' == 'GenAPI'">
<Exec WorkingDirectory="$(ProjectDir)" EnvironmentVariables="ASPNETCORE_ENVIRONMENT=Development" Command="$(NSwagExe_Net60) aspnetcore2openapi /assembly:$(TargetDir)CTFServer.dll /output:ClientApp/template/swagger.json" />
<Exec WorkingDirectory="$(SpaRoot)" Command="$(FrontendBuildTool) run genapi" />
<Exec WorkingDirectory="$(ProjectDir)" EnvironmentVariables="ASPNETCORE_ENVIRONMENT=Development" Command="$(NSwagExe_Net70) aspnetcore2openapi /assembly:$(TargetDir)CTFServer.dll /output:ClientApp/template/swagger.json" />
<Exec WorkingDirectory="$(SpaRoot)" Command="pnpm run genapi" />
</Target>

<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
<!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
<Exec WorkingDirectory="$(SpaRoot)" Command="$(FrontendBuildTool) install" />
<Exec WorkingDirectory="$(SpaRoot)" Command="$(FrontendBuildTool) run build" />
<Exec WorkingDirectory="$(SpaRoot)" Command="pnpm install" />
<Exec WorkingDirectory="$(SpaRoot)" Command="pnpm run build" />

<!-- Include the newly-built files in the publish output -->
<ItemGroup>
30 changes: 15 additions & 15 deletions GZCTF/ClientApp/package.json
Original file line number Diff line number Diff line change
@@ -12,14 +12,14 @@
"dependencies": {
"@babel/core": "^7.20.2",
"@emotion/react": "^11.10.5",
"@mantine/carousel": "^5.7.2",
"@mantine/core": "^5.7.2",
"@mantine/dates": "^5.7.2",
"@mantine/dropzone": "^5.7.2",
"@mantine/form": "^5.7.2",
"@mantine/hooks": "^5.7.2",
"@mantine/modals": "^5.7.2",
"@mantine/notifications": "^5.7.2",
"@mantine/carousel": "^5.8.2",
"@mantine/core": "^5.8.2",
"@mantine/dates": "^5.8.2",
"@mantine/dropzone": "^5.8.2",
"@mantine/form": "^5.8.2",
"@mantine/hooks": "^5.8.2",
"@mantine/modals": "^5.8.2",
"@mantine/notifications": "^5.8.2",
"@mdi/js": "^7.0.96",
"@mdi/react": "^1.6.1",
"@microsoft/signalr": "^7.0.0",
@@ -30,16 +30,16 @@
"embla-carousel-autoplay": "^7.0.5",
"embla-carousel-react": "^7.0.5",
"katex": "^0.16.3",
"marked": "^4.2.2",
"marked": "^4.2.3",
"pdfjs-dist": "2.16.105",
"prismjs": "^1.29.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-pdf": "^6.0.3",
"react-pdf": "^6.1.1",
"react-router": "^6.4.3",
"react-router-dom": "^6.4.3",
"swr": "^1.3.0",
"vite-tsconfig-paths": "^3.5.2"
"vite-tsconfig-paths": "^3.6.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.19.1",
@@ -50,10 +50,10 @@
"@types/node": "18.11.9",
"@types/prismjs": "^1.26.0",
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.8",
"@types/react-dom": "^18.0.9",
"@types/react-pdf": "^5.7.4",
"@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.1",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.43.0",
"@vitejs/plugin-react": "^2.2.0",
"axios": "^1.1.3",
"babel-plugin-prismjs": "^2.1.0",
@@ -65,7 +65,7 @@
"swagger-typescript-api": "^11.1.3",
"tslib": "^2.4.1",
"typescript": "4.8.4",
"vite": "^3.2.3",
"vite": "^3.2.4",
"vite-plugin-pages": "^0.27.1",
"vite-plugin-prismjs": "^0.0.8",
"vite-plugin-webfont-dl": "^3.4.1"
Loading