Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ff3fec8ffa0d1fda8036272d0a3e7c1f4c01fd68f83eec459a4e5305a7d778f0
91a53e534df9dbc46745910769e891e8a1c21ef6b45e012f7df82de59de91441
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
394a80b1f979b08d02996e3dddc1e3ab13487a422bbaf44efa7727d284133b48
ee403ab8bd99350fd0ac6eb2fa15f173a2870d258dff8c40e8b0735262d0dea8
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd27abc8ef86e99dd68474bd435ea6b6b5f0c06b41672be037e05515d1b8692e
ba9a367a092c53460ec9ba231aa89b98e55ee9fd5a7e1ba0380700dca4519e7d
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ff458ecdf3ed05bcb31eac89c41ad4b5313c1b6d2ed2d76143d5e91ff28b055c
e54d4284834885f91ca1388cdb653aa1628e58652192b0f353e4fdbd48df4f5a
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<button routerLink="register" mat-icon-button class="example-icon favorite-icon" aria-label="Example icon-button with heart icon">
<mat-icon>resgiter</mat-icon>
</button>
<button (click)="logout()" routerLink="register" mat-icon-button class="example-icon" aria-label="Example icon-button with share icon">
<button (click)="logout()" routerLink="logout" mat-icon-button class="example-icon" aria-label="Example icon-button with share icon">
<mat-icon>logout</mat-icon>
</button>
<button onclick="window.location.href = 'https://www.linkedin.com/in/mr-otabek-13a3aa275/';" mat-icon-button class="example-icon" aria-label="Example icon-button with share icon">
Expand All @@ -19,4 +19,4 @@

</mat-toolbar>

