Fixes

gluschenko · gluschenko · commit c46e8dee0e85 · 2022-08-11T00:27:35.000+03:00
diff --git a/src/CodeBaseResearch.sln b/src/CodeBaseResearch.sln
@@ -37,8 +37,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wishmaster.DataAccess", "Wi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wishmaster.Helpers.ContainerDependency", "Wishmaster.Helpers.ContainerDependency\Wishmaster.Helpers.ContainerDependency.csproj", "{48853DBB-1129-4165-82CA-D46DF79AB4A7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wishmaster.Helpers.ContainerDependency.Tool", "Wishmaster.Helpers.ContainerDependency.Tool\Wishmaster.Helpers.ContainerDependency.Tool.csproj", "{FEAED6DE-3420-4C7A-AC7B-E982E1152DE9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wishmaster.Helpers.ContainerDependency.Console", "Wishmaster.Helpers.ContainerDependency.Console\Wishmaster.Helpers.ContainerDependency.Console.csproj", "{A690C0A7-3F3A-4518-B16B-91D91A7CCCF8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{34CB587C-1143-49CD-998B-9D2EC0433B8A}"
@@ -49,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wishmaster.ViewModels", "Wi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wishmaster.Backend", "Wishmaster.Backend\Wishmaster.Backend.csproj", "{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wishmaster.Helpers.ContainerDependency.MSBuild", "Wishmaster.Helpers.ContainerDependency.MSBuild\Wishmaster.Helpers.ContainerDependency.MSBuild.csproj", "{785EE7D5-691B-497B-9101-D864ACF72317}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -95,10 +95,6 @@ Global
 		{48853DBB-1129-4165-82CA-D46DF79AB4A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{48853DBB-1129-4165-82CA-D46DF79AB4A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48853DBB-1129-4165-82CA-D46DF79AB4A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEAED6DE-3420-4C7A-AC7B-E982E1152DE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEAED6DE-3420-4C7A-AC7B-E982E1152DE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEAED6DE-3420-4C7A-AC7B-E982E1152DE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEAED6DE-3420-4C7A-AC7B-E982E1152DE9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A690C0A7-3F3A-4518-B16B-91D91A7CCCF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A690C0A7-3F3A-4518-B16B-91D91A7CCCF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A690C0A7-3F3A-4518-B16B-91D91A7CCCF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -111,6 +107,10 @@ Global
 		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{785EE7D5-691B-497B-9101-D864ACF72317}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{785EE7D5-691B-497B-9101-D864ACF72317}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{785EE7D5-691B-497B-9101-D864ACF72317}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{785EE7D5-691B-497B-9101-D864ACF72317}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -126,12 +126,12 @@ Global
 		{A8491BC6-AEF0-4D60-AB08-24AF10481529} = {1A11F1C7-3BEF-41B9-AA32-4089A82D52F5}
 		{EAB7D67C-B7CA-4AD8-A733-B012659FF478} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
 		{48853DBB-1129-4165-82CA-D46DF79AB4A7} = {34CB587C-1143-49CD-998B-9D2EC0433B8A}
-		{FEAED6DE-3420-4C7A-AC7B-E982E1152DE9} = {34CB587C-1143-49CD-998B-9D2EC0433B8A}
 		{A690C0A7-3F3A-4518-B16B-91D91A7CCCF8} = {34CB587C-1143-49CD-998B-9D2EC0433B8A}
 		{34CB587C-1143-49CD-998B-9D2EC0433B8A} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
 		{1A11F1C7-3BEF-41B9-AA32-4089A82D52F5} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
 		{2C0C33D9-F77C-4BC9-A76B-6E4684C44484} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
 		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
+		{785EE7D5-691B-497B-9101-D864ACF72317} = {34CB587C-1143-49CD-998B-9D2EC0433B8A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32FDA729-10C6-4F1C-A4ED-3CF3428EA708}
diff --git a/src/Wishmaster.Backend/Controllers/SpaceController.cs b/src/Wishmaster.Backend/Controllers/SpaceController.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Microsoft.AspNetCore.Mvc;
+﻿using Microsoft.AspNetCore.Mvc;
 using Wishmaster.Backend.Mvc;
 
 namespace Wishmaster.Backend.Controllers
diff --git a/src/Wishmaster.Backend/Models/AppData.cs b/src/Wishmaster.Backend/Models/AppData.cs
@@ -1,5 +1,4 @@
 ﻿using System.Collections.Generic;
-using System.Windows;
 
 namespace Wishmaster.Backend.Models
 {
diff --git a/src/Wishmaster.Backend/Models/Navigation/NavLink.cs b/src/Wishmaster.Backend/Models/Navigation/NavLink.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using Wishmaster.ViewModels;
+﻿using Wishmaster.ViewModels;
 
 namespace Wishmaster.Backend.Models.Navigation
 {
diff --git a/src/Wishmaster.Helpers.ContainerDependency.MSBuild/Class1.cs b/src/Wishmaster.Helpers.ContainerDependency.MSBuild/Class1.cs
@@ -0,0 +1,7 @@
+﻿namespace Wishmaster.Helpers.ContainerDependency.MSBuild
+{
+    public class Class1
+    {
+
+    }
+}
diff --git a/src/Wishmaster.Helpers.ContainerDependency.MSBuild/Wishmaster.Helpers.ContainerDependency.MSBuild.csproj b/src/Wishmaster.Helpers.ContainerDependency.MSBuild/Wishmaster.Helpers.ContainerDependency.MSBuild.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Wishmaster.Helpers.ContainerDependency/DotNetSolutionParser.cs b/src/Wishmaster.Helpers.ContainerDependency/DotNetSolutionParser.cs
@@ -1,8 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Wishmaster.Helpers.ContainerDependency.Models;
 
 namespace Wishmaster.Helpers.ContainerDependency
diff --git a/src/Wishmaster/App.xaml.cs b/src/Wishmaster/App.xaml.cs
@@ -6,9 +6,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Wishmaster.DataAccess;
 using Wishmaster.Backend.Mvc;
 using Wishmaster.Backend.Services;
+using Wishmaster.DataAccess;
 using Wishmaster.Views;
 
 namespace Wishmaster
diff --git a/src/Wishmaster/WebStartup.cs b/src/Wishmaster/WebStartup.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
diff --git a/src/Wishmaster/Wishmaster.csproj b/src/Wishmaster/Wishmaster.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <Target Name="NSwag" AfterTargets="Build">
-    <Exec Command="$(NSwagExe_Net60) run models_new.nswag /variables:Configuration=$(Configuration)" />
+    <Exec Command="$(NSwagExe_Net60) run models.nswag /variables:Configuration=$(Configuration)" />
   </Target>
 
   <Target Name="PreBuildRelease" BeforeTargets="PreBuildEvent" Condition="'$(Configuration)' == 'Release'">
diff --git a/src/Wishmaster/client-app/src/App.tsx b/src/Wishmaster/client-app/src/App.tsx
@@ -1,18 +1,19 @@
-import { useState } from 'react'
-import logo from './logo.svg'
 import { BrowserRouter, Route, Link, Routes } from "react-router-dom";
 import MainPage from './Components/Pages/MainPage/MainPage';
 import SettingsPage from './Components/Pages/SettingsPage/SettingsPage';
+import AppData from './Components/Layout/AppData/AppData';
 
 function App() {
     return (
-        <BrowserRouter>
-            <Routes>
-                <Route path="/" element={<MainPage />} />
-                <Route path="/settings" element={<SettingsPage />} />
-                <Route path="*" element={<div>Not found</div>} />
-            </Routes>
-        </BrowserRouter>
+        <AppData>
+            <BrowserRouter>
+                <Routes>
+                    <Route path="/" element={<MainPage />} />
+                    <Route path="/settings" element={<SettingsPage />} />
+                    <Route path="*" element={<div>Not found</div>} />
+                </Routes>
+            </BrowserRouter>
+        </AppData>
     );
 }
 
diff --git a/src/Wishmaster/client-app/src/Components/Layout/AppData/AppData.tsx b/src/Wishmaster/client-app/src/Components/Layout/AppData/AppData.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import { AppDataClient, AppDataViewModel } from '../../../models';
+
+interface IAppDataProps {
+    children?: React.ReactNode;
+}
+
+const AppData: React.FC<IAppDataProps> = (props) => {
+
+    const [appData, setAppData] = React.useState<AppDataViewModel | null>(null);
+
+    React.useEffect(() => {
+        const appDataClient = new AppDataClient();
+
+        appDataClient.getAppData()
+            .then(x => setAppData(x))
+            // TODO
+            .catch(x => console.log(x));
+    }, []);
+
+    return (
+        <div>
+            <div>
+                <pre>
+                    {JSON.stringify(appData, null, 2)}
+                </pre>
+            </div>
+            {props.children}
+        </div>
+    );
+};
+
+export default AppData;
diff --git a/src/Wishmaster/models.nswag b/src/Wishmaster/models.nswag
@@ -2,32 +2,59 @@
   "runtime": "Net60",
   "defaultVariables": "Configuration=Debug",
   "documentGenerator": {
-    "typesToOpenApi": {
-      "classNames": [
-        "Wishmaster.ViewModels.*",
-        "Wishmaster.ViewModels.*.*",
-        "Wishmaster.ViewModels.*.*.*",
-        "Wishmaster.ViewModels.*.*.*.*",
-        "Wishmaster.ViewModels.*.*.*.*.*"
-      ],
-      "defaultPropertyNameHandling": "CamelCase",
+    "aspNetCoreToOpenApi": {
+      "project": "Wishmaster.csproj",
+      "msBuildProjectExtensionsPath": null,
+      "configuration": null,
+      "runtime": null,
+      "targetFramework": null,
+      "noBuild": true,
+      "msBuildOutputPath": null,
+      "verbose": true,
+      "workingDirectory": null,
+      "requireParametersWithoutDefault": false,
+      "apiGroupNames": null,
+      "defaultPropertyNameHandling": "Default",
       "defaultReferenceTypeNullHandling": "Null",
       "defaultDictionaryValueReferenceTypeNullHandling": "NotNull",
+      "defaultResponseReferenceTypeNullHandling": "NotNull",
+      "generateOriginalParameterNames": true,
       "defaultEnumHandling": "Integer",
       "flattenInheritanceHierarchy": false,
-      "ignoreObsoleteProperties": false,
-      "allowReferencesWithProperties": false,
       "generateKnownTypes": true,
       "generateEnumMappingDescription": false,
       "generateXmlObjects": false,
+      "generateAbstractProperties": false,
+      "generateAbstractSchemas": true,
+      "ignoreObsoleteProperties": false,
+      "allowReferencesWithProperties": false,
       "useXmlDocumentation": true,
       "resolveExternalXmlDocumentation": true,
+      "excludedTypeNames": [],
+      "serviceHost": null,
+      "serviceBasePath": null,
+      "serviceSchemes": [],
+      "infoTitle": "My Title",
+      "infoDescription": null,
+      "infoVersion": "1.0.0",
+      "documentTemplate": null,
+      "documentProcessorTypes": [],
+      "operationProcessorTypes": [],
+      "typeNameGeneratorType": null,
+      "schemaNameGeneratorType": null,
+      "contractResolverType": null,
+      "serializerSettingsType": null,
+      "useDocumentProvider": true,
+      "documentName": "v1",
+      "aspNetCoreEnvironment": null,
+      "createWebHostBuilderMethod": null,
+      "startupType": null,
+      "allowNullableBodyParameters": true,
+      "useHttpAttributeNameAsOperationId": false,
       "output": null,
       "outputType": "Swagger2",
       "newLineBehavior": "Auto",
-      "assemblyPaths": [
-        "../Wishmaster.Backend/bin/$(Configuration)/net6.0/Wishmaster.Backend.dll"
-      ],
+      "assemblyPaths": [],
       "assemblyConfig": null,
       "referencePaths": [],
       "useNuGetCache": false
@@ -46,9 +73,9 @@
       "useSingletonProvider": false,
       "injectionTokenType": "OpaqueToken",
       "rxJsVersion": 6.0,
-      "dateTimeType": "DayJS",
+      "dateTimeType": "String",
       "nullValue": "Null",
-      "generateClientClasses": false,
+      "generateClientClasses": true,
       "generateClientInterfaces": false,
       "generateOptionalParameters": false,
       "exportTypes": true,
@@ -64,7 +91,7 @@
       "useTransformOptionsMethod": false,
       "useTransformResultMethod": false,
       "generateDtoTypes": true,
-      "operationGenerationMode": "MultipleClientsFromOperationId",
+      "operationGenerationMode": "MultipleClientsFromPathSegments",
       "markOptionalProperties": false,
       "generateCloneMethod": false,
       "typeStyle": "Interface",
@@ -84,7 +111,7 @@
       "useGetBaseUrlMethod": false,
       "baseUrlTokenName": "API_BASE_URL",
       "queryNullValue": "",
-      "useAbortSignal": false,
+      "useAbortSignal": true,
       "inlineNamedDictionaries": false,
       "inlineNamedAny": false,
       "includeHttpContext": false,
diff --git a/src/Wishmaster/models_old.nswag b/src/Wishmaster/models_old.nswag

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using System.Windows;`
`3`	`2`
`4`	`3`	`namespace Wishmaster.Backend.Models`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`		`-using Wishmaster.ViewModels;`
	`1`	`+using Wishmaster.ViewModels;`
`5`	`2`
`6`	`3`	`namespace Wishmaster.Backend.Models.Navigation`
`7`	`4`	`{`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +namespace Wishmaster.Helpers.ContainerDependency.MSBuild
 +{
 +    public class Class1
 +    {
++
 +    }
 +}