varianta proiect care merge
This commit is contained in:
@@ -13,7 +13,7 @@ using System.Reflection;
|
||||
[assembly: System.Reflection.AssemblyCompanyAttribute("HealthcareManagerUI")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+90604e48ae9f78fa417a446c05f7759001447de5")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+370bbdedcdfe038ea993900ddae1030e313dff4b")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("HealthcareManagerUI")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("HealthcareManagerUI")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
ab066e9096346068223b71b3fe69040bd32f1c1da8d97eddb6a2399e719e2e24
|
||||
3d546a9872af120a53b790688fd76a7eda71714302a64f35d4973c1dba8fac75
|
||||
|
||||
+8
@@ -18,6 +18,10 @@ build_property.GenerateRazorMetadataSourceChecksumAttributes =
|
||||
build_property.MSBuildProjectDirectory = C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI
|
||||
build_property._RazorSourceGeneratorDebug =
|
||||
|
||||
[C:/Users/Andrei Cerbu/Documents/FACULTATE/CC-FinalProj/frontend/HealthcareManagerUI/App.razor]
|
||||
build_metadata.AdditionalFiles.TargetPath = QXBwLnJhem9y
|
||||
build_metadata.AdditionalFiles.CssScope =
|
||||
|
||||
[C:/Users/Andrei Cerbu/Documents/FACULTATE/CC-FinalProj/frontend/HealthcareManagerUI/Components/Layout/AuthLayout.razor]
|
||||
build_metadata.AdditionalFiles.TargetPath = Q29tcG9uZW50c1xMYXlvdXRcQXV0aExheW91dC5yYXpvcg==
|
||||
build_metadata.AdditionalFiles.CssScope =
|
||||
@@ -45,3 +49,7 @@ build_metadata.AdditionalFiles.CssScope =
|
||||
[C:/Users/Andrei Cerbu/Documents/FACULTATE/CC-FinalProj/frontend/HealthcareManagerUI/Components/Pages/ResetPasswordPage.razor]
|
||||
build_metadata.AdditionalFiles.TargetPath = Q29tcG9uZW50c1xQYWdlc1xSZXNldFBhc3N3b3JkUGFnZS5yYXpvcg==
|
||||
build_metadata.AdditionalFiles.CssScope =
|
||||
|
||||
[C:/Users/Andrei Cerbu/Documents/FACULTATE/CC-FinalProj/frontend/HealthcareManagerUI/_Imports.razor]
|
||||
build_metadata.AdditionalFiles.TargetPath = X0ltcG9ydHMucmF6b3I=
|
||||
build_metadata.AdditionalFiles.CssScope =
|
||||
|
||||
Binary file not shown.
BIN
Binary file not shown.
+1
@@ -0,0 +1 @@
|
||||
77f2f066ecd8e1bf49bc70291e53f4622661d109e7508906f2a2c3238ed55638
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\appsettings.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\HealthcareManagerUI.staticwebassets.runtime.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\HealthcareManagerUI.exe
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\HealthcareManagerUI.deps.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\HealthcareManagerUI.runtimeconfig.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\HealthcareManagerUI.dll
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\HealthcareManagerUI.pdb
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\bin\Debug\net8.0\Blazored.LocalStorage.dll
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.csproj.AssemblyReference.cache
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.AssemblyInfoInputs.cache
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.AssemblyInfo.cs
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.csproj.CoreCompileInputs.cache
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.MvcApplicationPartsAssemblyInfo.cache
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.sourcelink.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\staticwebassets.build.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\staticwebassets.development.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\staticwebassets\msbuild.HealthcareManagerUI.Microsoft.AspNetCore.StaticWebAssets.props
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\staticwebassets\msbuild.build.HealthcareManagerUI.props
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\staticwebassets\msbuild.buildMultiTargeting.HealthcareManagerUI.props
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\staticwebassets\msbuild.buildTransitive.HealthcareManagerUI.props
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\staticwebassets.pack.json
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\scopedcss\bundle\HealthcareManagerUI.styles.css
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\Healthca.1F7B281D.Up2Date
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.dll
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\refint\HealthcareManagerUI.dll
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.pdb
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\HealthcareManagerUI.genruntimeconfig.cache
|
||||
C:\Users\Andrei Cerbu\Documents\FACULTATE\CC-FinalProj\frontend\HealthcareManagerUI\obj\Debug\net8.0\ref\HealthcareManagerUI.dll
|
||||
Binary file not shown.
+1
@@ -0,0 +1 @@
|
||||
3231e0bfd283add095407b83cbf95ab6bb075d4d4878e1f5f0f73a98c6ea07d4
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
{"documents":{"C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\*":"https://raw.githubusercontent.com/andrei-mihnea-cerbu/CC-FinalProj/370bbdedcdfe038ea993900ddae1030e313dff4b/*"}}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,58 @@
|
||||
{
|
||||
"Version": 1,
|
||||
"Hash": "S52Knzo0P9p9Y5AgMACcjm44VHDwZuB1lQdl1MS5a1Q=",
|
||||
"Source": "HealthcareManagerUI",
|
||||
"BasePath": "_content/HealthcareManagerUI",
|
||||
"Mode": "Default",
|
||||
"ManifestType": "Build",
|
||||
"ReferencedProjectsConfiguration": [],
|
||||
"DiscoveryPatterns": [
|
||||
{
|
||||
"Name": "HealthcareManagerUI\\wwwroot",
|
||||
"Source": "HealthcareManagerUI",
|
||||
"ContentRoot": "C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\",
|
||||
"BasePath": "_content/HealthcareManagerUI",
|
||||
"Pattern": "**"
|
||||
}
|
||||
],
|
||||
"Assets": [
|
||||
{
|
||||
"Identity": "C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\AuthLayout.css",
|
||||
"SourceId": "HealthcareManagerUI",
|
||||
"SourceType": "Discovered",
|
||||
"ContentRoot": "C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\",
|
||||
"BasePath": "_content/HealthcareManagerUI",
|
||||
"RelativePath": "AuthLayout.css",
|
||||
"AssetKind": "All",
|
||||
"AssetMode": "All",
|
||||
"AssetRole": "Primary",
|
||||
"AssetMergeBehavior": "PreferTarget",
|
||||
"AssetMergeSource": "",
|
||||
"RelatedAsset": "",
|
||||
"AssetTraitName": "",
|
||||
"AssetTraitValue": "",
|
||||
"CopyToOutputDirectory": "Never",
|
||||
"CopyToPublishDirectory": "PreserveNewest",
|
||||
"OriginalItemSpec": "wwwroot\\AuthLayout.css"
|
||||
},
|
||||
{
|
||||
"Identity": "C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\LoginPage.css",
|
||||
"SourceId": "HealthcareManagerUI",
|
||||
"SourceType": "Discovered",
|
||||
"ContentRoot": "C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\",
|
||||
"BasePath": "_content/HealthcareManagerUI",
|
||||
"RelativePath": "LoginPage.css",
|
||||
"AssetKind": "All",
|
||||
"AssetMode": "All",
|
||||
"AssetRole": "Primary",
|
||||
"AssetMergeBehavior": "PreferTarget",
|
||||
"AssetMergeSource": "",
|
||||
"RelatedAsset": "",
|
||||
"AssetTraitName": "",
|
||||
"AssetTraitValue": "",
|
||||
"CopyToOutputDirectory": "Never",
|
||||
"CopyToPublishDirectory": "PreserveNewest",
|
||||
"OriginalItemSpec": "wwwroot\\LoginPage.css"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
{"ContentRoots":["C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\"],"Root":{"Children":{"AuthLayout.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"AuthLayout.css"},"Patterns":null},"LoginPage.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"LoginPage.css"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"Files": [
|
||||
{
|
||||
"Id": "C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\AuthLayout.css",
|
||||
"PackagePath": "staticwebassets\\AuthLayout.css"
|
||||
},
|
||||
{
|
||||
"Id": "C:\\Users\\Andrei Cerbu\\Documents\\FACULTATE\\CC-FinalProj\\frontend\\HealthcareManagerUI\\wwwroot\\LoginPage.css",
|
||||
"PackagePath": "staticwebassets\\LoginPage.css"
|
||||
},
|
||||
{
|
||||
"Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.HealthcareManagerUI.Microsoft.AspNetCore.StaticWebAssets.props",
|
||||
"PackagePath": "build\\Microsoft.AspNetCore.StaticWebAssets.props"
|
||||
},
|
||||
{
|
||||
"Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.build.HealthcareManagerUI.props",
|
||||
"PackagePath": "build\\HealthcareManagerUI.props"
|
||||
},
|
||||
{
|
||||
"Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.buildMultiTargeting.HealthcareManagerUI.props",
|
||||
"PackagePath": "buildMultiTargeting\\HealthcareManagerUI.props"
|
||||
},
|
||||
{
|
||||
"Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.buildTransitive.HealthcareManagerUI.props",
|
||||
"PackagePath": "buildTransitive\\HealthcareManagerUI.props"
|
||||
}
|
||||
],
|
||||
"ElementsToRemove": []
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\AuthLayout.css))">
|
||||
<SourceType>Package</SourceType>
|
||||
<SourceId>HealthcareManagerUI</SourceId>
|
||||
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
|
||||
<BasePath>_content/HealthcareManagerUI</BasePath>
|
||||
<RelativePath>AuthLayout.css</RelativePath>
|
||||
<AssetKind>All</AssetKind>
|
||||
<AssetMode>All</AssetMode>
|
||||
<AssetRole>Primary</AssetRole>
|
||||
<RelatedAsset></RelatedAsset>
|
||||
<AssetTraitName></AssetTraitName>
|
||||
<AssetTraitValue></AssetTraitValue>
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
||||
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\AuthLayout.css))</OriginalItemSpec>
|
||||
</StaticWebAsset>
|
||||
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\LoginPage.css))">
|
||||
<SourceType>Package</SourceType>
|
||||
<SourceId>HealthcareManagerUI</SourceId>
|
||||
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
|
||||
<BasePath>_content/HealthcareManagerUI</BasePath>
|
||||
<RelativePath>LoginPage.css</RelativePath>
|
||||
<AssetKind>All</AssetKind>
|
||||
<AssetMode>All</AssetMode>
|
||||
<AssetRole>Primary</AssetRole>
|
||||
<RelatedAsset></RelatedAsset>
|
||||
<AssetTraitName></AssetTraitName>
|
||||
<AssetTraitValue></AssetTraitValue>
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
||||
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\LoginPage.css))</OriginalItemSpec>
|
||||
</StaticWebAsset>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
<Project>
|
||||
<Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
|
||||
</Project>
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
<Project>
|
||||
<Import Project="..\build\HealthcareManagerUI.props" />
|
||||
</Project>
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
<Project>
|
||||
<Import Project="..\buildMultiTargeting\HealthcareManagerUI.props" />
|
||||
</Project>
|
||||
Reference in New Issue
Block a user