готовая лаба 5!!!!!! (вроде)

2024-04-22 23:44:49 +04:00 · 2024-04-22 23:44:49 +04:00 · fed4dd969e
commit fed4dd969e
parent aa3ac27c73
10 changed files with 91 additions and 77 deletions
--- a/Confectionery/ConfectioneryClientApp/APIClient.cs
+++ b/Confectionery/ConfectioneryClientApp/APIClient.cs
@ -5,17 +5,19 @@ using System.Text;

 namespace ConfectioneryClientApp
 {
-    public static class APIClient
+    public class APIClient
    {
        private static readonly HttpClient _client = new();
+
        public static ClientViewModel? Client { get; set; } = null;
+
        public static void Connect(IConfiguration configuration)
        {
            _client.BaseAddress = new Uri(configuration["IPAddress"]);
            _client.DefaultRequestHeaders.Accept.Clear();
-            _client.DefaultRequestHeaders.Accept.Add(new
-           MediaTypeWithQualityHeaderValue("application/json"));
+            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
        }
+
        public static T? GetRequest<T>(string requestUrl)
        {
            var response = _client.GetAsync(requestUrl);
@ -29,12 +31,14 @@ namespace ConfectioneryClientApp
                throw new Exception(result);
            }
        }
+
        public static void PostRequest<T>(string requestUrl, T model)
        {
            var json = JsonConvert.SerializeObject(model);
-            var data = new StringContent(json, Encoding.UTF8,
-           "application/json");
+            var data = new StringContent(json, Encoding.UTF8, "application/json");
+
            var response = _client.PostAsync(requestUrl, data);
+
            var result = response.Result.Content.ReadAsStringAsync().Result;
            if (!response.Result.IsSuccessStatusCode)
            {
--- a/Confectionery/ConfectioneryClientApp/Controllers/HomeController.cs
+++ b/Confectionery/ConfectioneryClientApp/Controllers/HomeController.cs
@ -1,10 +1,10 @@
 using ConfectioneryClientApp.Models;
-using ConfectioneryClientApp;
 using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
-namespace AbstractShowClientApp.Controllers
+
+namespace ConfectioneryClientApp.Controllers
 {
    public class HomeController : Controller
    {
@ -38,13 +38,11 @@ namespace AbstractShowClientApp.Controllers
            {
                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
            }
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
            {
                throw new Exception("Введите логин, пароль и ФИО");
            }
-            APIClient.PostRequest("api/client/updatedata", new
-            ClientBindingModel
+            APIClient.PostRequest("api/client/updatedata", new ClientBindingModel
            {
                Id = APIClient.Client.Id,
                ClientFIO = fio,
@ -56,8 +54,7 @@ namespace AbstractShowClientApp.Controllers
            APIClient.Client.Password = password;
            Response.Redirect("Index");
        }
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None,
-        NoStore = true)]
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
        public IActionResult Error()
        {
            return View(new ErrorViewModel
@ -74,8 +71,7 @@ namespace AbstractShowClientApp.Controllers
        [HttpPost]
        public void Enter(string login, string password)
        {
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password))
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
            {
                throw new Exception("Введите логин и пароль");
            }
--- a/Confectionery/ConfectioneryClientApp/Views/Home/Create.cshtml
+++ b/Confectionery/ConfectioneryClientApp/Views/Home/Create.cshtml
@ -2,50 +2,49 @@
 	ViewData["Title"] = "Create";
 }
 <div class="text-center">
-<h2 class="display-4">Создание заказа</h2>
+	<h2 class="display-4">Создание заказа</h2>
 </div>
 <form method="post">
-<div class="row">
-<div class="col-4">Изделие:</div>
-<div class="col-8">
-<select id="product" name="product" class="form-control" aspitems="@(new SelectList(@ViewBag.Products,"Id", "ProductName"))"></select>
-</div>
-</div>
-<div class="row">
-<div class="col-4">Количество:</div>
-<div class="col-8"><input type="text" name="count" id="count"
-/></div>
-</div>
-<div class="row">
-<div class="col-4">Сумма:</div>
-<div class="col-8"><input type="text" id="sum" name="sum" readonly
-/></div>
-</div>
-<div class="row">
-<div class="col-8"></div>
-<div class="col-4"><input type="submit" value="Создать" class="btn
-btn-primary" /></div>
-</div>
+	<div class="row">
+		<div class="col-4">Выпечка:</div>
+		<div class="col-8">
+			<select id="pastry" name="pastry" class="form-control" asp-items="@(new SelectList(@ViewBag.Pastries,"Id", "PastryName"))"></select>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Количество:</div>
+		<div class="col-8"><input type="text" name="count" id="count" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Сумма:</div>
+		<div class="col-8"><input type="text" id="sum" name="sum" readonly /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Создать" class="btn btn-primary" /></div>
+	</div>
 </form>
+
 <script>
-$('#product').on('change', function () {
-check();
-});
-$('#count').on('change', function () {
-check();
-});
-function check() {
-var count = $('#count').val();
-var product = $('#product').val();
-if (count && product) {
-$.ajax({
-method: "POST",
-url: "/Home/Calc",
-data: { count: count, product: product },
-success: function (result) {
-$("#sum").val(result);
-}
-});
-};
-}
+	$('#pastry').on('change', function () {
+		check();
+	});
+	$('#count').on('change', function () {
+		check();
+	});
+
+	function check() {
+		var count = $('#count').val();
+		var pastry = $('#pastry').val();
+		if (count && pastry) {
+			$.ajax({
+				method: "POST",
+				url: "/Home/Calc",
+				data: { count: count, pastry: pastry },
+				success: function (result) {
+					$("#sum").val(result);
+				}
+			});
+		};
+	}
 </script>
--- a/Confectionery/ConfectioneryClientApp/Views/Home/Index.cshtml
+++ b/Confectionery/ConfectioneryClientApp/Views/Home/Index.cshtml
@ -23,7 +23,7 @@
 	Номер
 	</th>
 	<th>
-	Изделие
+	Выпечка
 	</th>
 	<th>
 	Дата создания
--- a/Confectionery/ConfectioneryClientApp/Views/Shared/_Layout.cshtml
+++ b/Confectionery/ConfectioneryClientApp/Views/Shared/_Layout.cshtml
@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<title>@ViewData["Title"] - AbstractShowClientApp</title>
+<title>@ViewData["Title"] - ConfectioneryClientApp</title>
 <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
 <link rel="stylesheet" href="~/css/site.css" />
 <script src="~/lib/jquery/dist/jquery.min.js"></script>
@ -44,7 +44,7 @@
 </div>
 <footer class="border-top footer text-muted">
 <div class="container">
-&copy; 2020 - Абстрактный магазин - <a asp-area="" aspcontroller="Home" asp-action="Privacy">Личные данные</a>
+&copy; 2020 - Кондитерская - <a asp-area="" aspcontroller="Home" asp-action="Privacy">Личные данные</a>
 </div>
 </footer>
 <script src="~/js/site.js" asp-append-version="true"></script>
--- a/Confectionery/ConfectioneryClientApp/appsettings.json
+++ b/Confectionery/ConfectioneryClientApp/appsettings.json
@ -6,5 +6,5 @@
    }
  },
  "AllowedHosts": "*",
-  "IPAddress": "http://localhost:7247/"
+  "IPAddress": "http://localhost:5247/"
 }
--- a/Confectionery/ConfectioneryRestApi/ConfectioneryRestApi.csproj
+++ b/Confectionery/ConfectioneryRestApi/ConfectioneryRestApi.csproj
@ -6,6 +6,18 @@
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>

+  <ItemGroup>
+    <Content Remove="log4net.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <_ContentIncludedByDefault Remove="log4net.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="log4net.config" />
+  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
--- a/Confectionery/ConfectioneryRestApi/Program.cs
+++ b/Confectionery/ConfectioneryRestApi/Program.cs
@ -7,7 +7,7 @@ using Microsoft.OpenApi.Models;
 var builder = WebApplication.CreateBuilder(args);

 builder.Logging.SetMinimumLevel(LogLevel.Trace);
-//builder.Logging.AddLog4Net("log4net.config");
+builder.Logging.AddLog4Net("log4net.config");

 // Add services to the container.
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
@ -23,7 +23,7 @@ builder.Services.AddControllers();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen(c =>
 {
-    c.SwaggerDoc("v1", new OpenApiInfo { Title = "IceCreamShopRestApi", Version = "v1" });
+    c.SwaggerDoc("v1", new OpenApiInfo { Title = "ConfectioneryRestApi", Version = "v1" });
 });

 var app = builder.Build();
--- a/Confectionery/ConfectioneryRestApi/WeatherForecast.cs
+++ b/Confectionery/ConfectioneryRestApi/WeatherForecast.cs
@ -1,13 +0,0 @@
-namespace ConfectioneryRestApi
-{
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-        public string? Summary { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryRestApi/log4net.config
+++ b/Confectionery/ConfectioneryRestApi/log4net.config
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+  <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+    <file value="c:/temp/AbstractShopRestApi.log" />
+    <appendToFile value="true" />
+    <maximumFileSize value="100KB" />
+    <maxSizeRollBackups value="2" />
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value="%date %5level %logger.%method [%line] - MESSAGE: %message%newline %exception" />
+    </layout>
+  </appender>
+  <root>
+    <level value="TRACE" />
+    <appender-ref ref="RollingFile" />
+  </root>
+</log4net>