diff --git a/.gitignore b/.gitignore index 91fdf3e..01c6660 100644 --- a/.gitignore +++ b/.gitignore @@ -497,3 +497,7 @@ src/Otchinslator/wwwroot/css/styles.css src/Otchinslator/appsettings.Development.json *.pdf + +src/.idea/.idea.Otchinslator/.idea/ + +src/.vscode/ diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..714191e --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // Используйте IntelliSense, чтобы узнать, какие атрибуты существуют для отладки C#. + // Используйте наведение для описания существующих атрибутов + // Для получения дополнительных сведений посетите https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md. + "name": ".NET Core Launch (web)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // Если вы изменили требуемые версии .NET Framework, обязательно обновите путь к программе. + "program": "${workspaceFolder}/src/Otchinslator/bin/Debug/net8.0/Otchinslator.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Otchinslator", + "stopAtEntry": false, + // Включите запуск веб-браузера при запуске ASP.NET Core. Для получения дополнительных сведений: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser + "serverReadyAction": { + "action": "openExternally", + "pattern": "\\bNow listening on:\\s+(https?://\\S+)" + }, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..4053f50 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/Otchinslator/Otchinslator.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/src/Otchinslator/Otchinslator.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/src/Otchinslator/Otchinslator.csproj" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/src/.idea/.idea.Otchinslator/.idea/.name b/src/.idea/.idea.Otchinslator/.idea/.name deleted file mode 100644 index 3b00a5e..0000000 --- a/src/.idea/.idea.Otchinslator/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Otchinslator \ No newline at end of file diff --git a/src/.idea/.idea.Otchinslator/.idea/indexLayout.xml b/src/.idea/.idea.Otchinslator/.idea/indexLayout.xml deleted file mode 100644 index 7b08163..0000000 --- a/src/.idea/.idea.Otchinslator/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/.idea/.idea.Otchinslator/.idea/projectSettingsUpdater.xml b/src/.idea/.idea.Otchinslator/.idea/projectSettingsUpdater.xml deleted file mode 100644 index 64af657..0000000 --- a/src/.idea/.idea.Otchinslator/.idea/projectSettingsUpdater.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/.idea/.idea.Otchinslator/.idea/vcs.xml b/src/.idea/.idea.Otchinslator/.idea/vcs.xml deleted file mode 100644 index d843f34..0000000 --- a/src/.idea/.idea.Otchinslator/.idea/vcs.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/.idea/.idea.Otchinslator/.idea/workspace.xml b/src/.idea/.idea.Otchinslator/.idea/workspace.xml deleted file mode 100644 index ac7a4c1..0000000 --- a/src/.idea/.idea.Otchinslator/.idea/workspace.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - Otchinslator/Otchinslator.csproj - Otchinslator/Otchinslator.csproj - Otchinslator/Otchinslator.csproj - - - - - - - - - - - - - - - { - "associatedIndex": 3 -} - - - - { - "keyToString": { - ".NET Launch Settings Profile.Otchinslator: IIS Express.executor": "Run", - ".NET Launch Settings Profile.Otchinslator: http.executor": "Run", - ".NET Launch Settings Profile.Otchinslator: httpWatch.executor": "Run", - "RunOnceActivity.ShowReadmeOnStart": "true", - "Shell Script.Tailwind watch.executor": "Run", - "node.js.detected.package.eslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "HotReloadSettingsPage" - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1729967658163 - - - - - - - - - - - \ No newline at end of file diff --git a/src/Otchinslator/Otchinslator.csproj b/src/Otchinslator/Otchinslator.csproj index 3de1d5e..d3994d7 100644 --- a/src/Otchinslator/Otchinslator.csproj +++ b/src/Otchinslator/Otchinslator.csproj @@ -1,24 +1,29 @@ + net8.0 enable enable Linux + .dockerignore + + + @@ -26,6 +31,7 @@ Version="3.2.0" /> + <_ContentIncludedByDefault Remove="wwwroot\bootstrap\bootstrap.min.css.map" /> - - - PreserveNewest diff --git a/src/Otchinslator/StatementController.cs b/src/Otchinslator/StatementController.cs index 3795482..02361b2 100644 --- a/src/Otchinslator/StatementController.cs +++ b/src/Otchinslator/StatementController.cs @@ -7,7 +7,6 @@ namespace Otchinslator; [ApiController] [Authorize] -[AllowAnonymous] public class StatementController(IStatementGenerator statementGenerator, IConfiguration configuration) : Controller { [HttpPost("/generateStatement")] @@ -33,7 +32,6 @@ public class StatementController(IStatementGenerator statementGenerator, IConfig return BadRequest("Некорректный курс для магистратуры"); } - var userEmail = User.Identity.Name; var userFIO = User.Claims.FirstOrDefault(x => x.Type == "name")?.Value;