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

Merge remote-tracking branch 'remotes/origin/master' into authentication

Browse Source 
# Conflicts:
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.effects.ts
#	src/app/core/core.module.ts
#	src/app/core/shared/hal-endpoint.service.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
#	src/modules/app/browser-app.module.ts
#	src/modules/app/server-app.module.ts
This commit is contained in:
Giuseppe Digilio
2018-05-08 10:57:15 +02:00
parent b0b4342f24 99f8d4f24d
commit f8b3cc516c
131 changed files with 2337 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/app/browser-app.module.ts
View File

@@ -19,6 +19,8 @@ import { ClientCookieService } from '../../app/shared/services/client-cookie.ser
import { CookieService } from '../../app/shared/services/cookie.service';
import { ServerAuthService } from '../../app/core/auth/server-auth.service';
import { AuthService } from '../../app/core/auth/auth.service';
import { Angulartics2Module } from 'angulartics2';
import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
export const REQ_KEY = makeStateKey<string>('req');
@@ -45,6 +47,7 @@ export function getRequest(transferState: TransferState): any {
preloadingStrategy:
IdlePreload
}),
Angulartics2Module.forRoot([Angulartics2GoogleAnalytics]),
BrowserAnimationsModule,
DSpaceBrowserTransferStateModule,
TranslateModule.forRoot({

4
src/modules/app/server-app.module.ts
View File

@@ -20,6 +20,9 @@ import { ServerCookieService } from '../../app/shared/services/server-cookie.ser
import { AuthService } from '../../app/core/auth/auth.service';
import { ServerAuthService } from '../../app/core/auth/server-auth.service';
import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
import { AngularticsMock } from '../../app/shared/mocks/mock-angulartics.service';
export function createTranslateLoader() {
return new TranslateUniversalLoader('dist/assets/i18n/', '.json');
}
@@ -46,6 +49,7 @@ export function createTranslateLoader() {
AppModule
],
providers: [
{ provide: Angulartics2GoogleAnalytics, useClass: AngularticsMock },
{
provide: AuthService,
useClass: ServerAuthService