diff --git a/.vs/CoreFinik/v17/.wsuo b/.vs/CoreFinik/v17/.wsuo new file mode 100644 index 0000000..9fdb5a9 Binary files /dev/null and b/.vs/CoreFinik/v17/.wsuo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..6b61141 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..549debd Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfo.cs b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfo.cs index 229c5bb..189e491 100644 --- a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfo.cs +++ b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfo.cs @@ -13,7 +13,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.API")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d71b8e4e3e7e2bf2c01358a99db0d20f6b2629c0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.API")] [assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.API")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfoInputs.cache b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfoInputs.cache index 1005dc1..7e3d4b6 100644 --- a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfoInputs.cache +++ b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.AssemblyInfoInputs.cache @@ -1 +1 @@ -ff3fec8ffa0d1fda8036272d0a3e7c1f4c01fd68f83eec459a4e5305a7d778f0 +91a53e534df9dbc46745910769e891e8a1c21ef6b45e012f7df82de59de91441 diff --git a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.GeneratedMSBuildEditorConfig.editorconfig index 61733eb..e93866b 100644 --- a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.GeneratedMSBuildEditorConfig.editorconfig +++ b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.GeneratedMSBuildEditorConfig.editorconfig @@ -9,11 +9,11 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = CoreFinik.API build_property.RootNamespace = CoreFinik.API -build_property.ProjectDir = /Users/otabek_coding/Desktop/Najot Ta'lim/Front-End/Finik/Back-End/CoreFinik.API/ +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.API\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 8.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = /Users/otabek_coding/Desktop/Najot Ta'lim/Front-End/Finik/Back-End/CoreFinik.API +build_property.MSBuildProjectDirectory = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.API build_property._RazorSourceGeneratorDebug = diff --git a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.assets.cache b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.assets.cache index 9e758e4..bf20af5 100644 Binary files a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.assets.cache and b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.assets.cache differ diff --git a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.csproj.AssemblyReference.cache b/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.csproj.AssemblyReference.cache deleted file mode 100644 index 402d818..0000000 Binary files a/Back-End/CoreFinik.API/obj/Debug/net8.0/CoreFinik.API.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Back-End/CoreFinik.API/obj/Debug/net8.0/apphost.exe b/Back-End/CoreFinik.API/obj/Debug/net8.0/apphost.exe new file mode 100644 index 0000000..f28e295 Binary files /dev/null and b/Back-End/CoreFinik.API/obj/Debug/net8.0/apphost.exe differ diff --git a/Back-End/CoreFinik.API/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/Back-End/CoreFinik.API/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/Back-End/CoreFinik.API/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.AssemblyInfo.cs b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.AssemblyInfo.cs new file mode 100644 index 0000000..d16b00c --- /dev/null +++ b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.API")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.API")] +[assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.API")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.AssemblyInfoInputs.cache b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.AssemblyInfoInputs.cache new file mode 100644 index 0000000..59806db --- /dev/null +++ b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +8cde6148b7d933c949f6c5126b5e243c8031ec2218b99960aab2ea8fe09b2190 diff --git a/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..e93866b --- /dev/null +++ b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,19 @@ +is_global = true +build_property.TargetFramework = net8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = true +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = CoreFinik.API +build_property.RootNamespace = CoreFinik.API +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.API\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.RazorLangVersion = 8.0 +build_property.SupportLocalizedComponentNames = +build_property.GenerateRazorMetadataSourceChecksumAttributes = +build_property.MSBuildProjectDirectory = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.API +build_property._RazorSourceGeneratorDebug = diff --git a/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.GlobalUsings.g.cs b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.GlobalUsings.g.cs new file mode 100644 index 0000000..025530a --- /dev/null +++ b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.GlobalUsings.g.cs @@ -0,0 +1,17 @@ +// +global using global::Microsoft.AspNetCore.Builder; +global using global::Microsoft.AspNetCore.Hosting; +global using global::Microsoft.AspNetCore.Http; +global using global::Microsoft.AspNetCore.Routing; +global using global::Microsoft.Extensions.Configuration; +global using global::Microsoft.Extensions.DependencyInjection; +global using global::Microsoft.Extensions.Hosting; +global using global::Microsoft.Extensions.Logging; +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Net.Http.Json; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.assets.cache b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.assets.cache new file mode 100644 index 0000000..dcfbbf0 Binary files /dev/null and b/Back-End/CoreFinik.API/obj/Release/net8.0/CoreFinik.API.assets.cache differ diff --git a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfo.cs b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfo.cs index 4777d8b..7372d43 100644 --- a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfo.cs +++ b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfo.cs @@ -13,7 +13,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.Application")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d71b8e4e3e7e2bf2c01358a99db0d20f6b2629c0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.Application")] [assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.Application")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfoInputs.cache b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfoInputs.cache index a6331b6..44179af 100644 --- a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfoInputs.cache +++ b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.AssemblyInfoInputs.cache @@ -1 +1 @@ -394a80b1f979b08d02996e3dddc1e3ab13487a422bbaf44efa7727d284133b48 +ee403ab8bd99350fd0ac6eb2fa15f173a2870d258dff8c40e8b0735262d0dea8 diff --git a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.GeneratedMSBuildEditorConfig.editorconfig index 63cb410..4123c74 100644 --- a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.GeneratedMSBuildEditorConfig.editorconfig +++ b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = CoreFinik.Application -build_property.ProjectDir = /Users/otabek_coding/Desktop/Najot Ta'lim/Front-End/Finik/Back-End/CoreFinik.Application/ +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.Application\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.assets.cache b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.assets.cache index 4e261ed..91734f7 100644 Binary files a/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.assets.cache and b/Back-End/CoreFinik.Application/obj/Debug/net8.0/CoreFinik.Application.assets.cache differ diff --git a/Back-End/CoreFinik.Application/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/Back-End/CoreFinik.Application/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/Back-End/CoreFinik.Application/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.AssemblyInfo.cs b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.AssemblyInfo.cs new file mode 100644 index 0000000..dc1b2eb --- /dev/null +++ b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.Application")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.Application")] +[assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.Application")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.AssemblyInfoInputs.cache b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.AssemblyInfoInputs.cache new file mode 100644 index 0000000..79f897a --- /dev/null +++ b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +67ef79593b2024458cece4ec954dfff19474931ac4b360fb7d40a33966d2cb1c diff --git a/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..4123c74 --- /dev/null +++ b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,13 @@ +is_global = true +build_property.TargetFramework = net8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = CoreFinik.Application +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.Application\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.GlobalUsings.g.cs b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.GlobalUsings.g.cs new file mode 100644 index 0000000..8578f3d --- /dev/null +++ b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.GlobalUsings.g.cs @@ -0,0 +1,8 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.assets.cache b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.assets.cache new file mode 100644 index 0000000..c573380 Binary files /dev/null and b/Back-End/CoreFinik.Application/obj/Release/net8.0/CoreFinik.Application.assets.cache differ diff --git a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfo.cs b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfo.cs index 3fe9543..d9c4954 100644 --- a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfo.cs +++ b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfo.cs @@ -13,7 +13,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.Domain")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d71b8e4e3e7e2bf2c01358a99db0d20f6b2629c0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.Domain")] [assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.Domain")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfoInputs.cache b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfoInputs.cache index 8fa1914..346d021 100644 --- a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfoInputs.cache +++ b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.AssemblyInfoInputs.cache @@ -1 +1 @@ -fd27abc8ef86e99dd68474bd435ea6b6b5f0c06b41672be037e05515d1b8692e +ba9a367a092c53460ec9ba231aa89b98e55ee9fd5a7e1ba0380700dca4519e7d diff --git a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.GeneratedMSBuildEditorConfig.editorconfig index e095580..65b9933 100644 --- a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.GeneratedMSBuildEditorConfig.editorconfig +++ b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = CoreFinik.Domain -build_property.ProjectDir = /Users/otabek_coding/Desktop/Najot Ta'lim/Front-End/Finik/Back-End/CoreFinik.Domain/ +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.Domain\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.assets.cache b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.assets.cache index 5f79baa..5374cb4 100644 Binary files a/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.assets.cache and b/Back-End/CoreFinik.Domain/obj/Debug/net8.0/CoreFinik.Domain.assets.cache differ diff --git a/Back-End/CoreFinik.Domain/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/Back-End/CoreFinik.Domain/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/Back-End/CoreFinik.Domain/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.AssemblyInfo.cs b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.AssemblyInfo.cs new file mode 100644 index 0000000..405b48b --- /dev/null +++ b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.Domain")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.Domain")] +[assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.Domain")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.AssemblyInfoInputs.cache b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.AssemblyInfoInputs.cache new file mode 100644 index 0000000..17ce973 --- /dev/null +++ b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +a8b9fd0b16182f8f4e64eb4c46c16c7961dd8a68c819833ce400053361acd2ae diff --git a/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..65b9933 --- /dev/null +++ b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,13 @@ +is_global = true +build_property.TargetFramework = net8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = CoreFinik.Domain +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.Domain\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.GlobalUsings.g.cs b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.GlobalUsings.g.cs new file mode 100644 index 0000000..8578f3d --- /dev/null +++ b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.GlobalUsings.g.cs @@ -0,0 +1,8 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.assets.cache b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.assets.cache new file mode 100644 index 0000000..1fce2d1 Binary files /dev/null and b/Back-End/CoreFinik.Domain/obj/Release/net8.0/CoreFinik.Domain.assets.cache differ diff --git a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfo.cs b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfo.cs index 33e6d67..2369d85 100644 --- a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfo.cs +++ b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfo.cs @@ -13,7 +13,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.Infrastructure")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d71b8e4e3e7e2bf2c01358a99db0d20f6b2629c0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.Infrastructure")] [assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.Infrastructure")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfoInputs.cache b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfoInputs.cache index 11a7e9f..13d8e9c 100644 --- a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfoInputs.cache +++ b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.AssemblyInfoInputs.cache @@ -1 +1 @@ -ff458ecdf3ed05bcb31eac89c41ad4b5313c1b6d2ed2d76143d5e91ff28b055c +e54d4284834885f91ca1388cdb653aa1628e58652192b0f353e4fdbd48df4f5a diff --git a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.GeneratedMSBuildEditorConfig.editorconfig index b4c982f..9b30674 100644 --- a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.GeneratedMSBuildEditorConfig.editorconfig +++ b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = CoreFinik.Infrastructure -build_property.ProjectDir = /Users/otabek_coding/Desktop/Najot Ta'lim/Front-End/Finik/Back-End/CoreFinik.Infrastructure/ +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.Infrastructure\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.assets.cache b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.assets.cache index 9bd856d..f165ca4 100644 Binary files a/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.assets.cache and b/Back-End/CoreFinik.Infrastructure/obj/Debug/net8.0/CoreFinik.Infrastructure.assets.cache differ diff --git a/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.AssemblyInfo.cs b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.AssemblyInfo.cs new file mode 100644 index 0000000..02e5392 --- /dev/null +++ b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("CoreFinik.Infrastructure")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("CoreFinik.Infrastructure")] +[assembly: System.Reflection.AssemblyTitleAttribute("CoreFinik.Infrastructure")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.AssemblyInfoInputs.cache b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.AssemblyInfoInputs.cache new file mode 100644 index 0000000..a11e538 --- /dev/null +++ b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +7afae441014639e6a6670fe7ba4abcf4a9391e1a5f25f6e102ddd5339402eecf diff --git a/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.GeneratedMSBuildEditorConfig.editorconfig b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..9b30674 --- /dev/null +++ b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,13 @@ +is_global = true +build_property.TargetFramework = net8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = CoreFinik.Infrastructure +build_property.ProjectDir = C:\Users\User\OneDrive\Ishchi stol\F\CoreFinik\Back-End\CoreFinik.Infrastructure\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.GlobalUsings.g.cs b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.GlobalUsings.g.cs new file mode 100644 index 0000000..8578f3d --- /dev/null +++ b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.GlobalUsings.g.cs @@ -0,0 +1,8 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.assets.cache b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.assets.cache new file mode 100644 index 0000000..bb78ef6 Binary files /dev/null and b/Back-End/CoreFinik.Infrastructure/obj/Release/net8.0/CoreFinik.Infrastructure.assets.cache differ diff --git a/Front-End/Finiki/src/app/Components/navbar/navbar.component.html b/Front-End/Finiki/src/app/Components/navbar/navbar.component.html deleted file mode 100644 index 15cb51b..0000000 --- a/Front-End/Finiki/src/app/Components/navbar/navbar.component.html +++ /dev/null @@ -1,22 +0,0 @@ - - - My App - - - - - - - - - \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Components/navbar/navbar.component.scss b/Front-End/Finiki/src/app/Components/navbar/navbar.component.scss deleted file mode 100644 index 5583ab6..0000000 --- a/Front-End/Finiki/src/app/Components/navbar/navbar.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.example-spacer { - flex: 1 1 auto; - } \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Components/navbar/navbar.component.ts b/Front-End/Finiki/src/app/Components/navbar/navbar.component.ts deleted file mode 100644 index f52aa2f..0000000 --- a/Front-End/Finiki/src/app/Components/navbar/navbar.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; -import { AuthService } from '../../Services/auth.service'; - -@Component({ - selector: 'app-navbar', - templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] -}) -export class NavbarComponent { - - constructor(private authService: AuthService) {} - - logout() { - this.authService.logout(); - console.log('logged out'); - } -} \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/footer/footer.component.html b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.html new file mode 100644 index 0000000..c5b5d22 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.html @@ -0,0 +1,85 @@ + \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/footer/footer.component.scss b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.scss new file mode 100644 index 0000000..41cb6cc --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.scss @@ -0,0 +1,264 @@ +@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700&display=swap'); +*{ + margin: 0; + padding: 0; + box-sizing: border-box; + font-family: "Poppins" , sans-serif; +} +body{ + width: 100%; + background: #EEECEB; +} +footer{ + background: #1C1C1C; + width: 100%; + bottom: 0; + left: 0; +} +footer .content{ + max-width: 1250px; + margin: auto; + padding: 30px 40px 0 40px; +} +footer .content .top{ + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 30px; +} +footer .content .top .logo-details{ + color: #fff; + font-size: 30px; +} +footer .content .top .media-icons{ + display: flex; +} +footer .content .top .media-icons a{ + height: 40px; + width: 40px; + margin: 0 8px; + border-radius: 50%; + text-align: center; + line-height: 40px; + color: #fff; + font-size: 17px; + text-decoration: none; + transition: all 0.4s ease; + display: flex; + justify-content: center; + align-items: center; +} +footer .content .top .media-icons a:nth-child(1){ + background: #4267B2; +} +footer .content .top .media-icons a:nth-child(1) svg { + color: #fff; +} +footer .content .top .media-icons a:nth-child(1):hover{ + background: #fff; +} +footer .content .top .media-icons a:nth-child(1):hover svg{ + color: #4267B2; +} +footer .content .top .media-icons a:nth-child(2){ + background: #1DA1F2; +} +footer .content .top .media-icons a:nth-child(2) svg{ + color: #fff; +} +footer .content .top .media-icons a:nth-child(2):hover{ + background: #fff; +} +footer .content .top .media-icons a:nth-child(2):hover svg{ + color: #1DA1F2; +} +footer .content .top .media-icons a:nth-child(3){ + background: #E1306C; +} +footer .content .top .media-icons a:nth-child(3) svg{ + color: #fff; +} +footer .content .top .media-icons a:nth-child(3):hover{ + background: #fff; +} +footer .content .top .media-icons a:nth-child(3):hover svg{ + color: #E1306C; +} +footer .content .top .media-icons a:nth-child(4){ + background: #0077B5; +} +footer .content .top .media-icons a:nth-child(4) svg{ + color: #fff; +} +footer .content .top .media-icons a:nth-child(4):hover{ + background: #fff; +} +footer .content .top .media-icons a:nth-child(4):hover svg{ + color: #0077B5; +} +footer .content .top .media-icons a:nth-child(5){ + background: #FF0000; +} +footer .content .top .media-icons a:nth-child(5) svg{ + color: #fff; +} +footer .content .top .media-icons a:nth-child(5):hover{ + background: #fff; +} +footer .content .top .media-icons a:nth-child(5):hover svg{ + color: #FF0000; +} +footer .content .link-boxes{ + width: 100%; + display: flex; + justify-content: space-between; +} +footer .content .link-boxes .box{ + width: calc(100% / 5 - 10px); +} +footer .content .link-boxes .box .link_name{ + color: #fff; + font-size: 18px; + font-weight: 400; + margin-bottom: 10px; + position: relative; +} +footer .content .link-boxes .box .link_name::before{ + content: ''; + position: absolute; + left: 0; + bottom: -2px; + height: 2px; + width: 35px; + background: #fff; +} +footer .content .link-boxes .box li{ + margin: 6px 0; + list-style: none; +} +footer .content .link-boxes .box li a{ + color: #fff; + font-size: 14px; + font-weight: 400; + text-decoration: none; + opacity: 0.8; + transition: all 0.4s ease +} +footer .content .link-boxes .box li a:hover{ + opacity: 1; + text-decoration: underline; +} +footer .content .link-boxes .input-box{ + margin-right: 55px; +} +footer .content .link-boxes .input-box input{ + height: 40px; + width: calc(100% + 55px); + outline: none; + border: 2px solid #AFAFB6; + background: #1C1C1C; + border-radius: 4px; + padding: 0 15px; + font-size: 15px; + color: #fff; + margin-top: 5px; +} +footer .content .link-boxes .input-box input::placeholder{ + color: #AFAFB6; + font-size: 16px; +} +footer .content .link-boxes .input-box input[type="button"]{ + background: #fff; + color: #140B5C; + border: none; + font-size: 18px; + font-weight: 500; + margin: 4px 0; + opacity: 0.8; + cursor: pointer; + transition: all 0.4s ease; +} +footer .content .link-boxes .input-box input[type="button"]:hover{ + opacity: 1; +} +footer .bottom-details{ + padding-top: 20px; + padding-top: 20px; + width: 100%; + background: #1C1C1C; +} +footer .bottom-details .bottom_text{ + max-width: 1250px; + margin: auto; + padding: 20px 40px; + display: flex; + justify-content: space-between; +} +footer .bottom-details .bottom_text span, +footer .bottom-details .bottom_text a{ + font-size: 14px; + font-weight: 300; + color: #fff; + text-decoration: none; +} +footer .bottom-details .bottom_text a span{ + opacity: 0.8; + color: #fff; +} +footer .bottom-details .bottom_text a:hover{ + opacity: 1; + text-decoration: underline; +} +footer .bottom-details .bottom_text a{ + margin-right: 10px; +} +@media (max-width: 900px) { + footer .content .link-boxes{ + flex-wrap: wrap; + } + footer .content .link-boxes .input-box{ + width: 40%; + margin-top: 10px; + } +} +@media (max-width: 700px){ + footer{ + position: relative; + } + footer .content .top .logo-details{ + font-size: 26px; + } + footer .content .top .media-icons a{ + height: 35px; + width: 35px; + font-size: 14px; + line-height: 35px; + } + footer .content .link-boxes .box{ + width: calc(100% / 3 - 10px); + } + footer .content .link-boxes .input-box{ + width: 60%; + } + footer .bottom-details .bottom_text span, + footer .bottom-details .bottom_text a{ + font-size: 12px; + } +} +@media (max-width: 520px){ + footer::before{ + top: 145px; + } + footer .content .top{ + flex-direction: column; + } + .content .top .media-icons{ + margin-top: 16px; + } + footer .content .link-boxes .box{ + width: calc(100% / 2 - 10px); + } + footer .content .link-boxes .input-box{ + width: 100%; + } +} \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/footer/footer.component.spec.ts b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.spec.ts new file mode 100644 index 0000000..f3e6953 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FooterComponent } from './footer.component'; + +describe('FooterComponent', () => { + let component: FooterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [FooterComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(FooterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Front-End/Finiki/src/app/Pages/home/footer/footer.component.ts b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.ts new file mode 100644 index 0000000..fb892ec --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/footer/footer.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-footer', + templateUrl: './footer.component.html', + styleUrl: './footer.component.scss' +}) +export class FooterComponent { + +} diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.html b/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.html new file mode 100644 index 0000000..3e24479 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.html @@ -0,0 +1,106 @@ + + + + + diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.scss b/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.spec.ts b/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.spec.ts new file mode 100644 index 0000000..949602e --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HeaderComponent } from './header.component'; + +describe('HeaderComponent', () => { + let component: HeaderComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [HeaderComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.ts b/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.ts new file mode 100644 index 0000000..b317710 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/header/header.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-header', + templateUrl: './header.component.html', + styleUrl: './header.component.scss' +}) +export class HeaderComponent { + +} diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.html b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.html new file mode 100644 index 0000000..3c97d46 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.html @@ -0,0 +1,21 @@ +
+ + +
8
+

