Merge branch 'main' into #885-media-viewer

# Conflicts:
#	src/app/+item-page/item-page.module.ts
#	src/app/+item-page/simple/item-types/shared/item.component.ts
#	src/app/app.component.scss
#	src/environments/mock-environment.ts
This commit is contained in:
Dániel Péter Sipos
2021-03-26 16:57:07 +01:00
672 changed files with 54289 additions and 13976 deletions

View File

@@ -2,6 +2,7 @@ import { GlobalConfig } from '../config/global-config.interface';
import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
import { BrowseByType } from '../app/+browse-by/+browse-by-switcher/browse-by-decorator';
import { RestRequestMethod } from '../app/core/data/rest-request-method';
import { BASE_THEME_NAME } from '../app/shared/theme-support/theme.constants';
export const environment: GlobalConfig = {
production: true,
@@ -132,8 +133,6 @@ export const environment: GlobalConfig = {
async: true,
time: false
},
// Google Analytics tracking id
gaTrackingId: '',
// Log directory
logDirectory: '.',
// NOTE: will log all redux actions and transfers in console
@@ -158,8 +157,12 @@ export const environment: GlobalConfig = {
code: 'nl',
label: 'Nederlands',
active: true,
}, {
code: 'pt',
},{
code: 'pt-BR',
label: 'Português do Brasil',
active: true,
},{
code: 'pt-PT',
label: 'Português',
active: true,
}, {
@@ -224,9 +227,40 @@ export const environment: GlobalConfig = {
undoTimeout: 10000 // 10 seconds
}
},
theme: {
name: 'default',
},
themes: [
// Add additional themes here. In the case where multiple themes match a route, the first one
// in this list will get priority. It is advisable to always have a theme that matches
// every route as the last one
// {
// // A theme with a handle property will match the community, collection or item with the given
// // handle, and all collections and/or items within it
// name: 'custom',
// handle: '10673/1233'
// },
// {
// // A theme with a regex property will match the route using a regular expression. If it
// // matches the route for a community or collection it will also apply to all collections
// // and/or items within it
// name: 'custom',
// regex: 'collections\/e8043bc2.*'
// },
// {
// // A theme with a uuid property will match the community, collection or item with the given
// // ID, and all collections and/or items within it
// name: 'custom',
// uuid: '0958c910-2037-42a9-81c7-dca80e3892b4'
// },
// {
// // A theme with only a name will match every route
// name: 'custom'
// },
{
// This theme will use the default bootstrap styling for DSpace components
name: BASE_THEME_NAME
},
],
// Whether the UI should rewrite file download URLs to match its domain. Only necessary to enable when running UI and REST API on separate domains
rewriteDownloadUrls: false,
// Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with "image" or "video").