hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed import issues

Browse Source
This commit is contained in:
lotte
2019-09-06 16:07:37 +02:00
parent 2b24caba34
commit e518380025
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.component.spec.ts
View File

@@ -44,8 +44,8 @@ import { ActivatedRoute, Router } from '@angular/router';
import { RouteService } from './core/services/route.service'; import { RouteService } from './core/services/route.service';
import { MockActivatedRoute } from './shared/mocks/mock-active-router'; import { MockActivatedRoute } from './shared/mocks/mock-active-router';
import { MockRouter } from './shared/mocks/mock-router'; import { MockRouter } from './shared/mocks/mock-router';
import { CookieService } from './shared/services/cookie.service';
import { MockCookieService } from './shared/mocks/mock-cookie.service'; import { MockCookieService } from './shared/mocks/mock-cookie.service';
import { CookieService } from './core/services/cookie.service';
let comp: AppComponent; let comp: AppComponent;
let fixture: ComponentFixture<AppComponent>; let fixture: ComponentFixture<AppComponent>;

3
src/app/app.component.ts
View File

@@ -32,9 +32,8 @@ import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
import { slideSidebarPadding } from './shared/animations/slide'; import { slideSidebarPadding } from './shared/animations/slide';
import { HostWindowService } from './shared/host-window.service'; import { HostWindowService } from './shared/host-window.service';
import { Theme } from '../config/theme.inferface'; import { Theme } from '../config/theme.inferface';
import { ClientCookieService } from './shared/services/client-cookie.service';
import { isNotEmpty } from './shared/empty.util'; import { isNotEmpty } from './shared/empty.util';
import { CookieService } from './shared/services/cookie.service'; import { CookieService } from './core/services/cookie.service';
export const LANG_COOKIE = 'language_cookie'; export const LANG_COOKIE = 'language_cookie';

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

@@ -39,7 +39,7 @@ import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/e
import { NavbarModule } from './navbar/navbar.module'; import { NavbarModule } from './navbar/navbar.module';
import { JournalEntitiesModule } from './entity-groups/journal-entities/journal-entities.module'; import { JournalEntitiesModule } from './entity-groups/journal-entities/journal-entities.module';
import { ResearchEntitiesModule } from './entity-groups/research-entities/research-entities.module'; import { ResearchEntitiesModule } from './entity-groups/research-entities/research-entities.module';
import { ClientCookieService } from './shared/services/client-cookie.service'; import { ClientCookieService } from './core/services/client-cookie.service';
export function getConfig() { export function getConfig() {
return ENV_CONFIG; return ENV_CONFIG;

2
src/app/shared/lang-switch/lang-switch.component.spec.ts
View File

@@ -7,8 +7,8 @@ import { GLOBAL_CONFIG } from '../../../config';
import {LangConfig} from '../../../config/lang-config.interface'; import {LangConfig} from '../../../config/lang-config.interface';
import {Observable, of} from 'rxjs'; import {Observable, of} from 'rxjs';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { CookieService } from '../services/cookie.service';
import { MockCookieService } from '../mocks/mock-cookie.service'; import { MockCookieService } from '../mocks/mock-cookie.service';
import { CookieService } from '../../core/services/cookie.service';
// This test is completely independent from any message catalogs or keys in the codebase // This test is completely independent from any message catalogs or keys in the codebase
// The translation module is instantiated with these bogus messages that we aren't using anyway. // The translation module is instantiated with these bogus messages that we aren't using anyway.

3
src/app/shared/lang-switch/lang-switch.component.ts
View File

@@ -2,9 +2,8 @@ import {Component, Inject, OnInit} from '@angular/core';
import { GLOBAL_CONFIG, GlobalConfig } from '../../../config'; import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
import {TranslateService} from '@ngx-translate/core'; import {TranslateService} from '@ngx-translate/core';
import {LangConfig} from '../../../config/lang-config.interface'; import {LangConfig} from '../../../config/lang-config.interface';
import { ClientCookieService } from '../services/client-cookie.service';
import { LANG_COOKIE } from '../../app.component'; import { LANG_COOKIE } from '../../app.component';
import { CookieService } from '../services/cookie.service'; import { CookieService } from '../../core/services/cookie.service';
@Component({ @Component({
selector: 'ds-lang-switch', selector: 'ds-lang-switch',