<!-- -->
<!-- -->
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.example-spacer {
flex: 1 1 auto;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { MainNavbarComponent } from './main-navbar.component';

describe('MainNavbarComponent', () => {
let component: MainNavbarComponent;
let fixture: ComponentFixture<MainNavbarComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [MainNavbarComponent]
})
.compileComponents();

fixture = TestBed.createComponent(MainNavbarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@ import { Component } from '@angular/core';
import { AuthService } from '../../Services/auth.service';

@Component({
selector: 'app-navbar',
templateUrl: './navbar.component.html',
styleUrls: ['./navbar.component.scss']
selector: 'app-main-navbar',
templateUrl: './main-navbar.component.html',
styleUrl: './main-navbar.component.scss'
})
export class NavbarComponent {

export class MainNavbarComponent {
constructor(private authService: AuthService) {}

logout() {
this.authService.logout();
console.log('logged out');
}
}
}
85 changes: 85 additions & 0 deletions Front-End/Finiki/src/app/Pages/home/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<footer>
<div class="content">
<div class="top">
<div class="logo-details">
<span class="logo_name">
<img src="assets/images/white1.png" alt="" style="display: inline;margin-right: 5px;">
<img src="assets/images/white2.png" alt="" style="display: inline;margin-right: 5px;">
<img src="assets/images/white1.png" alt="" style="display: inline;margin-right: 5px;">
<img src="assets/images/white3.png" alt="" style="display: inline;margin-right: 5px;">
<img src="assets/images/white2.png" alt="" style="display: inline;margin-bottom: 35px;margin-right: 5px;">
<img src="assets/images/white1.png" alt="" style="display: inline;margin-right: 5px;">
<img src="assets/images/white2.png" alt="" style="display: inline;margin-top: 35px;margin-right: 5px;">
</span>
</div>
<div class="media-icons">
<a href="#"><svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M13.135 6H15V3h-1.865a4.147 4.147 0 0 0-4.142 4.142V9H7v3h2v9.938h3V12h2.021l.592-3H12V6.591A.6.6 0 0 1 12.592 6h.543Z" clip-rule="evenodd"/>
</svg>
</a>
<a href="#"><svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M22 5.892a8.178 8.178 0 0 1-2.355.635 4.074 4.074 0 0 0 1.8-2.235 8.343 8.343 0 0 1-2.605.981A4.13 4.13 0 0 0 15.85 4a4.068 4.068 0 0 0-4.1 4.038c0 .31.035.618.105.919A11.705 11.705 0 0 1 3.4 4.734a4.006 4.006 0 0 0 1.268 5.392 4.165 4.165 0 0 1-1.859-.5v.05A4.057 4.057 0 0 0 6.1 13.635a4.192 4.192 0 0 1-1.856.07 4.108 4.108 0 0 0 3.831 2.807A8.36 8.36 0 0 1 2 18.184 11.732 11.732 0 0 0 8.291 20 11.502 11.502 0 0 0 19.964 8.5c0-.177 0-.349-.012-.523A8.143 8.143 0 0 0 22 5.892Z" clip-rule="evenodd"/>
</svg>
</a>
<a href="#"><svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
<path fill="currentColor" fill-rule="evenodd" d="M3 8a5 5 0 0 1 5-5h8a5 5 0 0 1 5 5v8a5 5 0 0 1-5 5H8a5 5 0 0 1-5-5V8Zm5-3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V8a3 3 0 0 0-3-3H8Zm7.597 2.214a1 1 0 0 1 1-1h.01a1 1 0 1 1 0 2h-.01a1 1 0 0 1-1-1ZM12 9a3 3 0 1 0 0 6 3 3 0 0 0 0-6Zm-5 3a5 5 0 1 1 10 0 5 5 0 0 1-10 0Z" clip-rule="evenodd"/>
</svg>
</a>
<a href="#"><svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M12.51 8.796v1.697a3.738 3.738 0 0 1 3.288-1.684c3.455 0 4.202 2.16 4.202 4.97V19.5h-3.2v-5.072c0-1.21-.244-2.766-2.128-2.766-1.827 0-2.139 1.317-2.139 2.676V19.5h-3.19V8.796h3.168ZM7.2 6.106a1.61 1.61 0 0 1-.988 1.483 1.595 1.595 0 0 1-1.743-.348A1.607 1.607 0 0 1 5.6 4.5a1.601 1.601 0 0 1 1.6 1.606Z" clip-rule="evenodd"/>
<path d="M7.2 8.809H4V19.5h3.2V8.809Z"/>
</svg>
</a>
<a href="#"><svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M21.7 8.037a4.26 4.26 0 0 0-.789-1.964 2.84 2.84 0 0 0-1.984-.839c-2.767-.2-6.926-.2-6.926-.2s-4.157 0-6.928.2a2.836 2.836 0 0 0-1.983.839 4.225 4.225 0 0 0-.79 1.965 30.146 30.146 0 0 0-.2 3.206v1.5a30.12 30.12 0 0 0 .2 3.206c.094.712.364 1.39.784 1.972.604.536 1.38.837 2.187.848 1.583.151 6.731.2 6.731.2s4.161 0 6.928-.2a2.844 2.844 0 0 0 1.985-.84 4.27 4.27 0 0 0 .787-1.965 30.12 30.12 0 0 0 .2-3.206v-1.516a30.672 30.672 0 0 0-.202-3.206Zm-11.692 6.554v-5.62l5.4 2.819-5.4 2.801Z" clip-rule="evenodd"/>
</svg>
</a>
</div>
</div>
</div>
<hr style="background-color: #fff;align-items: start;"/>
<div class="content">
<div class="link-boxes">
<ul class="box">
<li class="link_name">Клиентам</li>
<li><a href="#">Продукция</a></li>
<li><a href="#">Решения</a></li>
<li><a href="#">Где купить?</a></li>
<li><a href="#">Дизайнерам и архитекторам</a></li>
<li><a href="#">Дилерам</a></li>
<li><a href="#">Защита проекта</a></li>
<li><a href="#">Скачать каталог</a></li>
</ul>
<ul class="box">
<li class="link_name">O компании</li>
<li><a href="#">Портфолио</a></li>
<li><a href="#">Новости и события</a></li>
<li><a href="#">Контакты</a></li>
<br>
<li class="link_name">Телефон</li>
<li><a href="#" style="font-size: 20px;">+7 (495) 125-10-07</a></li>
</ul>
<ul class="box">
<li class="link_name">Помощь</li>
<li><a href="#">Оплата и доставка</a></li>
<li><a href="#">Prefrences</a></li>
<br>
<li class="link_name">Почта</li>
<li><a href="#" style="font-size: 20px;">INFO&#64;H-T-L.RU</a></li>
</ul>
<ul class="box input-box">
<li class="link_name">Subscribe</li>
<li><input type="text" placeholder="Enter your email"></li>
<li><input type="button" value="Subscribe"></li>
</ul>
</div>
</div>
<div class="bottom-details">
<div class="bottom_text">
<span class="copyright_text">Политика конфиденциальности</span>
<span class="policy_terms">
<a href="#"><span style="color:#fff;">Сайт сделан в </span>FINIK</a>
</span>
</div>
</div>
</footer>
Loading