Skip to content
Snippets Groups Projects
Commit 1a245715 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-400 fix user-icon includes

parent 95ba3fc6
No related branches found
No related tags found
No related merge requests found
Showing
with 34 additions and 21 deletions
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { UiModule } from '@goofy-client/ui'; import { UiModule } from '@goofy-client/ui';
import { UserIconComponent } from '@goofy-client/user-profile';
import { VorgangSearchContainerComponent } from '@goofy-client/vorgang-shared-ui'; import { VorgangSearchContainerComponent } from '@goofy-client/vorgang-shared-ui';
import { configureTestSuite } from 'ng-bullet'; import { configureTestSuite } from 'ng-bullet';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
...@@ -20,7 +21,8 @@ describe('HeaderComponent', () => { ...@@ -20,7 +21,8 @@ describe('HeaderComponent', () => {
declarations: [ declarations: [
HeaderComponent, HeaderComponent,
MockComponent(SettingsComponent), MockComponent(SettingsComponent),
MockComponent(VorgangSearchContainerComponent) MockComponent(VorgangSearchContainerComponent),
MockComponent(UserIconComponent)
] ]
}) })
}); });
......
...@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; ...@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { UiModule } from '@goofy-client/ui'; import { UiModule } from '@goofy-client/ui';
import { UserProfileModule } from '@goofy-client/user-profile';
import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui'; import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui';
import { BuildInfoComponent } from './build-info/build-info.component'; import { BuildInfoComponent } from './build-info/build-info.component';
import { HeaderContainerComponent } from './header-container/header-container.component'; import { HeaderContainerComponent } from './header-container/header-container.component';
...@@ -21,7 +22,8 @@ import { NavigationComponent } from './navigation/navigation.component'; ...@@ -21,7 +22,8 @@ import { NavigationComponent } from './navigation/navigation.component';
CommonModule, CommonModule,
UiModule, UiModule,
RouterModule, RouterModule,
VorgangSharedUiModule VorgangSharedUiModule,
UserProfileModule
], ],
exports: [ exports: [
BuildInfoComponent, BuildInfoComponent,
......
...@@ -28,13 +28,11 @@ import { SpinnerComponent } from './spinner/spinner.component'; ...@@ -28,13 +28,11 @@ import { SpinnerComponent } from './spinner/spinner.component';
import { SubnavigationComponent } from './subnavigation/subnavigation.component'; import { SubnavigationComponent } from './subnavigation/subnavigation.component';
import { TextEditorComponent } from './text-editor/text-editor.component'; import { TextEditorComponent } from './text-editor/text-editor.component';
import { TextAreaEditorComponent } from './textarea-editor/textarea-editor.component'; import { TextAreaEditorComponent } from './textarea-editor/textarea-editor.component';
import { UserIconComponent } from './user-icon/user-icon.component';
import { ValidationErrorComponent } from './validation-error/validation-error.component'; import { ValidationErrorComponent } from './validation-error/validation-error.component';
const components = [ const components = [
SubnavigationComponent, SubnavigationComponent,
SpinnerComponent, SpinnerComponent,
UserIconComponent,
ButtonWithSpinnerComponent, ButtonWithSpinnerComponent,
IconButtonWithSpinnerComponent, IconButtonWithSpinnerComponent,
ProgressBarComponent, ProgressBarComponent,
......
export * from './lib/user-icon/user-icon.component';
export * from './lib/user-profile.module'; export * from './lib/user-profile.module';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { TechSharedModule } from '@goofy-client/tech-shared';
import { UiModule } from '@goofy-client/ui';
import { UserIconComponent } from './user-icon/user-icon.component';
@NgModule({ @NgModule({
imports: [CommonModule], imports: [
CommonModule,
TechSharedModule,
UiModule
],
declarations: [UserIconComponent],
exports: [UserIconComponent]
}) })
export class UserProfileModule { } export class UserProfileModule { }
\ No newline at end of file
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { EnumToLabelPipe, HasLinkPipe } from '@goofy-client/tech-shared'; import { EnumToLabelPipe, HasLinkPipe } from '@goofy-client/tech-shared';
import { UserIconComponent } from '@goofy-client/user-profile';
import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared'; import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared';
import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui'; import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui';
import { UserIconComponent } from 'libs/ui/src/lib/ui/user-icon/user-icon.component';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { VorgangDetailHeaderComponent } from './vorgang-detail-header.component'; import { VorgangDetailHeaderComponent } from './vorgang-detail-header.component';
......
...@@ -6,6 +6,7 @@ import { KommentarModule } from '@goofy-client/kommentar'; ...@@ -6,6 +6,7 @@ import { KommentarModule } from '@goofy-client/kommentar';
import { OzgFileModule } from '@goofy-client/ozg-file'; import { OzgFileModule } from '@goofy-client/ozg-file';
import { TechSharedModule } from '@goofy-client/tech-shared'; import { TechSharedModule } from '@goofy-client/tech-shared';
import { UiModule } from '@goofy-client/ui'; import { UiModule } from '@goofy-client/ui';
import { UserProfileModule } from '@goofy-client/user-profile';
import { VorgangSharedModule } from '@goofy-client/vorgang-shared'; import { VorgangSharedModule } from '@goofy-client/vorgang-shared';
import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui'; import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui';
import { WiedervorlageModule } from '@goofy-client/wiedervorlage'; import { WiedervorlageModule } from '@goofy-client/wiedervorlage';
...@@ -30,8 +31,7 @@ import { VorgangDetailPageComponent } from './vorgang-detail-page/vorgang-detail ...@@ -30,8 +31,7 @@ import { VorgangDetailPageComponent } from './vorgang-detail-page/vorgang-detail
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
component: VorgangDetailPageComponent, component: VorgangDetailPageComponent
//children: kommentareRoutes
} }
]; ];
...@@ -46,7 +46,8 @@ const routes: Routes = [ ...@@ -46,7 +46,8 @@ const routes: Routes = [
OzgFileModule, OzgFileModule,
ForwardingModule, ForwardingModule,
KommentarModule, KommentarModule,
VorgangSharedUiModule VorgangSharedUiModule,
UserProfileModule
], ],
declarations: [ declarations: [
VorgangDetailPageComponent, VorgangDetailPageComponent,
......
...@@ -8,14 +8,12 @@ import { MatIcon } from '@angular/material/icon'; ...@@ -8,14 +8,12 @@ import { MatIcon } from '@angular/material/icon';
import { MatIconTestingModule } from '@angular/material/icon/testing'; import { MatIconTestingModule } from '@angular/material/icon/testing';
import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTooltipModule } from '@angular/material/tooltip';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { EnumToLabelPipe, HasLinkPipe, ToResourceUriPipe } from '@goofy-client/tech-shared'; import { EnumToLabelPipe, FormatDateWithTimePipe, FormatListDatePipe, HasLinkPipe, ToResourceUriPipe } from '@goofy-client/tech-shared';
import { UserIconComponent } from '@goofy-client/user-profile';
import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared'; import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared';
import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui'; import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui';
import { FormatDateWithTimePipe } from 'libs/tech-shared/src/lib/pipes/format-date-with-time.pipe'; import { WiedervorlageListInVorgangListContainerComponent } from '@goofy-client/wiedervorlage';
import { FormatListDatePipe } from 'libs/tech-shared/src/lib/pipes/format-list-date.pipe';
import { UserIconComponent } from 'libs/ui/src/lib/ui/user-icon/user-icon.component';
import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
import { WiedervorlageListInVorgangListContainerComponent } from 'libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component';
import { configureTestSuite } from 'ng-bullet'; import { configureTestSuite } from 'ng-bullet';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { VorgangListItemComponent } from './vorgang-list-item.component'; import { VorgangListItemComponent } from './vorgang-list-item.component';
......
...@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core'; ...@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { TechSharedModule } from '@goofy-client/tech-shared'; import { TechSharedModule } from '@goofy-client/tech-shared';
import { UiModule } from '@goofy-client/ui'; import { UiModule } from '@goofy-client/ui';
import { UserProfileModule } from '@goofy-client/user-profile';
import { VorgangSharedModule } from '@goofy-client/vorgang-shared'; import { VorgangSharedModule } from '@goofy-client/vorgang-shared';
import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui'; import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui';
import { WiedervorlageModule } from '@goofy-client/wiedervorlage'; import { WiedervorlageModule } from '@goofy-client/wiedervorlage';
...@@ -39,6 +40,7 @@ const routes: Routes = [ ...@@ -39,6 +40,7 @@ const routes: Routes = [
VorgangSharedModule, VorgangSharedModule,
WiedervorlageModule, WiedervorlageModule,
VorgangSharedUiModule, VorgangSharedUiModule,
UserProfileModule
], ],
declarations: [ declarations: [
VorgangListComponent, VorgangListComponent,
......
export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component'; export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component';
export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component'; export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component';
export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component'; export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component';
export * from './lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component';
export * from './lib/wiedervorlage.module'; export * from './lib/wiedervorlage.module';
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment