diff --git a/.vs/DemoService/FileContentIndex/3c3c1aa7-11f6-4888-b018-12140714ce59.vsidx b/.vs/DemoService/FileContentIndex/3c3c1aa7-11f6-4888-b018-12140714ce59.vsidx deleted file mode 100644 index 6d14d11..0000000 Binary files a/.vs/DemoService/FileContentIndex/3c3c1aa7-11f6-4888-b018-12140714ce59.vsidx and /dev/null differ diff --git a/.vs/DemoService/FileContentIndex/7c165b84-e14c-44bd-97c4-af1e32fd9315.vsidx b/.vs/DemoService/FileContentIndex/7c165b84-e14c-44bd-97c4-af1e32fd9315.vsidx new file mode 100644 index 0000000..546e8c9 Binary files /dev/null and b/.vs/DemoService/FileContentIndex/7c165b84-e14c-44bd-97c4-af1e32fd9315.vsidx differ diff --git a/.vs/DemoService/v17/.futdcache.v2 b/.vs/DemoService/v17/.futdcache.v2 index 9b132a8..dcc12d1 100644 Binary files a/.vs/DemoService/v17/.futdcache.v2 and b/.vs/DemoService/v17/.futdcache.v2 differ diff --git a/.vs/DemoService/v17/.suo b/.vs/DemoService/v17/.suo index 70910a9..68a1c62 100644 Binary files a/.vs/DemoService/v17/.suo and b/.vs/DemoService/v17/.suo differ diff --git a/.vs/DemoService/v17/DocumentLayout.json b/.vs/DemoService/v17/DocumentLayout.json index aa0908d..9f69fff 100644 --- a/.vs/DemoService/v17/DocumentLayout.json +++ b/.vs/DemoService/v17/DocumentLayout.json @@ -7,40 +7,40 @@ "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\class_student\\desktop\\xofei\\demoservice\\utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -54,7 +54,7 @@ "Children": [ { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 7, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\App.axaml", "RelativeDocumentMoniker": "App.axaml", @@ -66,7 +66,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 5, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", @@ -78,7 +78,7 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 4, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", @@ -91,7 +91,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "ServiceWindow.axaml", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", "RelativeDocumentMoniker": "ServiceWindow.axaml", @@ -109,14 +109,14 @@ "RelativeDocumentMoniker": "ServiceWindow.axaml.cs", "ToolTip": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml.cs", "RelativeToolTip": "ServiceWindow.axaml.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABIAAAAnAAAA", + "ViewState": "AQIAAEwAAAAAAAAAAAAmwBgAAAApAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:22:27.057Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 1, "Title": "AddEditWindow.axaml", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml", "RelativeDocumentMoniker": "AddEditWindow.axaml", @@ -128,7 +128,7 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 8, "Title": "AddEditWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml.cs", "RelativeDocumentMoniker": "AddEditWindow.axaml.cs", @@ -141,13 +141,13 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 9, "Title": "Context.cs", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\Utils\\Context.cs", "RelativeDocumentMoniker": "Utils\\Context.cs", "ToolTip": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\Utils\\Context.cs", "RelativeToolTip": "Utils\\Context.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABEAAAAAAAAA", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAA4AAAAvAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:39:51.541Z", "EditorCaption": "" @@ -160,14 +160,14 @@ "RelativeDocumentMoniker": "Models\\Service.cs", "ToolTip": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\Models\\Service.cs", "RelativeToolTip": "Models\\Service.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABkAAAAAAAAA", + "ViewState": "AQIAAAAAAAAAAAAAAAAAACIAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T11:00:44.489Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "Colors.cs", "DocumentMoniker": "C:\\Users\\Class_Student\\Desktop\\Xofei\\DemoService\\Colors.cs", "RelativeDocumentMoniker": "Colors.cs", diff --git a/.vs/ProjectEvaluation/demoservice.metadata.v7.bin b/.vs/ProjectEvaluation/demoservice.metadata.v7.bin index 16dc571..fb1a596 100644 Binary files a/.vs/ProjectEvaluation/demoservice.metadata.v7.bin and b/.vs/ProjectEvaluation/demoservice.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/demoservice.projects.v7.bin b/.vs/ProjectEvaluation/demoservice.projects.v7.bin index 56edaee..febef04 100644 Binary files a/.vs/ProjectEvaluation/demoservice.projects.v7.bin and b/.vs/ProjectEvaluation/demoservice.projects.v7.bin differ diff --git a/MainWindow.axaml b/MainWindow.axaml index 4040b0a..4dbff6b 100644 --- a/MainWindow.axaml +++ b/MainWindow.axaml @@ -19,7 +19,9 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ServiceWindow.axaml.cs b/ServiceWindow.axaml.cs index 431226b..76f7a74 100644 --- a/ServiceWindow.axaml.cs +++ b/ServiceWindow.axaml.cs @@ -1,10 +1,12 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; +using Avalonia.Input; using Avalonia.Markup.Xaml; using DemoService.Models; using System.Collections.Generic; using System.Linq; +using Avalonia.Media.TextFormatting; namespace DemoService; @@ -16,22 +18,32 @@ public partial class ServiceWindow : Window { InitializeComponent(); ServicesListBox.ItemsSource = displayList; + UserServicesListBox.ItemsSource = displayList; + ServicesListBox.Background = Colors.lightYellow; + UserServicesListBox.Background = Colors.lightYellow; SortComboBox.SelectedIndex = 0; + FilterComboBox.SelectedIndex = 0; } public ServiceWindow(bool admin) { InitializeComponent(); AdminMode = admin; - if (!admin) + switch (AdminMode) { - AddButton.IsVisible = false; + case true: + ServicesListBox.ItemsSource = displayList; + UserServicesListBox.IsVisible = false; + ServicesListBox.Background = Colors.lightYellow; + break; + case false: + AddButton.IsVisible = false; + UserServicesListBox.ItemsSource = displayList; + ServicesListBox.IsVisible = false; + UserServicesListBox.Background = Colors.lightYellow; + break; } - ServicesListBox.ItemsSource = displayList; - /*foreach (var service in ServicesListBox.ItemsSource) - { - - }*/ SortComboBox.SelectedIndex = 0; + FilterComboBox.SelectedIndex = 0; } public void AddButtonClick(object sender, RoutedEventArgs args) { @@ -48,25 +60,30 @@ public partial class ServiceWindow : Window } return null; }*/ - - private void AddButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e) + private void AddButton_Click(object? sender, RoutedEventArgs e) { AddEditWindow addEditWindow = new(); addEditWindow.Show(); Close(); } - - private void SortComboBox_SelectionChanged(object? sender, Avalonia.Controls.SelectionChangedEventArgs e) + private void SortComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e) + { + DisplayService(); + } + private void SearchTextBox_KeyUp(object? sender, KeyEventArgs e) + { + DisplayService(); + } + private void FilterComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e) { DisplayService(); } - private void DisplayService() { + displayList = Utils.Context.Services; switch (SortComboBox.SelectedIndex) { case 0: - displayList = Utils.Context.Services; break; case 1: displayList = displayList.OrderBy(service => service.Cost).ToList(); @@ -75,6 +92,30 @@ public partial class ServiceWindow : Window displayList = displayList.OrderByDescending(service => service.Cost).ToList(); break; } + switch (FilterComboBox.SelectedIndex) + { + case 0: + break; + case 1: + displayList = displayList.Where(x => x.Discount >= 0 && x.Discount < (decimal)0.05).ToList(); + break; + case 2: + displayList = displayList.Where(x => x.Discount >= (decimal)0.05 && x.Discount < (decimal)0.15).ToList(); + break; + case 3: + displayList = displayList.Where(x => x.Discount >= (decimal)0.15 && x.Discount < (decimal)0.30).ToList(); + break; + case 4: + displayList = displayList.Where(x => x.Discount >= (decimal)0.30 && x.Discount < (decimal)0.70).ToList(); + break; + case 5: + displayList = displayList.Where(x => x.Discount >= (decimal)0.70 && x.Discount < (decimal)1.00).ToList(); + break; + } + if (!string.IsNullOrEmpty(SearchTextBox.Text)) + { + displayList = displayList.Where(x => x.Title.ToLower().Contains(SearchTextBox.Text.ToLower())).ToList(); + } ServicesListBox.ItemsSource = displayList; } } \ No newline at end of file diff --git a/bin/Debug/net8.0/DemoService.dll b/bin/Debug/net8.0/DemoService.dll index 796b1e6..54f6b88 100644 Binary files a/bin/Debug/net8.0/DemoService.dll and b/bin/Debug/net8.0/DemoService.dll differ diff --git a/bin/Debug/net8.0/DemoService.exe b/bin/Debug/net8.0/DemoService.exe index 5bb8fc5..e3ba9ac 100644 Binary files a/bin/Debug/net8.0/DemoService.exe and b/bin/Debug/net8.0/DemoService.exe differ diff --git a/bin/Debug/net8.0/DemoService.pdb b/bin/Debug/net8.0/DemoService.pdb index 089f490..fb7eaba 100644 Binary files a/bin/Debug/net8.0/DemoService.pdb and b/bin/Debug/net8.0/DemoService.pdb differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/diz.jpg b/bin/Debug/net8.0/Услуги автосервиса/diz.jpg new file mode 100644 index 0000000..bb6d0c6 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/diz.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/rulevoe-upravlenie-avtomobilya.jpg b/bin/Debug/net8.0/Услуги автосервиса/rulevoe-upravlenie-avtomobilya.jpg new file mode 100644 index 0000000..1f63a94 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/rulevoe-upravlenie-avtomobilya.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/transmission.jpg b/bin/Debug/net8.0/Услуги автосервиса/transmission.jpg new file mode 100644 index 0000000..d6bee7a Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/transmission.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/АКПП.jpg b/bin/Debug/net8.0/Услуги автосервиса/АКПП.jpg new file mode 100644 index 0000000..05712af Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/АКПП.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Вариатор.jpg b/bin/Debug/net8.0/Услуги автосервиса/Вариатор.jpg new file mode 100644 index 0000000..dab9ab0 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Вариатор.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Выхлопная система.jpg b/bin/Debug/net8.0/Услуги автосервиса/Выхлопная система.jpg new file mode 100644 index 0000000..84a5499 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Выхлопная система.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/ГУР.png b/bin/Debug/net8.0/Услуги автосервиса/ГУР.png new file mode 100644 index 0000000..f44d643 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/ГУР.png differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Двигатель.png b/bin/Debug/net8.0/Услуги автосервиса/Двигатель.png new file mode 100644 index 0000000..9887cf5 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Двигатель.png differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Дополнительные услуги.png b/bin/Debug/net8.0/Услуги автосервиса/Дополнительные услуги.png new file mode 100644 index 0000000..fea97ed Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Дополнительные услуги.png differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/КПП.png b/bin/Debug/net8.0/Услуги автосервиса/КПП.png new file mode 100644 index 0000000..f480034 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/КПП.png differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Кондиционер.jpg b/bin/Debug/net8.0/Услуги автосервиса/Кондиционер.jpg new file mode 100644 index 0000000..7f18699 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Кондиционер.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Подвеска.png b/bin/Debug/net8.0/Услуги автосервиса/Подвеска.png new file mode 100644 index 0000000..0b310b2 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Подвеска.png differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Сцепление.jpg b/bin/Debug/net8.0/Услуги автосервиса/Сцепление.jpg new file mode 100644 index 0000000..dea13cb Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Сцепление.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Техническое обслуживание.png b/bin/Debug/net8.0/Услуги автосервиса/Техническое обслуживание.png new file mode 100644 index 0000000..b9c2d04 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Техническое обслуживание.png differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Топливная система.png b/bin/Debug/net8.0/Услуги автосервиса/Топливная система.png new file mode 100644 index 0000000..7990d1e Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Топливная система.png differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Шиномонтаж.jpg b/bin/Debug/net8.0/Услуги автосервиса/Шиномонтаж.jpg new file mode 100644 index 0000000..b17156e Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Шиномонтаж.jpg differ diff --git a/bin/Debug/net8.0/Услуги автосервиса/Электрика.png b/bin/Debug/net8.0/Услуги автосервиса/Электрика.png new file mode 100644 index 0000000..ac0bd50 Binary files /dev/null and b/bin/Debug/net8.0/Услуги автосервиса/Электрика.png differ diff --git a/obj/Debug/net8.0/Avalonia/original.dll b/obj/Debug/net8.0/Avalonia/original.dll index 9f8f8ca..f651b80 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.dll and b/obj/Debug/net8.0/Avalonia/original.dll differ diff --git a/obj/Debug/net8.0/Avalonia/original.pdb b/obj/Debug/net8.0/Avalonia/original.pdb index ff8700c..9e68294 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.pdb and b/obj/Debug/net8.0/Avalonia/original.pdb differ diff --git a/obj/Debug/net8.0/Avalonia/original.ref.dll b/obj/Debug/net8.0/Avalonia/original.ref.dll index bc7a9d0..f4977cb 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.ref.dll and b/obj/Debug/net8.0/Avalonia/original.ref.dll differ diff --git a/obj/Debug/net8.0/Avalonia/resources b/obj/Debug/net8.0/Avalonia/resources index 1f7b550..1bef96c 100644 Binary files a/obj/Debug/net8.0/Avalonia/resources and b/obj/Debug/net8.0/Avalonia/resources differ diff --git a/obj/Debug/net8.0/DemoService.AssemblyInfo.cs b/obj/Debug/net8.0/DemoService.AssemblyInfo.cs index 8e7e019..0e11b22 100644 --- a/obj/Debug/net8.0/DemoService.AssemblyInfo.cs +++ b/obj/Debug/net8.0/DemoService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("DemoService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+609078ea462253630054069be0330dc4b3f38a0e")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+637276e6f1ae2f151c8bcb1b5548e94a3aad69e5")] [assembly: System.Reflection.AssemblyProductAttribute("DemoService")] [assembly: System.Reflection.AssemblyTitleAttribute("DemoService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache b/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache index e066d2f..571dc2f 100644 --- a/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache @@ -1 +1 @@ -9eeb21b35df534b1e2f2b94e81e5de38ee31b8487505819886f13062429cfbfb +450845604949cc7c05026513da56f34051141ae7614eaaab1866abf2954968cf diff --git a/obj/Debug/net8.0/DemoService.dll b/obj/Debug/net8.0/DemoService.dll index 796b1e6..54f6b88 100644 Binary files a/obj/Debug/net8.0/DemoService.dll and b/obj/Debug/net8.0/DemoService.dll differ diff --git a/obj/Debug/net8.0/DemoService.pdb b/obj/Debug/net8.0/DemoService.pdb index 089f490..fb7eaba 100644 Binary files a/obj/Debug/net8.0/DemoService.pdb and b/obj/Debug/net8.0/DemoService.pdb differ diff --git a/obj/Debug/net8.0/apphost.exe b/obj/Debug/net8.0/apphost.exe index 5bb8fc5..e3ba9ac 100644 Binary files a/obj/Debug/net8.0/apphost.exe and b/obj/Debug/net8.0/apphost.exe differ diff --git a/obj/Debug/net8.0/ref/DemoService.dll b/obj/Debug/net8.0/ref/DemoService.dll index 13138d8..accf97c 100644 Binary files a/obj/Debug/net8.0/ref/DemoService.dll and b/obj/Debug/net8.0/ref/DemoService.dll differ diff --git a/obj/Debug/net8.0/refint/DemoService.dll b/obj/Debug/net8.0/refint/DemoService.dll index 13138d8..accf97c 100644 Binary files a/obj/Debug/net8.0/refint/DemoService.dll and b/obj/Debug/net8.0/refint/DemoService.dll differ