diff --git a/apps/dafa-web/src/app/app.component.html b/apps/dafa-web/src/app/app.component.html
index 2cd91a3..4c0dc28 100644
--- a/apps/dafa-web/src/app/app.component.html
+++ b/apps/dafa-web/src/app/app.component.html
@@ -2,7 +2,7 @@
diff --git a/apps/dafa-web/src/app/app.component.spec.ts b/apps/dafa-web/src/app/app.component.spec.ts
index 20f7319..ebbc5ac 100644
--- a/apps/dafa-web/src/app/app.component.spec.ts
+++ b/apps/dafa-web/src/app/app.component.spec.ts
@@ -2,13 +2,14 @@ import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
import { NavigationModule } from './components/navigation/navigation.module';
+import { SidebarModule } from './components/sidebar/sidebar.module';
import { SkipToContentModule } from './components/skip-to-content/skip-to-content.module';
describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [AppComponent],
- imports: [RouterTestingModule, SkipToContentModule, NavigationModule],
+ imports: [RouterTestingModule, SkipToContentModule, NavigationModule, SidebarModule],
}).compileComponents();
});
diff --git a/apps/dafa-web/src/app/app.component.ts b/apps/dafa-web/src/app/app.component.ts
index 48a13e6..99f1baa 100644
--- a/apps/dafa-web/src/app/app.component.ts
+++ b/apps/dafa-web/src/app/app.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
+import { User } from '@dafa-models/user.model';
import { filter } from 'rxjs/operators';
import { UnsubscribeDirective } from './directives/unsubscribe.directive';
@@ -11,6 +12,9 @@ import { UnsubscribeDirective } from './directives/unsubscribe.directive';
})
export class AppComponent extends UnsubscribeDirective {
path = '';
+ user: User = {
+ id: 'Fake user',
+ };
constructor(private router: Router) {
super();
diff --git a/apps/dafa-web/src/app/components/navigation/navigation.component.html b/apps/dafa-web/src/app/components/navigation/navigation.component.html
index 878aa7c..ab2d5a6 100644
--- a/apps/dafa-web/src/app/components/navigation/navigation.component.html
+++ b/apps/dafa-web/src/app/components/navigation/navigation.component.html
@@ -4,8 +4,8 @@
-
+
+
+
+ {{ user.id }}
+
- -->
+
diff --git a/apps/dafa-web/src/app/components/navigation/navigation.component.scss b/apps/dafa-web/src/app/components/navigation/navigation.component.scss
index 3570944..69156a8 100644
--- a/apps/dafa-web/src/app/components/navigation/navigation.component.scss
+++ b/apps/dafa-web/src/app/components/navigation/navigation.component.scss
@@ -93,6 +93,6 @@
}
&__text {
- margin-top: $af__gutter-xxs;
+ margin-top: $af__gutter-xs;
}
}
diff --git a/apps/dafa-web/src/app/components/navigation/navigation.component.ts b/apps/dafa-web/src/app/components/navigation/navigation.component.ts
index a13cd27..d8dd705 100644
--- a/apps/dafa-web/src/app/components/navigation/navigation.component.ts
+++ b/apps/dafa-web/src/app/components/navigation/navigation.component.ts
@@ -1,5 +1,6 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { IconType } from '@dafa-enums/icon-type.enum';
+import { User } from '@dafa-models/user.model';
@Component({
selector: 'dafa-navigation',
@@ -8,5 +9,6 @@ import { IconType } from '@dafa-enums/icon-type.enum';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class NavigationComponent {
+ @Input() user: User;
iconType = IconType;
}
diff --git a/apps/dafa-web/src/app/components/sidebar/sidebar.component.spec.ts b/apps/dafa-web/src/app/components/sidebar/sidebar.component.spec.ts
index e2319b2..aa157a9 100644
--- a/apps/dafa-web/src/app/components/sidebar/sidebar.component.spec.ts
+++ b/apps/dafa-web/src/app/components/sidebar/sidebar.component.spec.ts
@@ -1,5 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
+import { IconModule } from '@dafa-shared/components/icon/icon.module';
import { SidebarComponent } from './sidebar.component';
describe('SidebarComponent', () => {
@@ -9,7 +10,7 @@ describe('SidebarComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [SidebarComponent],
- imports: [RouterTestingModule],
+ imports: [RouterTestingModule, IconModule],
}).compileComponents();
});
diff --git a/apps/dafa-web/src/app/data/models/user.model.ts b/apps/dafa-web/src/app/data/models/user.model.ts
new file mode 100644
index 0000000..65b0671
--- /dev/null
+++ b/apps/dafa-web/src/app/data/models/user.model.ts
@@ -0,0 +1,3 @@
+export interface User {
+ id: string;
+}
diff --git a/apps/dafa-web/src/app/shared/components/icon/icon.component.scss b/apps/dafa-web/src/app/shared/components/icon/icon.component.scss
index abd987e..4f65103 100644
--- a/apps/dafa-web/src/app/shared/components/icon/icon.component.scss
+++ b/apps/dafa-web/src/app/shared/components/icon/icon.component.scss
@@ -12,9 +12,9 @@
@include dafa__digi-ng-icon(1em);
}
&--l {
- @include dafa__digi-ng-icon(1.5em);
+ @include dafa__digi-ng-icon(1.25em);
}
&--xl {
- @include dafa__digi-ng-icon(2em);
+ @include dafa__digi-ng-icon(1.5em);
}
}