yawaflua/yaflay.ru
1
0
Fork 0
mirror of https://github.com/yawaflua/yaflay.ru.git synced 2025-12-09 20:19:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix errors

Browse Source
This commit is contained in:
yawaflua
2024-04-17 22:55:21 +03:00
parent 1075225001
commit e6f56938c1
12 changed files with 63 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Areas/MyFeature/Pages/Page1.cshtml
View File

@@ -1,13 +0,0 @@
@page
@model yawaflua.ru.MyFeature.Pages.Page1Model
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width" />
<title>Page1</title>
</head>
<body>
</body>
</html>

13
Areas/MyFeature/Pages/Page1.cshtml.cs
View File

@@ -1,13 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace yawaflua.ru.MyFeature.Pages
{
public class Page1Model : PageModel
{
public void OnGet()
{
}
}
}

9
Controllers/RedirectController.cs
View File

@@ -20,14 +20,13 @@ namespace yawaflua.ru.Controllers
this.cache = cache; this.cache = cache;
} }
[HttpGet("{uri}")] [HttpGet("{uri}")]
public async Task<IActionResult> FromGitHub(string uri) public async Task<IActionResult> FromGitHub(string uri, [FromQuery(Name = "to")] string? to, [FromQuery(Name = "debug")] string debug = "false")
{ {
Console.WriteLine(uri);
Redirects redirects; Redirects redirects;
if (!cache.TryGetValue($"redirectsWithUrl-{uri}", out redirects) || ctx.Redirects.TryGetValue(k => k.uri == uri, out redirects)) if (!cache.TryGetValue($"redirectsWithUrl-{uri}", out redirects) || ctx.Redirects.TryGetValue(k => k.uri == uri, out redirects) )
cache.Set($"redirectsWithUrl-{uri}", redirects, DateTime.Now.AddMinutes(10)); cache.Set($"redirectsWithUrl-{uri}", redirects, DateTime.Now.AddMinutes(20));
return Redirect(redirects?.redirectTo ?? "/404"); return Redirect(redirects?.redirectTo + to?.Replace("%", "/") ?? "/404");
} }
} }

58
Dockerfile
View File

@@ -1,31 +1,33 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ASP.NET Core SDK <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
# <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
WORKDIR /app WORKDIR /app
# <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
COPY . ./
RUN dotnet restore "api.yawaflua.ru.csproj"
# <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
RUN dotnet publish -c Release -o /app/out "api.yawaflua.ru.csproj"
# <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ASP.NET Core runtime
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
WORKDIR /app
COPY --from=build /app/out ./
# <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
EXPOSE 80 EXPOSE 80
EXPOSE 443 # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
ENV CLIENTID=123
ENV CLIENTSECRET=aAbB
ENV REDIRECTURL=http://example.org/
ENV PSQL_HOST=localhost
ENV PSQL_USER=root
ENV PSQL_PASSWORD=root
ENV PSQL_DATABASE=database
ENV OWNERID=1111111
ENV READMEFILE=https://raw.githubusercontent.com/yawaflua/yawaflua/main/README.md
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ASP.NET Core <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
ENTRYPOINT ["dotnet", "api.yawaflua.ru.dll"]
WORKDIR /src
COPY ["yaflay.ru.csproj", "."]
RUN dotnet restore "./yaflay.ru.csproj"
COPY . .
WORKDIR "/src/."
RUN dotnet build "yaflay.ru.csproj" -c Release -o /app/build
FROM build AS publish
ENV CLIENTID 123
ENV CLIENTSECRET aAbB
ENV REDIRECTURL http://example.org/
ENV PSQL_HOST localhost
ENV PSQL_USER root
ENV PSQL_PASSWORD root
ENV PSQL_DATABASE database
ENV OWNERID 1111111
ENV READMEFILE https://raw.githubusercontent.com/yawaflua/yawaflua/main/README.md
RUN dotnet publish "yaflay.ru.csproj" -c Release -o /app/publish /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "yaflay.ru.dll"]

2
Pages/Authorize.cshtml
View File

