hazza/yel-dspace-angular
1
0
Fork 0
forked from hazza/dspace-angular
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into submission

Browse Source 
# Conflicts:
#	resources/i18n/en.json
#	src/app/app.component.scss
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/chips/chips.component.spec.ts
#	src/app/shared/chips/models/chips-item.model.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
#	src/app/shared/shared.module.ts
#	yarn.lock
This commit is contained in:
Giuseppe Digilio
2018-12-20 17:02:46 +01:00
parent 5068f160de 2055f3216d
commit eda0ebb21c
139 changed files with 5385 additions and 1975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/app.module.ts
View File

@@ -32,6 +32,11 @@ import { NotificationsBoardComponent } from './shared/notifications/notification
import { NotificationComponent } from './shared/notifications/notification/notification.component';
import { SharedModule } from './shared/shared.module';
import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component';
import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.component';
import { AdminSidebarSectionComponent } from './+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
import { NavbarModule } from './navbar/navbar.module';
export function getConfig() {
return ENV_CONFIG;
@@ -49,6 +54,7 @@ export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppStat
const IMPORTS = [
CommonModule,
SharedModule,
NavbarModule,
HttpClientModule,
AppRoutingModule,
CoreModule.forRoot(),
@@ -90,6 +96,10 @@ const PROVIDERS = [
const DECLARATIONS = [
AppComponent,
HeaderComponent,
HeaderNavbarWrapperComponent,
AdminSidebarComponent,
AdminSidebarSectionComponent,
ExpandableAdminSidebarSectionComponent,
FooterComponent,
PageNotFoundComponent,
NotificationComponent,
@@ -108,10 +118,14 @@ const EXPORTS = [
...PROVIDERS
],
declarations: [
...DECLARATIONS
...DECLARATIONS,
],
exports: [
...EXPORTS
],
entryComponents: [
AdminSidebarSectionComponent,
ExpandableAdminSidebarSectionComponent
]
})
export class AppModule {