Skip to content

Commit

Permalink
Revert "header and search bar changes"
Browse files Browse the repository at this point in the history
This reverts commit 24166ec.
  • Loading branch information
iwokonl committed May 20, 2024
1 parent 1e2cf3a commit 97c953a
Show file tree
Hide file tree
Showing 3 changed files with 200 additions and 15 deletions.
52 changes: 49 additions & 3 deletions Front/kantor-angular/src/app/header/header.component.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,54 @@

<div class="header">
<div class="search-container">
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<!-- <a class="navbar-brand" routerLink="/">-->
<!-- <img src="assets/logo.svg" alt="Kantor Walut">-->
<!-- </a>-->
<div #navburger class="nav-burger">
<a class="nav-link" routerLink="/">Strona Główna</a>
<a class="nav-link" routerLink="#">Kursy Walut</a>
<a class="nav-link" routerLink="#">Kontakt</a>
</div>

<div #navlist class="collapse navbar-collapse" id="navlist">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<!-- <a class="nav-link" routerLink="/">Strona Główna</a>-->
</li>
<!-- <li class="nav-item">-->
<!-- <a class="nav-link" routerLink="#">Kursy Walut</a>-->
<!-- </li>-->
<!-- <li class="nav-item">-->
<!-- <a class="nav-link" routerLink="#">Kontakt</a>-->
<!-- </li>-->
</ul>
</div>

<div #navburger class="nav-burger" id="navbarNav">
<div class="nav-list">
<a class="nav-link" routerLink="/" (click)="hideNavList()">Strona Główna</a>
<a class="nav-link" routerLink="#" (click)="hideNavList()">Kursy Walut</a>
<a class="nav-link" routerLink="#" (click)="hideNavList()">Kontakt</a>
</div>
</div>

<div class="navbar-nav ms-auto">
<form class="form-inline my-2 my-lg-0 flex-grow-1">
<app-search-bar (searchChange)="handleSearchChange($event)"></app-search-bar>
</form>
<ng-container *ngIf="isLoggedIn; else notLoggedIn">
<a class="nav-item nav-link" routerLink="/settings">Ustawienia</a>
<a class="nav-item nav-link" routerLink="/currency-account">Konta walutowe</a>
<a class="nav-item nav-link" (click)="axiosService.logout()">Wyloguj</a>
</ng-container>
<ng-template #notLoggedIn>
<a class="nav-item nav-link" routerLink="/login">Logowanie</a>
<a class="nav-item nav-link" routerLink="/register">Rejestracja</a>
</ng-template>
</div>
</div>

<!-- hamburger button-->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation" (click)="displayBurger()">
<span class="navbar-toggler-icon"> </span>
</button>

</nav>
154 changes: 149 additions & 5 deletions Front/kantor-angular/src/app/header/header.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,151 @@
.header{
display: flex;
justify-content: center;
/* Custom Navbar Breakpoint */

//@media (max-width: 1870px) {
// .navbar-expand-lg .navbar-nav .nav-link {
// display: none;
// }
//
// .navbar-expand-lg .navbar-toggler {
// display: block;
// }
//
// .navbar-expand-lg .navbar-collapse {
// display: none;
// }
//
// .navbar-expand-lg .navbar-collapse.collapsing {
// display: none;
// }
//
// .navbar-expand-lg .navbar-collapse.show {
// display: block;
// }
//
//}
//
//@media (min-width: 1871px) {
// .navbar-expand-lg .navbar-nav .nav-link {
// display: block;
// }
//
// .navbar-expand-lg .navbar-toggler {
// display: none;
// }
//
// .navbar-expand-lg .navbar-collapse {
// display: flex !important;
// }
//
//
//}



//nav {
// background-color: transparent !important;
//}
//
//nav.navbar {
// background-color: transparent;
//}

.navbar {
margin-left: 324px;
background-color: transparent !important;
//background: linear-gradient(94deg, rgba(255, 255, 255, 0.04) 12.6%, rgba(255, 255, 255, 0.02) 100.13%);
//backdrop-filter: blur(0px);

a, p, span, h1, h2, h3, h4, h5, h6 {
color: #DBDBDB !important;
}
}

.navbar-brand {
// horizontal, vertical, blur radius (rgb, alpha)
filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.5));
}
search-bar {
align-items: center;
height: 100%;
width: 100%;
}

.nav-burger{ //domyślnie ukryty
display: none;
position: relative;

}

.nav-burger {
position: absolute;
top: 100%; // This positions the top edge of the element just below the bottom edge of its parent element (the navbar)
right: 0; // This aligns the left edge of the element with the left edge of its parent element
z-index: 1; // This ensures the dropdown appears on top of other elements
border: 1px solid #ccc;
border-radius: 5px;
background-color: white;
}

.navbar-toggler{
margin-left: 10px;
}



/* Styles for Portrait orientation */
@media (orientation: portrait) {
.navbar-expand-lg .navbar-nav .nav-link {
display: none;
}

.navbar-expand-lg .navbar-toggler {
display: block;
}

.navbar-expand-lg .navbar-collapse {
display: none;
}

.navbar-expand-lg .navbar-collapse.collapsing {
display: none;
}

.navbar-expand-lg .navbar-collapse.show {
display: block;
}

.navbar-expand-lg .navbar-nav {
flex-direction: column-reverse;
}

}

@media (orientation: landscape) {
.navbar-expand-lg .navbar-nav .nav-link {
display: block;
}

.navbar-expand-lg .navbar-toggler {
display: none;
}

.navbar-expand-lg .navbar-collapse {
display: flex !important;
}


}


//@media (max-width: 768px) {
// .body {
// display: block;
// width: 100%;
// }
//}
//
//@media (min-width: 768px) {
// .body {
// display: inline-block;
// }
//}


Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ body {
.search-container {
display: flex;
align-items: center;
border: 2px solid rgba(255, 255, 255, 0.22);
border: 1px solid #ccc;
border-radius: 20px;
overflow: hidden;
position: relative;
Expand All @@ -15,11 +15,7 @@ body {
}

.search-input {
border-radius: 28px;
border: none;
background: linear-gradient(94deg, rgba(255, 255, 255, 0.04) 12.6%, rgba(255, 255, 255, 0.02) 100.13%);
box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
backdrop-filter: blur(17.5px);
padding: 10px;
outline: none;
width: 100%;
Expand Down Expand Up @@ -49,12 +45,11 @@ button {
border: none;
cursor: pointer;
padding: 10px;
background-color: transparent;
background-color: #007BFF;
}

.material-icons {
font-size: 24px;
color: #dbdbdb;
}


Expand Down

0 comments on commit 97c953a

Please sign in to comment.