From ec902417d939eb59a90a1bf462b63614c0fe6ea4 Mon Sep 17 00:00:00 2001 From: brozanski <100760688+brozanski@users.noreply.github.com> Date: Mon, 13 May 2024 22:27:20 +0200 Subject: [PATCH] Merging settings with sidebar, currency-details visual update --- .../currency-detail/currency-detail.component.scss | 13 ++++++++++--- .../src/app/header/header.component.html | 12 ++++++------ .../src/app/settings/settings.component.html | 12 ++++++------ .../app/sidebar-left/sidebar-left.component.html | 11 +++++++++-- .../src/app/sidebar-left/sidebar-left.component.ts | 3 ++- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Front/kantor-angular/src/app/currency-detail/currency-detail.component.scss b/Front/kantor-angular/src/app/currency-detail/currency-detail.component.scss index 4a5752c9..bb1633d3 100644 --- a/Front/kantor-angular/src/app/currency-detail/currency-detail.component.scss +++ b/Front/kantor-angular/src/app/currency-detail/currency-detail.component.scss @@ -1,13 +1,20 @@ .currency-details { + color: #DBDBDB; display: block; width: 550px; - margin: 50px auto 50px 120px; + margin-left: 340px; + //margin: 50px auto 50px 120px; padding: 20px; - border: 1px solid #ccc; - border-radius: 5px; + //border: 1px solid #ccc; + //border-radius: 5px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); background-color: #fff; font-family: "Twemoji Country Flags", "Helvetica", serif; + border-radius: 47px; + border: 2px solid #DBDBDB; + background: linear-gradient(94deg, rgba(255, 255, 255, 0.04) 12.6%, rgba(255, 255, 255, 0.02) 100.13%); + backdrop-filter: blur(25px); + } diff --git a/Front/kantor-angular/src/app/header/header.component.html b/Front/kantor-angular/src/app/header/header.component.html index fbeb71a7..2a5f4b8d 100644 --- a/Front/kantor-angular/src/app/header/header.component.html +++ b/Front/kantor-angular/src/app/header/header.component.html @@ -14,12 +14,12 @@
    • -
  • - Kursy Walut -
    • -
  • - Kontakt -
    • + + + + + + diff --git a/Front/kantor-angular/src/app/settings/settings.component.html b/Front/kantor-angular/src/app/settings/settings.component.html index 7dcd33b8..b68e9b6a 100644 --- a/Front/kantor-angular/src/app/settings/settings.component.html +++ b/Front/kantor-angular/src/app/settings/settings.component.html @@ -8,12 +8,12 @@
    -
    -

    Ustawienia

    - Profile - Security - Help -
    + + + + + +

    Profile

    diff --git a/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.html b/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.html index 24d317bd..27a110fa 100644 --- a/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.html +++ b/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.html @@ -7,6 +7,15 @@ Strona Główna Kursy Walut
    + +
    +
    + Profile + Security + Help +
    +
    +
    Ustawienia @@ -17,8 +26,6 @@ Logowanie Rejestracja -
    -
    Kontakt
    diff --git a/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.ts b/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.ts index fb29ecfd..bb68dc21 100644 --- a/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.ts +++ b/Front/kantor-angular/src/app/sidebar-left/sidebar-left.component.ts @@ -1,6 +1,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {Subscription} from "rxjs"; import {AxiosService} from "../axios.service"; +import { Router } from '@angular/router'; @Component({ selector: 'app-sidebar-left', @@ -12,7 +13,7 @@ export class SidebarLeftComponent implements OnInit, OnDestroy { isLoggedIn: boolean = false; private authStatusSub: Subscription | undefined; - constructor(public axiosService: AxiosService) { } + constructor(public axiosService: AxiosService, public router: Router) { } ngOnInit(): void { this.isLoggedIn = this.axiosService.getAuthTocken() !== null;