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.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.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.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/Front-End/Finiki/src/app/Components/navbar/navbar.component.html b/Front-End/Finiki/src/app/Components/main-navbar/main-navbar.component.html similarity index 86% rename from Front-End/Finiki/src/app/Components/navbar/navbar.component.html rename to Front-End/Finiki/src/app/Components/main-navbar/main-navbar.component.html index 15cb51b..35e19fc 100644 --- a/Front-End/Finiki/src/app/Components/navbar/navbar.component.html +++ b/Front-End/Finiki/src/app/Components/main-navbar/main-navbar.component.html @@ -10,7 +10,7 @@ - + + + + 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..96f31de 100644 --- a/Front-End/Finiki/src/app/app.component.html +++ b/Front-End/Finiki/src/app/app.component.html @@ -1,2 +1,6 @@ - \ 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..6ea42c9 100644 --- a/Front-End/Finiki/src/app/app.module.ts +++ b/Front-End/Finiki/src/app/app.module.ts @@ -13,13 +13,18 @@ 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'; +import { MainNavbarComponent } from './Components/main-navbar/main-navbar.component'; @NgModule({ @@ -30,7 +35,12 @@ import { LogoutComponent } from './Pages/logout/logout.component'; RegisterComponent, HomeComponent, UserProfileComponent, - LogoutComponent + LogoutComponent, + HeaderComponent, + FooterComponent, + HomeHeaderBottomPageComponent, + HomeCardsComponent, + MainNavbarComponent ], 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 @@ + + +