@@ -53,7 +53,7 @@
message = await Startup.client.SendAsync(requestMessage); message = await Startup.client.SendAsync(requestMessage);
} }
string responseBody = await message.Content.ReadAsStringAsync(); string responseBody = await message.Content.ReadAsStringAsync();
JsonNode body = JsonNode.Parse(responseBody); JsonNode? body = JsonNode.Parse(responseBody);
if (body["access_token"]?.ToString() == null) if (body["access_token"]?.ToString() == null)
{ {
<h4>Ошибка! Попробуй авторизоваться заново</h4> <h4>Ошибка! Попробуй авторизоваться заново</h4>

12
Pages/rrobotsTxt.cshtml
View File

@@ -1,12 +0,0 @@
@page
@{
Layout = null;
this.Response.ContentType = "text/plain";
}
User-agent: *
<environment include="Development,Staging">Disallow: /*</environment>
<environment include="Production">Disallow: /* </environment>
<environment include="Production">Allow: /Blog </environment>
<environment include="Production">Allow: /Blog/* </environment>
<environment include="Production">Allow: /Privacy </environment>
<environment include="Production">Allow: / </environment>

7
Program.cs
View File

@@ -22,8 +22,7 @@ public class Program
} }
public static class StaticProgram public static class StaticProgram
{ {
public static bool isNull(this object? value) public static bool isNull(this object? value) =>
{ value == null;
return value == null;
}
} }

11
Properties/launchSettings.json
View File

@@ -20,6 +20,17 @@
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy" "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
} }
}, },
"Docker": {
"commandName": "Docker",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": ".",
"applicationUrl": "http://localhost:5144",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
}
},
"https": { "https": {
"commandName": "Project", "commandName": "Project",
"dotnetRunMessages": true, "dotnetRunMessages": true,

6
Startup.cs
View File

@@ -47,7 +47,7 @@ namespace yawaflua.ru
services.AddControllers() services.AddControllers()
.AddRazorPagesOptions(options => .AddRazorPagesOptions(options =>
{ {
options.Conventions.AddPageRoute("/RobotsTxt", "/Robots.txt");
options.Conventions.AddPageRoute("/RobotsTxt", "/robots.txt"); options.Conventions.AddPageRoute("/RobotsTxt", "/robots.txt");
options.Conventions.AddPageRoute("/NotFound", "/404"); options.Conventions.AddPageRoute("/NotFound", "/404");
options.Conventions.AddPageRoute("/IternalErrorPage", "/500"); options.Conventions.AddPageRoute("/IternalErrorPage", "/500");
@@ -83,8 +83,7 @@ namespace yawaflua.ru
services.AddMvc() services.AddMvc()
.AddRazorPagesOptions(options => .AddRazorPagesOptions(options =>
{ {
options.Conventions.AddPageRoute("/RobotsTxt", "/Robots.txt"); options.Conventions.AddPageRoute("/RobotsTxt", "/robots.txt");
options.Conventions.AddPageRoute("/rrobotsTxt", "/robots.txt");
options.Conventions.AddPageRoute("/NotFound", "/404"); options.Conventions.AddPageRoute("/NotFound", "/404");
options.Conventions.AddPageRoute("/IternalErrorPage", "/500"); options.Conventions.AddPageRoute("/IternalErrorPage", "/500");
options.Conventions.AddPageRoute("/Authorize", "/authorize"); options.Conventions.AddPageRoute("/Authorize", "/authorize");
@@ -106,6 +105,7 @@ namespace yawaflua.ru
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
app.UseHsts(); app.UseHsts();
app.UseSpa(x => x.UseProxyToSpaDevelopmentServer("http://localhost:8080"));
} }
// Configure the HTTP request pipeline. // Configure the HTTP request pipeline.

10
api.yawaflua.ru.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
@@ -10,15 +10,16 @@
<EnableSdkContainerSupport>true</EnableSdkContainerSupport> <EnableSdkContainerSupport>true</EnableSdkContainerSupport>
<Authors>yawaflua</Authors> <Authors>yawaflua</Authors>
<Company>yawaflua</Company> <Company>yawaflua</Company>
<SpaProxyLaunchCommand>npm run serve -- --host 0.0.0.0 --port 8080</SpaProxyLaunchCommand>
<SpaProxyServerUrl>http://localhost:8080</SpaProxyServerUrl>
<SpaRoot>..\frontend.yawaflua.ru</SpaRoot>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaProxy"> <PackageReference Include="Microsoft.AspNetCore.SpaProxy">
<Version>8.*-*</Version> <Version>8.*-*</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.32" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup> </ItemGroup>
@@ -26,6 +27,7 @@
<ProjectReference Include="..\frontend.yawaflua.ru\frontend.yawaflua.ru.esproj"> <ProjectReference Include="..\frontend.yawaflua.ru\frontend.yawaflua.ru.esproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

5
libman.json Normal file
View File

@@ -0,0 +1,5 @@
{
"version": "1.0",
"defaultProvider": "cdnjs",
"libraries": []
}

BIN
wwwroot/favicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 647 KiB