diff --git a/src/app/components/bread-crump/bread-crump.component.spec.ts b/src/app/components/bread-crump/bread-crump.component.spec.ts index 210b16b..ce78152 100644 --- a/src/app/components/bread-crump/bread-crump.component.spec.ts +++ b/src/app/components/bread-crump/bread-crump.component.spec.ts @@ -15,9 +15,8 @@ describe('BreadCrumpComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [BreadCrumpComponent], - providers: [ { provide: ActivatedRoute, useValue: mockActivatedRoute },] - }) - .compileComponents(); + providers: [{ provide: ActivatedRoute, useValue: mockActivatedRoute }], + }).compileComponents(); fixture = TestBed.createComponent(BreadCrumpComponent); component = fixture.componentInstance; diff --git a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.html b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.html index 0200293..41532e7 100644 --- a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.html +++ b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.html @@ -1,26 +1,24 @@
- -
- - + -
- @@ -72,11 +69,10 @@ type="button" class="toolbar-container__btn" [ngClass]="{ active: activeButton === 3 }" - (click)="setActiveButton(3)" + routerLink="/dashboard/profile" > -
diff --git a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.scss b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.scss index 4f7d633..08e90fb 100644 --- a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.scss +++ b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.scss @@ -16,15 +16,16 @@ &__logo{ border: none; outline: none; - border-radius: .375rem 0 0 .375rem; padding-block: 1rem; background: none; display: flex; justify-content: center; position: relative; - font-size: 3.25rem; cursor: pointer; - color: #1f66a8; + + img { + width: 3rem; + } } &__btn{ @@ -38,7 +39,11 @@ font-size: 2.25rem; cursor: pointer; position: relative; - transition: all 1sec linear ; + transition: all 0.2s ease; + + &__github{ + color: #1f66a8; + } } } diff --git a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.spec.ts b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.spec.ts index 5fe5354..814d047 100644 --- a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.spec.ts +++ b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.spec.ts @@ -11,16 +11,22 @@ import { SyncOutline, UserOutline, FullscreenOutline, - FilterOutline , - SettingOutline , - GithubOutline + FilterOutline, + SettingOutline, + GithubOutline, } from '@ant-design/icons-angular/icons'; - +import { of } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; describe('GraphToolBarComponent', () => { let component: GraphToolBarComponent; let fixture: ComponentFixture; + const mockActivatedRoute = { + params: of({ id: 1 }), + snapshot: { params: { id: 1 } }, + }; + beforeEach(async () => { await TestBed.configureTestingModule({ imports: [GraphToolBarComponent], @@ -37,14 +43,14 @@ describe('GraphToolBarComponent', () => { SyncOutline, UserOutline, FullscreenOutline, - FilterOutline , - SettingOutline , - GithubOutline + FilterOutline, + SettingOutline, + GithubOutline, ], }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, ], - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(GraphToolBarComponent); component = fixture.componentInstance; diff --git a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.ts b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.ts index faa4509..ad2ae03 100644 --- a/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.ts +++ b/src/app/components/graph-components/toolbarl/graph-tool-bar/graph-tool-bar.component.ts @@ -7,13 +7,25 @@ import { NzFlexModule } from 'ng-zorro-antd/flex'; import { NzButtonModule } from 'ng-zorro-antd/button'; import { NzPopoverModule } from 'ng-zorro-antd/popover'; import { LayoutsComponent } from '../toolbar-components/layouts/layouts.component'; -import { UploadComponentsComponent } from "../toolbar-components/upload-component/upload-layout/upload-components.component"; +import { UploadComponentsComponent } from '../toolbar-components/upload-component/upload-layout/upload-components.component'; import { NzSwitchModule } from 'ng-zorro-antd/switch'; +import { RouterLink } from '@angular/router'; @Component({ selector: 'app-graph-tool-bar', standalone: true, - imports: [NzIconModule, NgClass, NzToolTipModule, NzFlexModule, NzButtonModule, NzPopoverModule, LayoutsComponent, UploadComponentsComponent , NzSwitchModule], + imports: [ + RouterLink, + NzIconModule, + NgClass, + NzToolTipModule, + NzFlexModule, + NzButtonModule, + NzPopoverModule, + LayoutsComponent, + UploadComponentsComponent, + NzSwitchModule, + ], providers: [], templateUrl: './graph-tool-bar.component.html', styleUrl: './graph-tool-bar.component.scss', diff --git a/src/app/components/manage-users-components/users-table/users-table.component.ts b/src/app/components/manage-users-components/users-table/users-table.component.ts index 04a031b..2dcacb6 100644 --- a/src/app/components/manage-users-components/users-table/users-table.component.ts +++ b/src/app/components/manage-users-components/users-table/users-table.component.ts @@ -93,7 +93,7 @@ export class UsersTableComponent implements OnInit { protected deleteUser(user: UserData): void { this.userService.deleteUser(user.id).subscribe({ - next: (response) => { + next: () => { this.notification.createNotification('success', 'User deleted', `User ${user.username} has been deleted`); this.loadDataFromServer(0, 10); }, diff --git a/src/app/components/sidebar/sidebar.component.html b/src/app/components/sidebar/sidebar.component.html index 288cfac..003b543 100644 --- a/src/app/components/sidebar/sidebar.component.html +++ b/src/app/components/sidebar/sidebar.component.html @@ -31,6 +31,8 @@

Negar

class="sidebar-logo__profile-container__name__icon" src="/logout.svg" alt="logout" + tabindex="0" + role="button" (click)="logout()" (keydown.enter)="logout()" (keydown.space)="logout()" diff --git a/src/app/page/graph/graph/graph.component.spec.ts b/src/app/page/graph/graph/graph.component.spec.ts index c87a36f..ce9ffcf 100644 --- a/src/app/page/graph/graph/graph.component.spec.ts +++ b/src/app/page/graph/graph/graph.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import { GraphComponent } from './graph.component'; import { NZ_ICONS, NzIconService } from 'ng-zorro-antd/icon'; + import { ProjectOutline, NodeIndexOutline, @@ -16,11 +16,18 @@ import { SettingOutline, GithubOutline, } from '@ant-design/icons-angular/icons'; +import { of } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; describe('GraphComponent', () => { let component: GraphComponent; let fixture: ComponentFixture; + const mockActivatedRoute = { + params: of({ id: 1 }), + snapshot: { params: { id: 1 } }, + }; + beforeEach(async () => { await TestBed.configureTestingModule({ imports: [GraphComponent], @@ -43,6 +50,7 @@ describe('GraphComponent', () => { GithubOutline, ], }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, ], }).compileComponents();