Ha рынке более 8 лет

+ + + + +
5
+

Гарантия на продукцию

+ + + + +
1
+

Доставка от 1 дня

+ +
+ + \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.scss b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.scss new file mode 100644 index 0000000..d44b9c6 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.scss @@ -0,0 +1,31 @@ +.cards { + display: flex; + width: 80%; + margin: 0 auto; + justify-content: space-between; +} +.cards a { + margin: 20px; + width: 30%; + background-color: #F9F9F9; +} + +.cards a h5 { + align-items: start; + font-size: 100px; + font-weight: 300; +} +.cards a p { + padding-top: 80px; + align-items: end; + font-size: 20px; +} +@media (max-width: 720px){ + .cards { + display: block; + } + .cards a { + width: 500px; + margin: 20px auto; + } + } \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.spec.ts b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.spec.ts new file mode 100644 index 0000000..301dd43 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeCardsComponent } from './home-cards.component'; + +describe('HomeCardsComponent', () => { + let component: HomeCardsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [HomeCardsComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HomeCardsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.ts b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.ts new file mode 100644 index 0000000..b3bde5d --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-cards/home-cards.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-home-cards', + templateUrl: './home-cards.component.html', + styleUrl: './home-cards.component.scss' +}) +export class HomeCardsComponent { + +} diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.html b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.html new file mode 100644 index 0000000..0f31b02 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.html @@ -0,0 +1,12 @@ +
+

O компании

+

HTL — Российская компания

+

по производству светодиодного освещения, Эксперт в области интерьерного и уличного освещения

+

Создаём современное высококачественное светотехническое оборудование и отдельные комплектующих для освещения интерьеров жилых и коммерческих помещений

+ +

O компании +

+ +
\ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.scss b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.scss new file mode 100644 index 0000000..a285bc0 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.scss @@ -0,0 +1,42 @@ +.p1 { + font-size: 18px; +} +.h11 { + font-size: 50px; +} +.h12 { + font-size: 55px; +} +.p2 { + font-size: 25px; +} + +@media (max-width: 1000px){ + .p1 { + font-size: 16.5px; + } + .h11 { + font-size: 40px; + } + .h12 { + font-size: 43px; + } + .p2 { + font-size: 20px; + } + } + +@media (max-width: 720px){ + .p1 { + font-size: 15px; + } + .h11 { + font-size: 30px; + } + .h12 { + font-size: 33px; + } + .p2 { + font-size: 15px; + } + } \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.spec.ts b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.spec.ts new file mode 100644 index 0000000..4e0498b --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeHeaderBottomPageComponent } from './home-header-bottom-page.component'; + +describe('HomeHeaderBottomPageComponent', () => { + let component: HomeHeaderBottomPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [HomeHeaderBottomPageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HomeHeaderBottomPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.ts b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.ts new file mode 100644 index 0000000..267bc2c --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-home-header-bottom-page', + templateUrl: './home-header-bottom-page.component.html', + styleUrl: './home-header-bottom-page.component.scss' +}) +export class HomeHeaderBottomPageComponent { + +} diff --git a/Front-End/Finiki/src/app/Pages/home/home.component.html b/Front-End/Finiki/src/app/Pages/home/home.component.html index 5f2c53f..e69de29 100644 --- a/Front-End/Finiki/src/app/Pages/home/home.component.html +++ b/Front-End/Finiki/src/app/Pages/home/home.component.html @@ -1 +0,0 @@ -

home works!

diff --git a/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.html b/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.html new file mode 100644 index 0000000..f74b3fe --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.html @@ -0,0 +1,106 @@ + + + + + + + + + \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.scss b/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.scss new file mode 100644 index 0000000..c4fdcd1 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.scss @@ -0,0 +1,12 @@ +.div { + padding-left: 100px; + padding-right: 100px; +} + + + @media (max-width: 1200px){ + .div { + padding-left: 5px; + padding-right: 5px; + } + } \ No newline at end of file diff --git a/Front-End/Finiki/src/app/Components/navbar/navbar.component.spec.ts b/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.spec.ts similarity index 100% rename from Front-End/Finiki/src/app/Components/navbar/navbar.component.spec.ts rename to Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.spec.ts diff --git a/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.ts b/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.ts new file mode 100644 index 0000000..da50573 --- /dev/null +++ b/Front-End/Finiki/src/app/Pages/home/navbar/navbar.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-navbar', + templateUrl: './navbar.component.html', + styleUrl: './navbar.component.scss' +}) +export class NavbarComponent { + +} diff --git a/Front-End/Finiki/src/app/app.component.html b/Front-End/Finiki/src/app/app.component.html index 829768c..153dc9a 100644 --- a/Front-End/Finiki/src/app/app.component.html +++ b/Front-End/Finiki/src/app/app.component.html @@ -1,2 +1,5 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/Front-End/Finiki/src/app/app.module.ts b/Front-End/Finiki/src/app/app.module.ts index 1d3be35..6e279f5 100644 --- a/Front-End/Finiki/src/app/app.module.ts +++ b/Front-End/Finiki/src/app/app.module.ts @@ -13,13 +13,17 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { NavbarComponent } from './Components/navbar/navbar.component'; +import { NavbarComponent } from './Pages/home/navbar/navbar.component'; import { LoginComponent } from './Pages/login/login.component'; import { RegisterComponent } from './Pages/register/register.component'; import { HomeComponent } from './Pages/home/home.component'; import { UserProfileComponent } from './Visitor/User/user-profile/user-profile.component'; import { AdminProfileComponent } from './Visitor/Admin/admin-profile/admin-profile.component'; import { LogoutComponent } from './Pages/logout/logout.component'; +import { HeaderComponent } from './Pages/home/home-components/header/header.component'; +import { FooterComponent } from './Pages/home/footer/footer.component'; +import { HomeHeaderBottomPageComponent } from './Pages/home/home-components/home-header-bottom-page/home-header-bottom-page.component'; +import { HomeCardsComponent } from './Pages/home/home-components/home-cards/home-cards.component'; @NgModule({ @@ -30,7 +34,11 @@ import { LogoutComponent } from './Pages/logout/logout.component'; RegisterComponent, HomeComponent, UserProfileComponent, - LogoutComponent + LogoutComponent, + HeaderComponent, + FooterComponent, + HomeHeaderBottomPageComponent, + HomeCardsComponent ], imports: [ BrowserModule, diff --git a/Front-End/Finiki/src/assets/images/black1.png b/Front-End/Finiki/src/assets/images/black1.png new file mode 100644 index 0000000..1220c5f Binary files /dev/null and b/Front-End/Finiki/src/assets/images/black1.png differ diff --git a/Front-End/Finiki/src/assets/images/black2.png b/Front-End/Finiki/src/assets/images/black2.png new file mode 100644 index 0000000..0e1bf2a Binary files /dev/null and b/Front-End/Finiki/src/assets/images/black2.png differ diff --git a/Front-End/Finiki/src/assets/images/black3.png b/Front-End/Finiki/src/assets/images/black3.png new file mode 100644 index 0000000..cfdd96c Binary files /dev/null and b/Front-End/Finiki/src/assets/images/black3.png differ diff --git a/Front-End/Finiki/src/assets/images/h-h.png b/Front-End/Finiki/src/assets/images/h-h.png new file mode 100644 index 0000000..b0f9bcf Binary files /dev/null and b/Front-End/Finiki/src/assets/images/h-h.png differ diff --git a/Front-End/Finiki/src/assets/images/home-header.png b/Front-End/Finiki/src/assets/images/home-header.png new file mode 100644 index 0000000..c362dac Binary files /dev/null and b/Front-End/Finiki/src/assets/images/home-header.png differ diff --git a/Front-End/Finiki/src/assets/images/white1.png b/Front-End/Finiki/src/assets/images/white1.png new file mode 100644 index 0000000..65da105 Binary files /dev/null and b/Front-End/Finiki/src/assets/images/white1.png differ diff --git a/Front-End/Finiki/src/assets/images/white2.png b/Front-End/Finiki/src/assets/images/white2.png new file mode 100644 index 0000000..7f7a318 Binary files /dev/null and b/Front-End/Finiki/src/assets/images/white2.png differ diff --git a/Front-End/Finiki/src/assets/images/white3.png b/Front-End/Finiki/src/assets/images/white3.png new file mode 100644 index 0000000..be71dc9 Binary files /dev/null and b/Front-End/Finiki/src/assets/images/white3.png differ diff --git a/Front-End/Finiki/src/index.html b/Front-End/Finiki/src/index.html index bc81d46..065d47a 100644 --- a/Front-End/Finiki/src/index.html +++ b/Front-End/Finiki/src/index.html @@ -6,8 +6,11 @@ + + +