diff --git a/src/app/+logout-page/logout-page.component.scss b/src/app/+logout-page/logout-page.component.scss deleted file mode 100644 index 7e594c0d9b..0000000000 --- a/src/app/+logout-page/logout-page.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../+login-page/login-page.component.scss'; diff --git a/src/app/+my-dspace-page/my-dspace-page.component.scss b/src/app/+my-dspace-page/my-dspace-page.component.scss deleted file mode 100644 index 98c426c269..0000000000 --- a/src/app/+my-dspace-page/my-dspace-page.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../+search-page/search.component.scss'; diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts index c2c694f445..7e0329f54f 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.ts @@ -17,8 +17,8 @@ import { Subscription } from 'rxjs'; import { catchError, map, switchMap, take } from 'rxjs/operators'; -import { getCollectionEditRolesRoute } from '../../../+collection-page/collection-page-routing-paths'; -import { getCommunityEditRolesRoute } from '../../../+community-page/community-page-routing-paths'; +import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths'; +import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths'; import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; diff --git a/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.html b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html similarity index 100% rename from src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.html rename to src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html diff --git a/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts similarity index 100% rename from src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts rename to src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts diff --git a/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.ts similarity index 100% rename from src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts rename to src/app/admin/admin-curation-tasks/admin-curation-tasks.component.ts diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html similarity index 100% rename from src/app/+admin/admin-import-metadata-page/metadata-import-page.component.html rename to src/app/admin/admin-import-metadata-page/metadata-import-page.component.html diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts similarity index 100% rename from src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts rename to src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts similarity index 100% rename from src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts rename to src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts diff --git a/src/app/+admin/admin-registries/admin-registries-routing-paths.ts b/src/app/admin/admin-registries/admin-registries-routing-paths.ts similarity index 100% rename from src/app/+admin/admin-registries/admin-registries-routing-paths.ts rename to src/app/admin/admin-registries/admin-registries-routing-paths.ts diff --git a/src/app/+admin/admin-registries/admin-registries-routing.module.ts b/src/app/admin/admin-registries/admin-registries-routing.module.ts similarity index 100% rename from src/app/+admin/admin-registries/admin-registries-routing.module.ts rename to src/app/admin/admin-registries/admin-registries-routing.module.ts diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/admin/admin-registries/admin-registries.module.ts similarity index 100% rename from src/app/+admin/admin-registries/admin-registries.module.ts rename to src/app/admin/admin-registries/admin-registries.module.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html rename to src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html diff --git a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts rename to src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts rename to src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-format.actions.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-format.actions.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html rename to src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html diff --git a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts rename to src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts rename to src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.html b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.html rename to src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html diff --git a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts rename to src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts similarity index 100% rename from src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts rename to src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html rename to src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts rename to src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts rename to src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html similarity index 100% rename from src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html rename to src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts rename to src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts rename to src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html similarity index 100% rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss similarity index 100% rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts similarity index 100% rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts diff --git a/src/app/+admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts similarity index 100% rename from src/app/+admin/admin-routing-paths.ts rename to src/app/admin/admin-routing-paths.ts diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts similarity index 100% rename from src/app/+admin/admin-routing.module.ts rename to src/app/admin/admin-routing.module.ts diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.html b/src/app/admin/admin-search-page/admin-search-page.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-page.component.html rename to src/app/admin/admin-search-page/admin-search-page.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.scss b/src/app/admin/admin-search-page/admin-search-page.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-page.component.scss rename to src/app/admin/admin-search-page/admin-search-page.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.spec.ts b/src/app/admin/admin-search-page/admin-search-page.component.spec.ts similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-page.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-page.component.spec.ts diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.ts b/src/app/admin/admin-search-page/admin-search-page.component.ts similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-page.component.ts rename to src/app/admin/admin-search-page/admin-search-page.component.ts diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts similarity index 96% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts index 38762057ad..2cb0413bbc 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts @@ -12,7 +12,7 @@ import { CollectionSearchResult } from '../../../../../shared/object-collection/ import { Collection } from '../../../../../core/shared/collection.model'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths'; +import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; import { LinkService } from '../../../../../core/cache/builders/link.service'; describe('CollectionAdminSearchResultGridElementComponent', () => { diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts similarity index 92% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts index 9477544f60..1412090e0f 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts @@ -5,7 +5,7 @@ import { Context } from '../../../../../core/shared/context.model'; import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model'; import { Collection } from '../../../../../core/shared/collection.model'; import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; -import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths'; +import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch) @Component({ diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts similarity index 96% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts index 66df215f87..17ce2cd7a1 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts @@ -14,7 +14,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; import { Community } from '../../../../../core/shared/community.model'; -import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths'; +import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; import { LinkService } from '../../../../../core/cache/builders/link.service'; describe('CommunityAdminSearchResultGridElementComponent', () => { diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts similarity index 93% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts index 59117b1f65..b0d603338b 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts @@ -5,7 +5,7 @@ import { Context } from '../../../../../core/shared/context.model'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; import { Community } from '../../../../../core/shared/community.model'; import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; -import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths'; +import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch) @Component({ diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts similarity index 96% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts index 56e25264cf..b394caef56 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts @@ -10,7 +10,7 @@ import { CollectionSearchResult } from '../../../../../shared/object-collection/ import { Collection } from '../../../../../core/shared/collection.model'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths'; +import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts similarity index 92% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts index 9622888660..8bcf20b230 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts @@ -5,7 +5,7 @@ import { Context } from '../../../../../core/shared/context.model'; import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model'; import { Collection } from '../../../../../core/shared/collection.model'; -import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths'; +import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch) @Component({ diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts similarity index 96% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts index 29d9925326..155d7f7509 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts @@ -10,7 +10,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; import { Community } from '../../../../../core/shared/community.model'; -import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths'; +import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts similarity index 93% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts index 2e82e7f3b8..9419ae3f3f 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts @@ -5,7 +5,7 @@ import { Context } from '../../../../../core/shared/context.model'; import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; import { Community } from '../../../../../core/shared/community.model'; -import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths'; +import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch) @Component({ diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss similarity index 100% rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts similarity index 97% rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts index 2696e621de..f354ac5f89 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts @@ -7,7 +7,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component'; import { Item } from '../../../core/shared/item.model'; import { URLCombiner } from '../../../core/url-combiner/url-combiner'; -import { getItemEditRoute } from '../../../+item-page/item-page-routing-paths'; +import { getItemEditRoute } from '../../../item-page/item-page-routing-paths'; import { ITEM_EDIT_DELETE_PATH, ITEM_EDIT_MOVE_PATH, @@ -15,7 +15,7 @@ import { ITEM_EDIT_PUBLIC_PATH, ITEM_EDIT_REINSTATE_PATH, ITEM_EDIT_WITHDRAW_PATH -} from '../../../+item-page/edit-item-page/edit-item-page.routing-paths'; +} from '../../../item-page/edit-item-page/edit-item-page.routing-paths'; describe('ItemAdminSearchResultActionsComponent', () => { let component: ItemAdminSearchResultActionsComponent; diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts similarity index 93% rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts index cded519796..fcc3cf0f17 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; import { URLCombiner } from '../../../core/url-combiner/url-combiner'; -import { getItemEditRoute } from '../../../+item-page/item-page-routing-paths'; +import { getItemEditRoute } from '../../../item-page/item-page-routing-paths'; import { ITEM_EDIT_MOVE_PATH, ITEM_EDIT_DELETE_PATH, @@ -9,7 +9,7 @@ import { ITEM_EDIT_PRIVATE_PATH, ITEM_EDIT_REINSTATE_PATH, ITEM_EDIT_WITHDRAW_PATH -} from '../../../+item-page/edit-item-page/edit-item-page.routing-paths'; +} from '../../../item-page/edit-item-page/edit-item-page.routing-paths'; @Component({ selector: 'ds-item-admin-search-result-actions-element', diff --git a/src/app/+admin/admin-search-page/admin-search.module.ts b/src/app/admin/admin-search-page/admin-search.module.ts similarity index 100% rename from src/app/+admin/admin-search-page/admin-search.module.ts rename to src/app/admin/admin-search-page/admin-search.module.ts diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar.component.html rename to src/app/admin/admin-sidebar/admin-sidebar.component.html diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.scss b/src/app/admin/admin-sidebar/admin-sidebar.component.scss similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar.component.scss rename to src/app/admin/admin-sidebar/admin-sidebar.component.scss diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts rename to src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts similarity index 100% rename from src/app/+admin/admin-sidebar/admin-sidebar.component.ts rename to src/app/admin/admin-sidebar/admin-sidebar.component.ts diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html similarity index 100% rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss similarity index 100% rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts similarity index 100% rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts similarity index 100% rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-page.component.html b/src/app/admin/admin-workflow-page/admin-workflow-page.component.html similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.html rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.html diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-page.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-page.component.scss similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.scss rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.scss diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-page.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.spec.ts rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-page.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.ts rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.ts diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.scss similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.scss rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.scss diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.scss similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.scss rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.scss diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.scss similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.scss rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.scss diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts similarity index 96% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts index cb1a0c9cdf..75e0e2e7a8 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts @@ -10,7 +10,7 @@ import { WorkflowItem } from '../../../core/submission/models/workflowitem.model import { getWorkflowItemDeleteRoute, getWorkflowItemSendBackRoute -} from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths'; +} from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; describe('WorkflowItemAdminWorkflowActionsComponent', () => { let component: WorkflowItemAdminWorkflowActionsComponent; diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts similarity index 93% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts index fbda9f1b29..32725a0e7a 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts @@ -3,7 +3,7 @@ import { WorkflowItem } from '../../../core/submission/models/workflowitem.model import { getWorkflowItemSendBackRoute, getWorkflowItemDeleteRoute -} from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths'; +} from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; @Component({ selector: 'ds-workflow-item-admin-workflow-actions-element', diff --git a/src/app/+admin/admin-workflow-page/admin-workflow.module.ts b/src/app/admin/admin-workflow-page/admin-workflow.module.ts similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow.module.ts rename to src/app/admin/admin-workflow-page/admin-workflow.module.ts diff --git a/src/app/+admin/admin.module.ts b/src/app/admin/admin.module.ts similarity index 100% rename from src/app/+admin/admin.module.ts rename to src/app/admin/admin.module.ts diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index 6ec8463f41..81b0755d11 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -2,9 +2,9 @@ import { DSpaceObject } from './core/shared/dspace-object.model'; import { Community } from './core/shared/community.model'; import { Collection } from './core/shared/collection.model'; import { Item } from './core/shared/item.model'; -import { getCommunityPageRoute } from './+community-page/community-page-routing-paths'; -import { getCollectionPageRoute } from './+collection-page/collection-page-routing-paths'; -import { getItemPageRoute } from './+item-page/item-page-routing-paths'; +import { getCommunityPageRoute } from './community-page/community-page-routing-paths'; +import { getCollectionPageRoute } from './collection-page/collection-page-routing-paths'; +import { getItemPageRoute } from './item-page/item-page-routing-paths'; import { hasValue } from './shared/empty.util'; import { URLCombiner } from './core/url-combiner/url-combiner'; diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 56672482f1..52a07b89f5 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -16,9 +16,9 @@ import { WORKFLOW_ITEM_MODULE_PATH, LEGACY_BITSTREAM_MODULE_PATH, } from './app-routing-paths'; -import { COLLECTION_MODULE_PATH } from './+collection-page/collection-page-routing-paths'; -import { COMMUNITY_MODULE_PATH } from './+community-page/community-page-routing-paths'; -import { ITEM_MODULE_PATH } from './+item-page/item-page-routing-paths'; +import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths'; +import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths'; +import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths'; import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths'; import { ReloadGuard } from './core/reload/reload.guard'; import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard'; @@ -36,7 +36,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu { path: 'reload/:rnd', component: ThemedPageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] }, { path: 'home', - loadChildren: () => import('./+home-page/home-page.module') + loadChildren: () => import('./home-page/home-page.module') .then((m) => m.HomePageModule), data: { showBreadcrumbs: false }, canActivate: [EndUserAgreementCurrentUserGuard] @@ -49,13 +49,13 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu }, { path: 'id', - loadChildren: () => import('./+lookup-by-id/lookup-by-id.module') + loadChildren: () => import('./lookup-by-id/lookup-by-id.module') .then((m) => m.LookupIdModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'handle', - loadChildren: () => import('./+lookup-by-id/lookup-by-id.module') + loadChildren: () => import('./lookup-by-id/lookup-by-id.module') .then((m) => m.LookupIdModule), canActivate: [EndUserAgreementCurrentUserGuard] }, @@ -73,94 +73,94 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu }, { path: COMMUNITY_MODULE_PATH, - loadChildren: () => import('./+community-page/community-page.module') + loadChildren: () => import('./community-page/community-page.module') .then((m) => m.CommunityPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: COLLECTION_MODULE_PATH, - loadChildren: () => import('./+collection-page/collection-page.module') + loadChildren: () => import('./collection-page/collection-page.module') .then((m) => m.CollectionPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: ITEM_MODULE_PATH, - loadChildren: () => import('./+item-page/item-page.module') + loadChildren: () => import('./item-page/item-page.module') .then((m) => m.ItemPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'entities/:entity-type', - loadChildren: () => import('./+item-page/item-page.module') + loadChildren: () => import('./item-page/item-page.module') .then((m) => m.ItemPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: LEGACY_BITSTREAM_MODULE_PATH, - loadChildren: () => import('./+bitstream-page/bitstream-page.module') + loadChildren: () => import('./bitstream-page/bitstream-page.module') .then((m) => m.BitstreamPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: BITSTREAM_MODULE_PATH, - loadChildren: () => import('./+bitstream-page/bitstream-page.module') + loadChildren: () => import('./bitstream-page/bitstream-page.module') .then((m) => m.BitstreamPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'mydspace', - loadChildren: () => import('./+my-dspace-page/my-dspace-page.module') + loadChildren: () => import('./my-dspace-page/my-dspace-page.module') .then((m) => m.MyDSpacePageModule), canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard] }, { path: 'search', - loadChildren: () => import('./+search-page/search-page-routing.module') + loadChildren: () => import('./search-page/search-page-routing.module') .then((m) => m.SearchPageRoutingModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'browse', - loadChildren: () => import('./+browse-by/browse-by-page.module') + loadChildren: () => import('./browse-by/browse-by-page.module') .then((m) => m.BrowseByPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: ADMIN_MODULE_PATH, - loadChildren: () => import('./+admin/admin.module') + loadChildren: () => import('./admin/admin.module') .then((m) => m.AdminModule), canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard] }, { path: 'login', - loadChildren: () => import('./+login-page/login-page.module') + loadChildren: () => import('./login-page/login-page.module') .then((m) => m.LoginPageModule), }, { path: 'logout', - loadChildren: () => import('./+logout-page/logout-page.module') + loadChildren: () => import('./logout-page/logout-page.module') .then((m) => m.LogoutPageModule), }, { path: 'submit', - loadChildren: () => import('./+submit-page/submit-page.module') + loadChildren: () => import('./submit-page/submit-page.module') .then((m) => m.SubmitPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'import-external', - loadChildren: () => import('./+import-external-page/import-external-page.module') + loadChildren: () => import('./import-external-page/import-external-page.module') .then((m) => m.ImportExternalPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'workspaceitems', - loadChildren: () => import('./+workspaceitems-edit-page/workspaceitems-edit-page.module') + loadChildren: () => import('./workspaceitems-edit-page/workspaceitems-edit-page.module') .then((m) => m.WorkspaceitemsEditPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: WORKFLOW_ITEM_MODULE_PATH, - loadChildren: () => import('./+workflowitems-edit-page/workflowitems-edit-page.module') + loadChildren: () => import('./workflowitems-edit-page/workflowitems-edit-page.module') .then((m) => m.WorkflowItemsEditPageModule), canActivate: [EndUserAgreementCurrentUserGuard] }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4a119036bc..131e6c6b58 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,9 +11,9 @@ import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core'; import { TranslateModule } from '@ngx-translate/core'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; -import { AdminSidebarSectionComponent } from './+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component'; -import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.component'; -import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component'; +import { AdminSidebarSectionComponent } from './admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component'; +import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component'; +import { ExpandableAdminSidebarSectionComponent } from './admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { appEffects } from './app.effects'; diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index 5abc378702..a02095d834 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -11,7 +11,7 @@ import { import { metadataRegistryReducer, MetadataRegistryState -} from './+admin/admin-registries/metadata-registry/metadata-registry.reducers'; +} from './admin/admin-registries/metadata-registry/metadata-registry.reducers'; import { CommunityListReducer, CommunityListState diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html similarity index 100% rename from src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html rename to src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts similarity index 100% rename from src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts rename to src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts similarity index 100% rename from src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts rename to src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts diff --git a/src/app/+bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts similarity index 100% rename from src/app/+bitstream-page/bitstream-page-routing.module.ts rename to src/app/bitstream-page/bitstream-page-routing.module.ts diff --git a/src/app/+bitstream-page/bitstream-page.module.ts b/src/app/bitstream-page/bitstream-page.module.ts similarity index 100% rename from src/app/+bitstream-page/bitstream-page.module.ts rename to src/app/bitstream-page/bitstream-page.module.ts diff --git a/src/app/+bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts similarity index 100% rename from src/app/+bitstream-page/bitstream-page.resolver.ts rename to src/app/bitstream-page/bitstream-page.resolver.ts diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html similarity index 100% rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss similarity index 100% rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts similarity index 99% rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts index 9c2cb3a093..67f8866e6d 100644 --- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts +++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts @@ -19,7 +19,7 @@ import { FormControl, FormGroup } from '@angular/forms'; import { FileSizePipe } from '../../shared/utils/file-size-pipe'; import { VarDirective } from '../../shared/utils/var.directive'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { getEntityEditRoute } from '../../+item-page/item-page-routing-paths'; +import { getEntityEditRoute } from '../../item-page/item-page-routing-paths'; import { createPaginatedList } from '../../shared/testing/utils.test'; import { Item } from '../../core/shared/item.model'; diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts similarity index 99% rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts index 4ad0aac7ef..f6ece7f4fa 100644 --- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts +++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts @@ -33,7 +33,7 @@ import { Metadata } from '../../core/shared/metadata.utils'; import { Location } from '@angular/common'; import { RemoteData } from '../../core/data/remote-data'; import { PaginatedList } from '../../core/data/paginated-list.model'; -import { getEntityEditRoute, getItemEditRoute } from '../../+item-page/item-page-routing-paths'; +import { getEntityEditRoute, getItemEditRoute } from '../../item-page/item-page-routing-paths'; import { Bundle } from '../../core/shared/bundle.model'; @Component({ diff --git a/src/app/+bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts similarity index 100% rename from src/app/+bitstream-page/legacy-bitstream-url.resolver.spec.ts rename to src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts diff --git a/src/app/+bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts similarity index 100% rename from src/app/+bitstream-page/legacy-bitstream-url.resolver.ts rename to src/app/bitstream-page/legacy-bitstream-url.resolver.ts diff --git a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts similarity index 97% rename from src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts rename to src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts index 5ce52d0002..7b0ddcb18e 100644 --- a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts +++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts @@ -15,7 +15,7 @@ import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { Community } from '../../core/shared/community.model'; import { Item } from '../../core/shared/item.model'; import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; -import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-page.component.spec'; +import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec'; import { VarDirective } from '../../shared/utils/var.directive'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; diff --git a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts similarity index 94% rename from src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts rename to src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts index f579085b5c..3158c3d7cc 100644 --- a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts +++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component } from '@angular/core'; import { BrowseByMetadataPageComponent, browseParamsToOptions -} from '../+browse-by-metadata-page/browse-by-metadata-page.component'; +} from '../browse-by-metadata-page/browse-by-metadata-page.component'; import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; import { combineLatest as observableCombineLatest } from 'rxjs'; import { RemoteData } from '../../core/data/remote-data'; @@ -12,7 +12,7 @@ import { ActivatedRoute, Params, Router } from '@angular/router'; import { BrowseService } from '../../core/browse/browse.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { StartsWithType } from '../../shared/starts-with/starts-with-decorator'; -import { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator'; +import { BrowseByType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator'; import { environment } from '../../../environments/environment'; import { PaginationService } from '../../core/pagination/pagination.service'; import { map } from 'rxjs/operators'; @@ -21,8 +21,8 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options @Component({ selector: 'ds-browse-by-date-page', - styleUrls: ['../+browse-by-metadata-page/browse-by-metadata-page.component.scss'], - templateUrl: '../+browse-by-metadata-page/browse-by-metadata-page.component.html' + styleUrls: ['../browse-by-metadata-page/browse-by-metadata-page.component.scss'], + templateUrl: '../browse-by-metadata-page/browse-by-metadata-page.component.html' }) /** * Component for browsing items by metadata definition of type 'date' diff --git a/src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts similarity index 100% rename from src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts rename to src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts diff --git a/src/app/+browse-by/browse-by-guard.spec.ts b/src/app/browse-by/browse-by-guard.spec.ts similarity index 100% rename from src/app/+browse-by/browse-by-guard.spec.ts rename to src/app/browse-by/browse-by-guard.spec.ts diff --git a/src/app/+browse-by/browse-by-guard.ts b/src/app/browse-by/browse-by-guard.ts similarity index 100% rename from src/app/+browse-by/browse-by-guard.ts rename to src/app/browse-by/browse-by-guard.ts diff --git a/src/app/+browse-by/browse-by-i18n-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts similarity index 100% rename from src/app/+browse-by/browse-by-i18n-breadcrumb.resolver.ts rename to src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html similarity index 100% rename from src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html rename to src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.scss b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss similarity index 100% rename from src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.scss rename to src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts similarity index 100% rename from src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts rename to src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts similarity index 98% rename from src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts rename to src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts index 5b84daab6e..3573ffb264 100644 --- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts +++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts @@ -14,7 +14,7 @@ import { getFirstSucceededRemoteData } from '../../core/shared/operators'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { StartsWithType } from '../../shared/starts-with/starts-with-decorator'; -import { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator'; +import { BrowseByType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator'; import { PaginationService } from '../../core/pagination/pagination.service'; import { map } from 'rxjs/operators'; diff --git a/src/app/+browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts similarity index 100% rename from src/app/+browse-by/browse-by-page.module.ts rename to src/app/browse-by/browse-by-page.module.ts diff --git a/src/app/+browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts similarity index 89% rename from src/app/+browse-by/browse-by-routing.module.ts rename to src/app/browse-by/browse-by-routing.module.ts index 8cf989695a..72d78f13fd 100644 --- a/src/app/+browse-by/browse-by-routing.module.ts +++ b/src/app/browse-by/browse-by-routing.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { BrowseByGuard } from './browse-by-guard'; import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver'; import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver'; -import { ThemedBrowseBySwitcherComponent } from './+browse-by-switcher/themed-browse-by-switcher.component'; +import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component'; @NgModule({ imports: [ diff --git a/src/app/+browse-by/+browse-by-switcher/browse-by-decorator.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts similarity index 100% rename from src/app/+browse-by/+browse-by-switcher/browse-by-decorator.spec.ts rename to src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts diff --git a/src/app/+browse-by/+browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts similarity index 100% rename from src/app/+browse-by/+browse-by-switcher/browse-by-decorator.ts rename to src/app/browse-by/browse-by-switcher/browse-by-decorator.ts diff --git a/src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html similarity index 100% rename from src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html rename to src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html diff --git a/src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts similarity index 100% rename from src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.spec.ts rename to src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts diff --git a/src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts similarity index 100% rename from src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts rename to src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts diff --git a/src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts similarity index 87% rename from src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts rename to src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts index e92fe30ba9..0187d4e3c5 100644 --- a/src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts +++ b/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts @@ -17,7 +17,7 @@ export class ThemedBrowseBySwitcherComponent extends ThemedComponent { - return import(`../../../themes/${themeName}/app/+browse-by/+browse-by-switcher/browse-by-switcher.component`); + return import(`../../../themes/${themeName}/app/browse-by/browse-by-switcher/browse-by-switcher.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts similarity index 97% rename from src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts rename to src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts index d44c667044..584da1c45a 100644 --- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts +++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts @@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-page.component.spec'; +import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec'; import { BrowseByTitlePageComponent } from './browse-by-title-page.component'; import { ItemDataService } from '../../core/data/item-data.service'; import { Community } from '../../core/shared/community.model'; diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts similarity index 89% rename from src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts rename to src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts index 381684f9f0..b3a2ceed00 100644 --- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts +++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts @@ -5,20 +5,20 @@ import { hasValue } from '../../shared/empty.util'; import { BrowseByMetadataPageComponent, browseParamsToOptions -} from '../+browse-by-metadata-page/browse-by-metadata-page.component'; +} from '../browse-by-metadata-page/browse-by-metadata-page.component'; import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { BrowseService } from '../../core/browse/browse.service'; import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; -import { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator'; +import { BrowseByType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator'; import { PaginationService } from '../../core/pagination/pagination.service'; import { map } from 'rxjs/operators'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; @Component({ selector: 'ds-browse-by-title-page', - styleUrls: ['../+browse-by-metadata-page/browse-by-metadata-page.component.scss'], - templateUrl: '../+browse-by-metadata-page/browse-by-metadata-page.component.html' + styleUrls: ['../browse-by-metadata-page/browse-by-metadata-page.component.scss'], + templateUrl: '../browse-by-metadata-page/browse-by-metadata-page.component.html' }) /** * Component for browsing items by title (dc.title) diff --git a/src/app/+browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts similarity index 63% rename from src/app/+browse-by/browse-by.module.ts rename to src/app/browse-by/browse-by.module.ts index 08b6c5739b..2d3618aae6 100644 --- a/src/app/+browse-by/browse-by.module.ts +++ b/src/app/browse-by/browse-by.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { BrowseByTitlePageComponent } from './+browse-by-title-page/browse-by-title-page.component'; +import { BrowseByTitlePageComponent } from './browse-by-title-page/browse-by-title-page.component'; import { SharedModule } from '../shared/shared.module'; -import { BrowseByMetadataPageComponent } from './+browse-by-metadata-page/browse-by-metadata-page.component'; -import { BrowseByDatePageComponent } from './+browse-by-date-page/browse-by-date-page.component'; -import { BrowseBySwitcherComponent } from './+browse-by-switcher/browse-by-switcher.component'; -import { ThemedBrowseBySwitcherComponent } from './+browse-by-switcher/themed-browse-by-switcher.component'; +import { BrowseByMetadataPageComponent } from './browse-by-metadata-page/browse-by-metadata-page.component'; +import { BrowseByDatePageComponent } from './browse-by-date-page/browse-by-date-page.component'; +import { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component'; +import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator diff --git a/src/app/+collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts similarity index 100% rename from src/app/+collection-page/collection-form/collection-form.component.ts rename to src/app/collection-page/collection-form/collection-form.component.ts diff --git a/src/app/+collection-page/collection-form/collection-form.module.ts b/src/app/collection-page/collection-form/collection-form.module.ts similarity index 100% rename from src/app/+collection-page/collection-form/collection-form.module.ts rename to src/app/collection-page/collection-form/collection-form.module.ts diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html similarity index 100% rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.scss similarity index 100% rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.scss diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts similarity index 100% rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts similarity index 99% rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts index ce5ea5a142..9a93457436 100644 --- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts +++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts @@ -22,7 +22,7 @@ import { ItemDataService } from '../../core/data/item-data.service'; import { TranslateService } from '@ngx-translate/core'; import { CollectionDataService } from '../../core/data/collection-data.service'; import { isNotEmpty } from '../../shared/empty.util'; -import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model'; import { SearchService } from '../../core/shared/search/search.service'; diff --git a/src/app/+collection-page/collection-page-administrator.guard.ts b/src/app/collection-page/collection-page-administrator.guard.ts similarity index 100% rename from src/app/+collection-page/collection-page-administrator.guard.ts rename to src/app/collection-page/collection-page-administrator.guard.ts diff --git a/src/app/+collection-page/collection-page-routing-paths.ts b/src/app/collection-page/collection-page-routing-paths.ts similarity index 100% rename from src/app/+collection-page/collection-page-routing-paths.ts rename to src/app/collection-page/collection-page-routing-paths.ts diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts similarity index 100% rename from src/app/+collection-page/collection-page-routing.module.ts rename to src/app/collection-page/collection-page-routing.module.ts diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html similarity index 100% rename from src/app/+collection-page/collection-page.component.html rename to src/app/collection-page/collection-page.component.html diff --git a/src/app/+collection-page/collection-page.component.scss b/src/app/collection-page/collection-page.component.scss similarity index 100% rename from src/app/+collection-page/collection-page.component.scss rename to src/app/collection-page/collection-page.component.scss diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts similarity index 100% rename from src/app/+collection-page/collection-page.component.ts rename to src/app/collection-page/collection-page.component.ts diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts similarity index 94% rename from src/app/+collection-page/collection-page.module.ts rename to src/app/collection-page/collection-page.module.ts index 7946e7a1a4..a13731ed23 100644 --- a/src/app/+collection-page/collection-page.module.ts +++ b/src/app/collection-page/collection-page.module.ts @@ -8,7 +8,7 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module'; import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component'; import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component'; import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component'; -import { EditItemPageModule } from '../+item-page/edit-item-page/edit-item-page.module'; +import { EditItemPageModule } from '../item-page/edit-item-page/edit-item-page.module'; import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component'; import { SearchService } from '../core/shared/search/search.service'; import { StatisticsModule } from '../statistics/statistics.module'; diff --git a/src/app/+collection-page/collection-page.resolver.spec.ts b/src/app/collection-page/collection-page.resolver.spec.ts similarity index 100% rename from src/app/+collection-page/collection-page.resolver.spec.ts rename to src/app/collection-page/collection-page.resolver.spec.ts diff --git a/src/app/+collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts similarity index 100% rename from src/app/+collection-page/collection-page.resolver.ts rename to src/app/collection-page/collection-page.resolver.ts diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html similarity index 100% rename from src/app/+collection-page/create-collection-page/create-collection-page.component.html rename to src/app/collection-page/create-collection-page/create-collection-page.component.html diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.scss b/src/app/collection-page/create-collection-page/create-collection-page.component.scss similarity index 100% rename from src/app/+collection-page/create-collection-page/create-collection-page.component.scss rename to src/app/collection-page/create-collection-page/create-collection-page.component.scss diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts similarity index 100% rename from src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts rename to src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts similarity index 100% rename from src/app/+collection-page/create-collection-page/create-collection-page.component.ts rename to src/app/collection-page/create-collection-page/create-collection-page.component.ts diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts similarity index 100% rename from src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts rename to src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.guard.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.ts similarity index 100% rename from src/app/+collection-page/create-collection-page/create-collection-page.guard.ts rename to src/app/collection-page/create-collection-page/create-collection-page.guard.ts diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html similarity index 100% rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.html rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.html diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.scss b/src/app/collection-page/delete-collection-page/delete-collection-page.component.scss similarity index 100% rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.scss rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.scss diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts similarity index 100% rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts similarity index 100% rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html rename to src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html diff --git a/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts rename to src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts rename to src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html rename to src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html diff --git a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts rename to src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts rename to src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html rename to src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts rename to src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts rename to src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html rename to src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts rename to src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts rename to src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html rename to src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts rename to src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts rename to src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts rename to src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts rename to src/app/collection-page/edit-collection-page/edit-collection-page.component.ts diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts rename to src/app/collection-page/edit-collection-page/edit-collection-page.module.ts diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts similarity index 100% rename from src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts rename to src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts diff --git a/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html similarity index 100% rename from src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.html rename to src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html diff --git a/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts similarity index 100% rename from src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts rename to src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts diff --git a/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts similarity index 100% rename from src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.ts rename to src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts diff --git a/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.spec.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts similarity index 100% rename from src/app/+collection-page/edit-item-template-page/item-template-page.resolver.spec.ts rename to src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts diff --git a/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts similarity index 100% rename from src/app/+collection-page/edit-item-template-page/item-template-page.resolver.ts rename to src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts diff --git a/src/app/+collection-page/themed-collection-page.component.ts b/src/app/collection-page/themed-collection-page.component.ts similarity index 88% rename from src/app/+collection-page/themed-collection-page.component.ts rename to src/app/collection-page/themed-collection-page.component.ts index 4ad9ed87e3..82074e43e6 100644 --- a/src/app/+collection-page/themed-collection-page.component.ts +++ b/src/app/collection-page/themed-collection-page.component.ts @@ -16,7 +16,7 @@ export class ThemedCollectionPageComponent extends ThemedComponent { - return import(`../../themes/${themeName}/app/+collection-page/collection-page.component`); + return import(`../../themes/${themeName}/app/collection-page/collection-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts index e882ae5902..76d33585da 100644 --- a/src/app/community-list-page/community-list-service.ts +++ b/src/app/community-list-page/community-list-service.ts @@ -16,8 +16,8 @@ import { PaginatedList, buildPaginatedList } from '../core/data/paginated-list.m import { CollectionDataService } from '../core/data/collection-data.service'; import { CommunityListSaveAction } from './community-list.actions'; import { CommunityListState } from './community-list.reducer'; -import { getCommunityPageRoute } from '../+community-page/community-page-routing-paths'; -import { getCollectionPageRoute } from '../+collection-page/collection-page-routing-paths'; +import { getCommunityPageRoute } from '../community-page/community-page-routing-paths'; +import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths'; import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../core/shared/operators'; import { followLink } from '../shared/utils/follow-link-config.model'; diff --git a/src/app/+community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts similarity index 100% rename from src/app/+community-page/community-form/community-form.component.ts rename to src/app/community-page/community-form/community-form.component.ts diff --git a/src/app/+community-page/community-form/community-form.module.ts b/src/app/community-page/community-form/community-form.module.ts similarity index 100% rename from src/app/+community-page/community-form/community-form.module.ts rename to src/app/community-page/community-form/community-form.module.ts diff --git a/src/app/+community-page/community-page-administrator.guard.ts b/src/app/community-page/community-page-administrator.guard.ts similarity index 100% rename from src/app/+community-page/community-page-administrator.guard.ts rename to src/app/community-page/community-page-administrator.guard.ts diff --git a/src/app/+community-page/community-page-routing-paths.ts b/src/app/community-page/community-page-routing-paths.ts similarity index 91% rename from src/app/+community-page/community-page-routing-paths.ts rename to src/app/community-page/community-page-routing-paths.ts index 02adcea718..759d72cf3e 100644 --- a/src/app/+community-page/community-page-routing-paths.ts +++ b/src/app/community-page/community-page-routing-paths.ts @@ -1,4 +1,4 @@ -import { getCollectionPageRoute } from '../+collection-page/collection-page-routing-paths'; +import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths'; import { URLCombiner } from '../core/url-combiner/url-combiner'; export const COMMUNITY_PARENT_PARAMETER = 'parent'; diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts similarity index 100% rename from src/app/+community-page/community-page-routing.module.ts rename to src/app/community-page/community-page-routing.module.ts diff --git a/src/app/+community-page/community-page.component.html b/src/app/community-page/community-page.component.html similarity index 100% rename from src/app/+community-page/community-page.component.html rename to src/app/community-page/community-page.component.html diff --git a/src/app/+community-page/community-page.component.scss b/src/app/community-page/community-page.component.scss similarity index 100% rename from src/app/+community-page/community-page.component.scss rename to src/app/community-page/community-page.component.scss diff --git a/src/app/+community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts similarity index 100% rename from src/app/+community-page/community-page.component.ts rename to src/app/community-page/community-page.component.ts diff --git a/src/app/+community-page/community-page.module.ts b/src/app/community-page/community-page.module.ts similarity index 100% rename from src/app/+community-page/community-page.module.ts rename to src/app/community-page/community-page.module.ts diff --git a/src/app/+community-page/community-page.resolver.spec.ts b/src/app/community-page/community-page.resolver.spec.ts similarity index 100% rename from src/app/+community-page/community-page.resolver.spec.ts rename to src/app/community-page/community-page.resolver.spec.ts diff --git a/src/app/+community-page/community-page.resolver.ts b/src/app/community-page/community-page.resolver.ts similarity index 100% rename from src/app/+community-page/community-page.resolver.ts rename to src/app/community-page/community-page.resolver.ts diff --git a/src/app/+community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html similarity index 100% rename from src/app/+community-page/create-community-page/create-community-page.component.html rename to src/app/community-page/create-community-page/create-community-page.component.html diff --git a/src/app/+community-page/create-community-page/create-community-page.component.scss b/src/app/community-page/create-community-page/create-community-page.component.scss similarity index 100% rename from src/app/+community-page/create-community-page/create-community-page.component.scss rename to src/app/community-page/create-community-page/create-community-page.component.scss diff --git a/src/app/+community-page/create-community-page/create-community-page.component.spec.ts b/src/app/community-page/create-community-page/create-community-page.component.spec.ts similarity index 100% rename from src/app/+community-page/create-community-page/create-community-page.component.spec.ts rename to src/app/community-page/create-community-page/create-community-page.component.spec.ts diff --git a/src/app/+community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts similarity index 100% rename from src/app/+community-page/create-community-page/create-community-page.component.ts rename to src/app/community-page/create-community-page/create-community-page.component.ts diff --git a/src/app/+community-page/create-community-page/create-community-page.guard.spec.ts b/src/app/community-page/create-community-page/create-community-page.guard.spec.ts similarity index 100% rename from src/app/+community-page/create-community-page/create-community-page.guard.spec.ts rename to src/app/community-page/create-community-page/create-community-page.guard.spec.ts diff --git a/src/app/+community-page/create-community-page/create-community-page.guard.ts b/src/app/community-page/create-community-page/create-community-page.guard.ts similarity index 100% rename from src/app/+community-page/create-community-page/create-community-page.guard.ts rename to src/app/community-page/create-community-page/create-community-page.guard.ts diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html similarity index 100% rename from src/app/+community-page/delete-community-page/delete-community-page.component.html rename to src/app/community-page/delete-community-page/delete-community-page.component.html diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.scss b/src/app/community-page/delete-community-page/delete-community-page.component.scss similarity index 100% rename from src/app/+community-page/delete-community-page/delete-community-page.component.scss rename to src/app/community-page/delete-community-page/delete-community-page.component.scss diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts b/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts similarity index 100% rename from src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts rename to src/app/community-page/delete-community-page/delete-community-page.component.spec.ts diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts similarity index 100% rename from src/app/+community-page/delete-community-page/delete-community-page.component.ts rename to src/app/community-page/delete-community-page/delete-community-page.component.ts diff --git a/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.html b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.html similarity index 100% rename from src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.html rename to src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.html diff --git a/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts rename to src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts diff --git a/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.ts rename to src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.html b/src/app/community-page/edit-community-page/community-curate/community-curate.component.html similarity index 100% rename from src/app/+community-page/edit-community-page/community-curate/community-curate.component.html rename to src/app/community-page/edit-community-page/community-curate/community-curate.component.html diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.spec.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-curate/community-curate.component.spec.ts rename to src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts rename to src/app/community-page/edit-community-page/community-curate/community-curate.component.ts diff --git a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.html similarity index 100% rename from src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html rename to src/app/community-page/edit-community-page/community-metadata/community-metadata.component.html diff --git a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts rename to src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts diff --git a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.ts rename to src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html similarity index 100% rename from src/app/+community-page/edit-community-page/community-roles/community-roles.component.html rename to src/app/community-page/edit-community-page/community-roles/community-roles.component.html diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.spec.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-roles/community-roles.component.spec.ts rename to src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts similarity index 100% rename from src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts rename to src/app/community-page/edit-community-page/community-roles/community-roles.component.ts diff --git a/src/app/+community-page/edit-community-page/edit-community-page.component.spec.ts b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts similarity index 100% rename from src/app/+community-page/edit-community-page/edit-community-page.component.spec.ts rename to src/app/community-page/edit-community-page/edit-community-page.component.spec.ts diff --git a/src/app/+community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts similarity index 100% rename from src/app/+community-page/edit-community-page/edit-community-page.component.ts rename to src/app/community-page/edit-community-page/edit-community-page.component.ts diff --git a/src/app/+community-page/edit-community-page/edit-community-page.module.ts b/src/app/community-page/edit-community-page/edit-community-page.module.ts similarity index 100% rename from src/app/+community-page/edit-community-page/edit-community-page.module.ts rename to src/app/community-page/edit-community-page/edit-community-page.module.ts diff --git a/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts b/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts similarity index 100% rename from src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts rename to src/app/community-page/edit-community-page/edit-community-page.routing.module.ts diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html similarity index 100% rename from src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html rename to src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss similarity index 100% rename from src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.scss rename to src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts similarity index 100% rename from src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts rename to src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts similarity index 100% rename from src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts rename to src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html similarity index 100% rename from src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html rename to src/app/community-page/sub-community-list/community-page-sub-community-list.component.html diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.scss similarity index 100% rename from src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss rename to src/app/community-page/sub-community-list/community-page-sub-community-list.component.scss diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts similarity index 100% rename from src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts rename to src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts similarity index 100% rename from src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts rename to src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts diff --git a/src/app/+community-page/themed-community-page.component.ts b/src/app/community-page/themed-community-page.component.ts similarity index 88% rename from src/app/+community-page/themed-community-page.component.ts rename to src/app/community-page/themed-community-page.component.ts index 97dd59821c..eeb058fb04 100644 --- a/src/app/+community-page/themed-community-page.component.ts +++ b/src/app/community-page/themed-community-page.component.ts @@ -16,7 +16,7 @@ export class ThemedCommunityPageComponent extends ThemedComponent { - return import(`../../themes/${themeName}/app/+community-page/community-page.component`); + return import(`../../themes/${themeName}/app/community-page/community-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts index d41446c185..46c49add06 100644 --- a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts @@ -4,7 +4,7 @@ import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver'; import { Collection } from '../shared/collection.model'; import { CollectionDataService } from '../data/collection-data.service'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; -import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../+collection-page/collection-page.resolver'; +import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver'; /** * The class that resolves the BreadcrumbConfig object for a Collection diff --git a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts index 27cc207c58..309927771d 100644 --- a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts @@ -4,7 +4,7 @@ import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver'; import { CommunityDataService } from '../data/community-data.service'; import { Community } from '../shared/community.model'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; -import { COMMUNITY_PAGE_LINKS_TO_FOLLOW } from '../../+community-page/community-page.resolver'; +import { COMMUNITY_PAGE_LINKS_TO_FOLLOW } from '../../community-page/community-page.resolver'; /** * The class that resolves the BreadcrumbConfig object for a Community diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts index 529349eb89..3005b6f09a 100644 --- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts @@ -4,7 +4,7 @@ import { ItemDataService } from '../data/item-data.service'; import { Item } from '../shared/item.model'; import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; -import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../+item-page/item.resolver'; +import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page/item.resolver'; /** * The class that resolves the BreadcrumbConfig object for an Item diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 3c34e5ec35..026c87be9d 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -10,7 +10,7 @@ import { import { EffectsModule } from '@ngrx/effects'; import { Action, StoreConfig, StoreModule } from '@ngrx/store'; -import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard'; +import { MyDSpaceGuard } from '../my-dspace-page/my-dspace.guard'; import { isNotEmpty } from '../shared/empty.util'; import { FormBuilderService } from '../shared/form/builder/form-builder.service'; diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts index 448c1b8641..8b3ec32b46 100644 --- a/src/app/core/core.reducers.ts +++ b/src/app/core/core.reducers.ts @@ -11,7 +11,7 @@ import { routeReducer, RouteState } from './services/route.reducer'; import { bitstreamFormatReducer, BitstreamFormatRegistryState -} from '../+admin/admin-registries/bitstream-formats/bitstream-format.reducers'; +} from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers'; import { historyReducer, HistoryState } from './history/history.reducer'; import { metaTagReducer, MetaTagState } from './metadata/meta-tag.reducer'; diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts index bb3fe2f064..c072803c83 100644 --- a/src/app/core/data/bitstream-format-data.service.spec.ts +++ b/src/app/core/data/bitstream-format-data.service.spec.ts @@ -15,7 +15,7 @@ import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction -} from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions'; +} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions'; import { TestScheduler } from 'rxjs/testing'; import { CoreState } from '../core.reducers'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts index 424c9fbd99..0d0dc5eb63 100644 --- a/src/app/core/data/bitstream-format-data.service.ts +++ b/src/app/core/data/bitstream-format-data.service.ts @@ -7,8 +7,8 @@ import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction -} from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions'; -import { BitstreamFormatRegistryState } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.reducers'; +} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions'; +import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { dataService } from '../cache/builders/build-decorators'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; diff --git a/src/app/core/data/dso-redirect-data.service.ts b/src/app/core/data/dso-redirect-data.service.ts index 693ae0b41a..83395d4719 100644 --- a/src/app/core/data/dso-redirect-data.service.ts +++ b/src/app/core/data/dso-redirect-data.service.ts @@ -19,7 +19,7 @@ import { RequestService } from './request.service'; import { getFirstCompletedRemoteData } from '../shared/operators'; import { DSpaceObject } from '../shared/dspace-object.model'; import { Item } from '../shared/item.model'; -import { getItemPageRoute } from '../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; @Injectable() export class DsoRedirectDataService extends DataService { diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts index da1ff790df..727cd105e6 100644 --- a/src/app/core/data/relationship.service.ts +++ b/src/app/core/data/relationship.service.ts @@ -6,7 +6,7 @@ import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take import { compareArraysUsingIds, PAGINATED_RELATIONS_TO_ITEMS_OPERATOR, relationsToItems -} from '../../+item-page/simple/item-types/shared/item-relationships-utils'; +} from '../../item-page/simple/item-types/shared/item-relationships-utils'; import { AppState, keySelector } from '../../app.reducer'; import { hasValue, hasValueOperator, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util'; import { ReorderableRelationship } from '../../shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component'; diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts index 5f2f123f01..199f43e98e 100644 --- a/src/app/core/registry/registry.service.spec.ts +++ b/src/app/core/registry/registry.service.spec.ts @@ -15,7 +15,7 @@ import { MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction, MetadataRegistrySelectSchemaAction -} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions'; +} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { StoreMock } from '../../shared/testing/store.mock'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts index b7b35c6a5a..0046dbdb19 100644 --- a/src/app/core/registry/registry.service.ts +++ b/src/app/core/registry/registry.service.ts @@ -7,7 +7,7 @@ import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/emp import { getFirstSucceededRemoteDataPayload } from '../shared/operators'; import { createSelector, select, Store } from '@ngrx/store'; import { AppState } from '../../app.reducer'; -import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers'; +import { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers'; import { MetadataRegistryCancelFieldAction, MetadataRegistryCancelSchemaAction, @@ -19,7 +19,7 @@ import { MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction, MetadataRegistrySelectSchemaAction -} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions'; +} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions'; import { map, mergeMap, tap } from 'rxjs/operators'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts index a7e665d8d4..9228ffb009 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts @@ -5,7 +5,7 @@ import { JournalIssueComponent } from './journal-issue.component'; import { createRelationshipsObservable, getItemPageFieldsTest -} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; +} from '../../../../item-page/simple/item-types/shared/item.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; const mockItem: Item = Object.assign(new Item(), { diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts index 9be8a1f4e9..f96379dafd 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts index 9013c4b76c..eb18109da8 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts @@ -5,7 +5,7 @@ import { JournalVolumeComponent } from './journal-volume.component'; import { createRelationshipsObservable, getItemPageFieldsTest -} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; +} from '../../../../item-page/simple/item-types/shared/item.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; const mockItem: Item = Object.assign(new Item(), { diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts index ee90dd8f5a..eeb93e7070 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts index 34ac45a63a..fdbc486769 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts @@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser'; import { Store } from '@ngrx/store'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { GenericItemPageFieldComponent } from '../../../../+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; +import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts index 605bd52238..3fe0903145 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts index e7c1d0a331..3377712f13 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts @@ -5,7 +5,7 @@ import { OrgUnitComponent } from './org-unit.component'; import { createRelationshipsObservable, getItemPageFieldsTest -} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; +} from '../../../../item-page/simple/item-types/shared/item.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; const mockItem: Item = Object.assign(new Item(), { diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts index 6df2d87503..ab756db562 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts index 6a9b5235d7..546621700a 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts @@ -1,7 +1,7 @@ import { createRelationshipsObservable, getItemPageFieldsTest -} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; +} from '../../../../item-page/simple/item-types/shared/item.component.spec'; import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; import { Item } from '../../../../core/shared/item.model'; import { PageInfo } from '../../../../core/shared/page-info.model'; diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts index 9972736b95..8b104cc9b1 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts index 02fe71126b..ed60d3dac4 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts @@ -1,7 +1,7 @@ import { createRelationshipsObservable, getItemPageFieldsTest -} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; +} from '../../../../item-page/simple/item-types/shared/item.component.spec'; import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; import { Item } from '../../../../core/shared/item.model'; import { PageInfo } from '../../../../core/shared/page-info.model'; diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts index 4e432e869e..e53d8afd69 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/forgot-password/forgot-password-routing.module.ts b/src/app/forgot-password/forgot-password-routing.module.ts index 2496c4eec6..002ef5bc4b 100644 --- a/src/app/forgot-password/forgot-password-routing.module.ts +++ b/src/app/forgot-password/forgot-password-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { ItemPageResolver } from '../+item-page/item-page.resolver'; +import { ItemPageResolver } from '../item-page/item-page.resolver'; import { RegistrationResolver } from '../register-email-form/registration.resolver'; import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component'; import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component'; diff --git a/src/app/+home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html similarity index 100% rename from src/app/+home-page/home-news/home-news.component.html rename to src/app/home-page/home-news/home-news.component.html diff --git a/src/app/+home-page/home-news/home-news.component.scss b/src/app/home-page/home-news/home-news.component.scss similarity index 100% rename from src/app/+home-page/home-news/home-news.component.scss rename to src/app/home-page/home-news/home-news.component.scss diff --git a/src/app/+home-page/home-news/home-news.component.ts b/src/app/home-page/home-news/home-news.component.ts similarity index 100% rename from src/app/+home-page/home-news/home-news.component.ts rename to src/app/home-page/home-news/home-news.component.ts diff --git a/src/app/+home-page/home-news/themed-home-news.component.scss b/src/app/home-page/home-news/themed-home-news.component.scss similarity index 100% rename from src/app/+home-page/home-news/themed-home-news.component.scss rename to src/app/home-page/home-news/themed-home-news.component.scss diff --git a/src/app/+home-page/home-news/themed-home-news.component.ts b/src/app/home-page/home-news/themed-home-news.component.ts similarity index 88% rename from src/app/+home-page/home-news/themed-home-news.component.ts rename to src/app/home-page/home-news/themed-home-news.component.ts index 09abbf8935..da7233f4a4 100644 --- a/src/app/+home-page/home-news/themed-home-news.component.ts +++ b/src/app/home-page/home-news/themed-home-news.component.ts @@ -17,7 +17,7 @@ export class ThemedHomeNewsComponent extends ThemedComponent } protected importThemedComponent(themeName: string): Promise { - return import(`../../../themes/${themeName}/app/+home-page/home-news/home-news.component`); + return import(`../../../themes/${themeName}/app/home-page/home-news/home-news.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts similarity index 100% rename from src/app/+home-page/home-page-routing.module.ts rename to src/app/home-page/home-page-routing.module.ts diff --git a/src/app/+home-page/home-page.component.default.scss b/src/app/home-page/home-page.component.default.scss similarity index 100% rename from src/app/+home-page/home-page.component.default.scss rename to src/app/home-page/home-page.component.default.scss diff --git a/src/app/+home-page/home-page.component.html b/src/app/home-page/home-page.component.html similarity index 100% rename from src/app/+home-page/home-page.component.html rename to src/app/home-page/home-page.component.html diff --git a/src/app/+home-page/home-page.component.scss b/src/app/home-page/home-page.component.scss similarity index 100% rename from src/app/+home-page/home-page.component.scss rename to src/app/home-page/home-page.component.scss diff --git a/src/app/+home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts similarity index 100% rename from src/app/+home-page/home-page.component.ts rename to src/app/home-page/home-page.component.ts diff --git a/src/app/+home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts similarity index 100% rename from src/app/+home-page/home-page.module.ts rename to src/app/home-page/home-page.module.ts diff --git a/src/app/+home-page/home-page.resolver.ts b/src/app/home-page/home-page.resolver.ts similarity index 100% rename from src/app/+home-page/home-page.resolver.ts rename to src/app/home-page/home-page.resolver.ts diff --git a/src/app/+home-page/themed-home-page.component.ts b/src/app/home-page/themed-home-page.component.ts similarity index 89% rename from src/app/+home-page/themed-home-page.component.ts rename to src/app/home-page/themed-home-page.component.ts index 69d6a60908..e50f955cb1 100644 --- a/src/app/+home-page/themed-home-page.component.ts +++ b/src/app/home-page/themed-home-page.component.ts @@ -16,7 +16,7 @@ export class ThemedHomePageComponent extends ThemedComponent } protected importThemedComponent(themeName: string): Promise { - return import(`../../themes/${themeName}/app/+home-page/home-page.component`); + return import(`../../themes/${themeName}/app/home-page/home-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html similarity index 100% rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.html rename to src/app/home-page/top-level-community-list/top-level-community-list.component.html diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.scss b/src/app/home-page/top-level-community-list/top-level-community-list.component.scss similarity index 100% rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.scss rename to src/app/home-page/top-level-community-list/top-level-community-list.component.scss diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts similarity index 100% rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts rename to src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts similarity index 100% rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.ts rename to src/app/home-page/top-level-community-list/top-level-community-list.component.ts diff --git a/src/app/+import-external-page/import-external-page.component.html b/src/app/import-external-page/import-external-page.component.html similarity index 100% rename from src/app/+import-external-page/import-external-page.component.html rename to src/app/import-external-page/import-external-page.component.html diff --git a/src/app/+import-external-page/import-external-page.component.scss b/src/app/import-external-page/import-external-page.component.scss similarity index 100% rename from src/app/+import-external-page/import-external-page.component.scss rename to src/app/import-external-page/import-external-page.component.scss diff --git a/src/app/+import-external-page/import-external-page.component.spec.ts b/src/app/import-external-page/import-external-page.component.spec.ts similarity index 100% rename from src/app/+import-external-page/import-external-page.component.spec.ts rename to src/app/import-external-page/import-external-page.component.spec.ts diff --git a/src/app/+import-external-page/import-external-page.component.ts b/src/app/import-external-page/import-external-page.component.ts similarity index 100% rename from src/app/+import-external-page/import-external-page.component.ts rename to src/app/import-external-page/import-external-page.component.ts diff --git a/src/app/+import-external-page/import-external-page.module.ts b/src/app/import-external-page/import-external-page.module.ts similarity index 100% rename from src/app/+import-external-page/import-external-page.module.ts rename to src/app/import-external-page/import-external-page.module.ts diff --git a/src/app/+import-external-page/import-external-routing.module.ts b/src/app/import-external-page/import-external-routing.module.ts similarity index 100% rename from src/app/+import-external-page/import-external-routing.module.ts rename to src/app/import-external-page/import-external-routing.module.ts diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html similarity index 100% rename from src/app/+item-page/bitstreams/upload/upload-bitstream.component.html rename to src/app/item-page/bitstreams/upload/upload-bitstream.component.html diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts similarity index 100% rename from src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts rename to src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts similarity index 100% rename from src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts rename to src/app/item-page/bitstreams/upload/upload-bitstream.component.ts diff --git a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts rename to src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts diff --git a/src/app/+item-page/edit-item-page/edit-item-operators.spec.ts b/src/app/item-page/edit-item-page/edit-item-operators.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-operators.spec.ts rename to src/app/item-page/edit-item-page/edit-item-operators.spec.ts diff --git a/src/app/+item-page/edit-item-page/edit-item-operators.ts b/src/app/item-page/edit-item-page/edit-item-operators.ts similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-operators.ts rename to src/app/item-page/edit-item-page/edit-item-operators.ts diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-page.component.html rename to src/app/item-page/edit-item-page/edit-item-page.component.html diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.scss b/src/app/item-page/edit-item-page/edit-item-page.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-page.component.scss rename to src/app/item-page/edit-item-page/edit-item-page.component.scss diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.spec.ts b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-page.component.spec.ts rename to src/app/item-page/edit-item-page/edit-item-page.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-page.component.ts rename to src/app/item-page/edit-item-page/edit-item-page.component.ts diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts similarity index 98% rename from src/app/+item-page/edit-item-page/edit-item-page.module.ts rename to src/app/item-page/edit-item-page/edit-item-page.module.ts index 17010acab4..11b1d585ba 100644 --- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts @@ -15,7 +15,7 @@ import { ItemMetadataComponent } from './item-metadata/item-metadata.component'; import { EditInPlaceFieldComponent } from './item-metadata/edit-in-place-field/edit-in-place-field.component'; import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component'; import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component'; -import { SearchPageModule } from '../../+search-page/search-page.module'; +import { SearchPageModule } from '../../search-page/search-page.module'; import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component'; import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component'; import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component'; diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing-paths.ts b/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-page.routing-paths.ts rename to src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts similarity index 100% rename from src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts rename to src/app/item-page/edit-item-page/edit-item-page.routing.module.ts diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.html rename to src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts rename to src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts rename to src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts diff --git a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-delete/item-delete.component.html rename to src/app/item-page/edit-item-page/item-delete/item-delete.component.html diff --git a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts rename to src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts rename to src/app/item-page/edit-item-page/item-delete/item-delete.component.ts diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.html rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.scss b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.scss rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-move/item-move.component.html rename to src/app/item-page/edit-item-page/item-move/item-move.component.html diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts rename to src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-move/item-move.component.ts rename to src/app/item-page/edit-item-page/item-move/item-move.component.ts diff --git a/src/app/+item-page/edit-item-page/item-operation/item-operation.component.html b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-operation/item-operation.component.html rename to src/app/item-page/edit-item-page/item-operation/item-operation.component.html diff --git a/src/app/+item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-operation/item-operation.component.spec.ts rename to src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-operation/item-operation.component.ts rename to src/app/item-page/edit-item-page/item-operation/item-operation.component.ts diff --git a/src/app/+item-page/edit-item-page/item-operation/itemOperation.model.ts b/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-operation/itemOperation.model.ts rename to src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts diff --git a/src/app/+item-page/edit-item-page/item-page-bitstreams.guard.ts b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-bitstreams.guard.ts rename to src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-page-collection-mapper.guard.ts b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-collection-mapper.guard.ts rename to src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-page-metadata.guard.ts b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-metadata.guard.ts rename to src/app/item-page/edit-item-page/item-page-metadata.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts rename to src/app/item-page/edit-item-page/item-page-reinstate.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-page-relationships.guard.ts b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-relationships.guard.ts rename to src/app/item-page/edit-item-page/item-page-relationships.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-page-status.guard.ts b/src/app/item-page/edit-item-page/item-page-status.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-status.guard.ts rename to src/app/item-page/edit-item-page/item-page-status.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-page-version-history.guard.ts b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-version-history.guard.ts rename to src/app/item-page/edit-item-page/item-page-version-history.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts rename to src/app/item-page/edit-item-page/item-page-withdraw.guard.ts diff --git a/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts rename to src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-private/item-private.component.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-private/item-private.component.ts rename to src/app/item-page/edit-item-page/item-private/item-private.component.ts diff --git a/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts rename to src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-public/item-public.component.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-public/item-public.component.ts rename to src/app/item-page/edit-item-page/item-public/item-public.component.ts diff --git a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts rename to src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts rename to src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.scss b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.scss similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.scss rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.scss diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-status/item-status.component.html rename to src/app/item-page/edit-item-page/item-status/item-status.component.html diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts rename to src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-status/item-status.component.ts rename to src/app/item-page/edit-item-page/item-status/item-status.component.ts diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.html rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts diff --git a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts rename to src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts rename to src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html rename to src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts rename to src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts rename to src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts diff --git a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html rename to src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html diff --git a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts rename to src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts rename to src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html similarity index 100% rename from src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html rename to src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts similarity index 100% rename from src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts rename to src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts similarity index 100% rename from src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts rename to src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts diff --git a/src/app/+item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html similarity index 100% rename from src/app/+item-page/field-components/collections/collections.component.html rename to src/app/item-page/field-components/collections/collections.component.html diff --git a/src/app/+item-page/field-components/collections/collections.component.spec.ts b/src/app/item-page/field-components/collections/collections.component.spec.ts similarity index 100% rename from src/app/+item-page/field-components/collections/collections.component.spec.ts rename to src/app/item-page/field-components/collections/collections.component.spec.ts diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts similarity index 100% rename from src/app/+item-page/field-components/collections/collections.component.ts rename to src/app/item-page/field-components/collections/collections.component.ts diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html similarity index 100% rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss similarity index 100% rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts similarity index 100% rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts similarity index 100% rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html similarity index 100% rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss similarity index 100% rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts similarity index 100% rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts similarity index 100% rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html similarity index 100% rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.html rename to src/app/item-page/field-components/metadata-values/metadata-values.component.html diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.scss b/src/app/item-page/field-components/metadata-values/metadata-values.component.scss similarity index 100% rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.scss rename to src/app/item-page/field-components/metadata-values/metadata-values.component.scss diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts similarity index 100% rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.spec.ts rename to src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts similarity index 100% rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.ts rename to src/app/item-page/field-components/metadata-values/metadata-values.component.ts diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html similarity index 100% rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.html rename to src/app/item-page/full/field-components/file-section/full-file-section.component.html diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.scss b/src/app/item-page/full/field-components/file-section/full-file-section.component.scss similarity index 100% rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.scss rename to src/app/item-page/full/field-components/file-section/full-file-section.component.scss diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts similarity index 100% rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.spec.ts rename to src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts similarity index 100% rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.ts rename to src/app/item-page/full/field-components/file-section/full-file-section.component.ts diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html similarity index 100% rename from src/app/+item-page/full/full-item-page.component.html rename to src/app/item-page/full/full-item-page.component.html diff --git a/src/app/+item-page/full/full-item-page.component.scss b/src/app/item-page/full/full-item-page.component.scss similarity index 100% rename from src/app/+item-page/full/full-item-page.component.scss rename to src/app/item-page/full/full-item-page.component.scss diff --git a/src/app/+item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts similarity index 100% rename from src/app/+item-page/full/full-item-page.component.spec.ts rename to src/app/item-page/full/full-item-page.component.spec.ts diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts similarity index 100% rename from src/app/+item-page/full/full-item-page.component.ts rename to src/app/item-page/full/full-item-page.component.ts diff --git a/src/app/+item-page/full/themed-full-item-page.component.ts b/src/app/item-page/full/themed-full-item-page.component.ts similarity index 88% rename from src/app/+item-page/full/themed-full-item-page.component.ts rename to src/app/item-page/full/themed-full-item-page.component.ts index c184d0a4e4..a3b19e6f93 100644 --- a/src/app/+item-page/full/themed-full-item-page.component.ts +++ b/src/app/item-page/full/themed-full-item-page.component.ts @@ -16,7 +16,7 @@ export class ThemedFullItemPageComponent extends ThemedComponent { - return import(`../../../themes/${themeName}/app/+item-page/full/full-item-page.component`); + return import(`../../../themes/${themeName}/app/item-page/full/full-item-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+item-page/item-page-administrator.guard.ts b/src/app/item-page/item-page-administrator.guard.ts similarity index 100% rename from src/app/+item-page/item-page-administrator.guard.ts rename to src/app/item-page/item-page-administrator.guard.ts diff --git a/src/app/+item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts similarity index 100% rename from src/app/+item-page/item-page-routing-paths.ts rename to src/app/item-page/item-page-routing-paths.ts diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts similarity index 100% rename from src/app/+item-page/item-page-routing.module.ts rename to src/app/item-page/item-page-routing.module.ts diff --git a/src/app/+item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts similarity index 100% rename from src/app/+item-page/item-page.module.ts rename to src/app/item-page/item-page.module.ts diff --git a/src/app/+item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts similarity index 100% rename from src/app/+item-page/item-page.resolver.ts rename to src/app/item-page/item-page.resolver.ts diff --git a/src/app/+item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts similarity index 100% rename from src/app/+item-page/item.resolver.ts rename to src/app/item-page/item.resolver.ts diff --git a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.html b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.html similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.html rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.html diff --git a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss diff --git a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts diff --git a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts diff --git a/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.html rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html diff --git a/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss diff --git a/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts diff --git a/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts diff --git a/src/app/+item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer.component.html rename to src/app/item-page/media-viewer/media-viewer.component.html diff --git a/src/app/+item-page/media-viewer/media-viewer.component.scss b/src/app/item-page/media-viewer/media-viewer.component.scss similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer.component.scss rename to src/app/item-page/media-viewer/media-viewer.component.scss diff --git a/src/app/+item-page/media-viewer/media-viewer.component.spec.ts b/src/app/item-page/media-viewer/media-viewer.component.spec.ts similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer.component.spec.ts rename to src/app/item-page/media-viewer/media-viewer.component.spec.ts diff --git a/src/app/+item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts similarity index 100% rename from src/app/+item-page/media-viewer/media-viewer.component.ts rename to src/app/item-page/media-viewer/media-viewer.component.ts diff --git a/src/app/+item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts b/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts similarity index 100% rename from src/app/+item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts rename to src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts diff --git a/src/app/+item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html similarity index 100% rename from src/app/+item-page/simple/field-components/file-section/file-section.component.html rename to src/app/item-page/simple/field-components/file-section/file-section.component.html diff --git a/src/app/+item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/file-section/file-section.component.spec.ts rename to src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/file-section/file-section.component.ts rename to src/app/item-page/simple/field-components/file-section/file-section.component.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts rename to src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts rename to src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts rename to src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts rename to src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts rename to src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts rename to src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts rename to src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts rename to src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html rename to src/app/item-page/simple/field-components/specific-field/item-page-field.component.html diff --git a/src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts rename to src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/item-page-field.component.ts rename to src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html rename to src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html diff --git a/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts rename to src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts rename to src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html rename to src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html diff --git a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts rename to src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts similarity index 100% rename from src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts rename to src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html similarity index 100% rename from src/app/+item-page/simple/item-page.component.html rename to src/app/item-page/simple/item-page.component.html diff --git a/src/app/+item-page/simple/item-page.component.scss b/src/app/item-page/simple/item-page.component.scss similarity index 100% rename from src/app/+item-page/simple/item-page.component.scss rename to src/app/item-page/simple/item-page.component.scss diff --git a/src/app/+item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-page.component.spec.ts rename to src/app/item-page/simple/item-page.component.spec.ts diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts similarity index 100% rename from src/app/+item-page/simple/item-page.component.ts rename to src/app/item-page/simple/item-page.component.ts diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/publication/publication.component.html rename to src/app/item-page/simple/item-types/publication/publication.component.html diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.scss b/src/app/item-page/simple/item-types/publication/publication.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/publication/publication.component.scss rename to src/app/item-page/simple/item-types/publication/publication.component.scss diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/publication/publication.component.spec.ts rename to src/app/item-page/simple/item-types/publication/publication.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts similarity index 100% rename from src/app/+item-page/simple/item-types/publication/publication.component.ts rename to src/app/item-page/simple/item-types/publication/publication.component.ts diff --git a/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts similarity index 100% rename from src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts rename to src/app/item-page/simple/item-types/shared/item-relationships-utils.ts diff --git a/src/app/+item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/shared/item.component.spec.ts rename to src/app/item-page/simple/item-types/shared/item.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts similarity index 100% rename from src/app/+item-page/simple/item-types/shared/item.component.ts rename to src/app/item-page/simple/item-types/shared/item.component.ts diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.scss rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts similarity index 100% rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.ts rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html similarity index 100% rename from src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html rename to src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts rename to src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts similarity index 100% rename from src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts rename to src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts diff --git a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html similarity index 100% rename from src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html rename to src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html diff --git a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts rename to src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts diff --git a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts similarity index 100% rename from src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts rename to src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts diff --git a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html similarity index 100% rename from src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html rename to src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html diff --git a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts rename to src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts diff --git a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts similarity index 100% rename from src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts rename to src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts diff --git a/src/app/+item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts similarity index 100% rename from src/app/+item-page/simple/related-items/related-items-component.ts rename to src/app/item-page/simple/related-items/related-items-component.ts diff --git a/src/app/+item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html similarity index 100% rename from src/app/+item-page/simple/related-items/related-items.component.html rename to src/app/item-page/simple/related-items/related-items.component.html diff --git a/src/app/+item-page/simple/related-items/related-items.component.scss b/src/app/item-page/simple/related-items/related-items.component.scss similarity index 100% rename from src/app/+item-page/simple/related-items/related-items.component.scss rename to src/app/item-page/simple/related-items/related-items.component.scss diff --git a/src/app/+item-page/simple/related-items/related-items.component.spec.ts b/src/app/item-page/simple/related-items/related-items.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/related-items/related-items.component.spec.ts rename to src/app/item-page/simple/related-items/related-items.component.spec.ts diff --git a/src/app/+item-page/simple/themed-item-page.component.ts b/src/app/item-page/simple/themed-item-page.component.ts similarity index 88% rename from src/app/+item-page/simple/themed-item-page.component.ts rename to src/app/item-page/simple/themed-item-page.component.ts index 3d04f04acd..5bb26fafc9 100644 --- a/src/app/+item-page/simple/themed-item-page.component.ts +++ b/src/app/item-page/simple/themed-item-page.component.ts @@ -17,7 +17,7 @@ export class ThemedItemPageComponent extends ThemedComponent } protected importThemedComponent(themeName: string): Promise { - return import(`../../../themes/${themeName}/app/+item-page/simple/item-page.component`); + return import(`../../../themes/${themeName}/app/item-page/simple/item-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+login-page/login-page-routing.module.ts b/src/app/login-page/login-page-routing.module.ts similarity index 100% rename from src/app/+login-page/login-page-routing.module.ts rename to src/app/login-page/login-page-routing.module.ts diff --git a/src/app/+login-page/login-page.component.html b/src/app/login-page/login-page.component.html similarity index 100% rename from src/app/+login-page/login-page.component.html rename to src/app/login-page/login-page.component.html diff --git a/src/app/+login-page/login-page.component.scss b/src/app/login-page/login-page.component.scss similarity index 100% rename from src/app/+login-page/login-page.component.scss rename to src/app/login-page/login-page.component.scss diff --git a/src/app/+login-page/login-page.component.spec.ts b/src/app/login-page/login-page.component.spec.ts similarity index 100% rename from src/app/+login-page/login-page.component.spec.ts rename to src/app/login-page/login-page.component.spec.ts diff --git a/src/app/+login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts similarity index 100% rename from src/app/+login-page/login-page.component.ts rename to src/app/login-page/login-page.component.ts diff --git a/src/app/+login-page/login-page.module.ts b/src/app/login-page/login-page.module.ts similarity index 100% rename from src/app/+login-page/login-page.module.ts rename to src/app/login-page/login-page.module.ts diff --git a/src/app/+login-page/themed-login-page.component.ts b/src/app/login-page/themed-login-page.component.ts similarity index 89% rename from src/app/+login-page/themed-login-page.component.ts rename to src/app/login-page/themed-login-page.component.ts index cdf5932802..e314b4a3f7 100644 --- a/src/app/+login-page/themed-login-page.component.ts +++ b/src/app/login-page/themed-login-page.component.ts @@ -16,7 +16,7 @@ export class ThemedLoginPageComponent extends ThemedComponent { - return import(`../../themes/${themeName}/app/+login-page/login-page.component`); + return import(`../../themes/${themeName}/app/login-page/login-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+logout-page/logout-page-routing.module.ts b/src/app/logout-page/logout-page-routing.module.ts similarity index 100% rename from src/app/+logout-page/logout-page-routing.module.ts rename to src/app/logout-page/logout-page-routing.module.ts diff --git a/src/app/+logout-page/logout-page.component.html b/src/app/logout-page/logout-page.component.html similarity index 100% rename from src/app/+logout-page/logout-page.component.html rename to src/app/logout-page/logout-page.component.html diff --git a/src/app/logout-page/logout-page.component.scss b/src/app/logout-page/logout-page.component.scss new file mode 100644 index 0000000000..a25e77fb6b --- /dev/null +++ b/src/app/logout-page/logout-page.component.scss @@ -0,0 +1 @@ +@import '../login-page/login-page.component.scss'; diff --git a/src/app/+logout-page/logout-page.component.spec.ts b/src/app/logout-page/logout-page.component.spec.ts similarity index 100% rename from src/app/+logout-page/logout-page.component.spec.ts rename to src/app/logout-page/logout-page.component.spec.ts diff --git a/src/app/+logout-page/logout-page.component.ts b/src/app/logout-page/logout-page.component.ts similarity index 100% rename from src/app/+logout-page/logout-page.component.ts rename to src/app/logout-page/logout-page.component.ts diff --git a/src/app/+logout-page/logout-page.module.ts b/src/app/logout-page/logout-page.module.ts similarity index 100% rename from src/app/+logout-page/logout-page.module.ts rename to src/app/logout-page/logout-page.module.ts diff --git a/src/app/+logout-page/themed-logout-page.component.ts b/src/app/logout-page/themed-logout-page.component.ts similarity index 89% rename from src/app/+logout-page/themed-logout-page.component.ts rename to src/app/logout-page/themed-logout-page.component.ts index 19e1e2d1d1..8d4adfd243 100644 --- a/src/app/+logout-page/themed-logout-page.component.ts +++ b/src/app/logout-page/themed-logout-page.component.ts @@ -16,7 +16,7 @@ export class ThemedLogoutPageComponent extends ThemedComponent { - return import(`../../themes/${themeName}/app/+logout-page/logout-page.component`); + return import(`../../themes/${themeName}/app/logout-page/logout-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+lookup-by-id/lookup-by-id-routing.module.ts b/src/app/lookup-by-id/lookup-by-id-routing.module.ts similarity index 100% rename from src/app/+lookup-by-id/lookup-by-id-routing.module.ts rename to src/app/lookup-by-id/lookup-by-id-routing.module.ts diff --git a/src/app/+lookup-by-id/lookup-by-id.module.ts b/src/app/lookup-by-id/lookup-by-id.module.ts similarity index 100% rename from src/app/+lookup-by-id/lookup-by-id.module.ts rename to src/app/lookup-by-id/lookup-by-id.module.ts diff --git a/src/app/+lookup-by-id/lookup-guard.spec.ts b/src/app/lookup-by-id/lookup-guard.spec.ts similarity index 100% rename from src/app/+lookup-by-id/lookup-guard.spec.ts rename to src/app/lookup-by-id/lookup-guard.spec.ts diff --git a/src/app/+lookup-by-id/lookup-guard.ts b/src/app/lookup-by-id/lookup-guard.ts similarity index 100% rename from src/app/+lookup-by-id/lookup-guard.ts rename to src/app/lookup-by-id/lookup-guard.ts diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.html b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html similarity index 100% rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.html rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.html diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.scss similarity index 100% rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.scss diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.spec.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts similarity index 100% rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.spec.ts rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts similarity index 100% rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts diff --git a/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts similarity index 87% rename from src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts rename to src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts index e1bec33dfd..e2338d5f07 100644 --- a/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts +++ b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts @@ -16,7 +16,7 @@ export class ThemedObjectNotFoundComponent extends ThemedComponent { - return import(`../../../themes/${themeName}/app/+lookup-by-id/objectnotfound/objectnotfound.component`); + return import(`../../../themes/${themeName}/app/lookup-by-id/objectnotfound/objectnotfound.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.html b/src/app/my-dspace-page/collection-selector/collection-selector.component.html similarity index 100% rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.html rename to src/app/my-dspace-page/collection-selector/collection-selector.component.html diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.scss b/src/app/my-dspace-page/collection-selector/collection-selector.component.scss similarity index 100% rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.scss rename to src/app/my-dspace-page/collection-selector/collection-selector.component.scss diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.spec.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts similarity index 100% rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.spec.ts rename to src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.ts similarity index 100% rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.ts rename to src/app/my-dspace-page/collection-selector/collection-selector.component.ts diff --git a/src/app/+my-dspace-page/my-dspace-configuration-value-type.ts b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-configuration-value-type.ts rename to src/app/my-dspace-page/my-dspace-configuration-value-type.ts diff --git a/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts rename to src/app/my-dspace-page/my-dspace-configuration.service.spec.ts diff --git a/src/app/+my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-configuration.service.ts rename to src/app/my-dspace-page/my-dspace-configuration.service.ts diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html similarity index 100% rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss similarity index 100% rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts diff --git a/src/app/+my-dspace-page/my-dspace-page-routing.module.ts b/src/app/my-dspace-page/my-dspace-page-routing.module.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-page-routing.module.ts rename to src/app/my-dspace-page/my-dspace-page-routing.module.ts diff --git a/src/app/+my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html similarity index 100% rename from src/app/+my-dspace-page/my-dspace-page.component.html rename to src/app/my-dspace-page/my-dspace-page.component.html diff --git a/src/app/my-dspace-page/my-dspace-page.component.scss b/src/app/my-dspace-page/my-dspace-page.component.scss new file mode 100644 index 0000000000..b35b2ba709 --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-page.component.scss @@ -0,0 +1 @@ +@import '../search-page/search.component.scss'; diff --git a/src/app/+my-dspace-page/my-dspace-page.component.spec.ts b/src/app/my-dspace-page/my-dspace-page.component.spec.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-page.component.spec.ts rename to src/app/my-dspace-page/my-dspace-page.component.spec.ts diff --git a/src/app/+my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-page.component.ts rename to src/app/my-dspace-page/my-dspace-page.component.ts diff --git a/src/app/+my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-page.module.ts rename to src/app/my-dspace-page/my-dspace-page.module.ts diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html similarity index 100% rename from src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html rename to src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts rename to src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts rename to src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts diff --git a/src/app/+my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace-search.module.ts rename to src/app/my-dspace-page/my-dspace-search.module.ts diff --git a/src/app/+my-dspace-page/my-dspace.guard.ts b/src/app/my-dspace-page/my-dspace.guard.ts similarity index 100% rename from src/app/+my-dspace-page/my-dspace.guard.ts rename to src/app/my-dspace-page/my-dspace.guard.ts diff --git a/src/app/+my-dspace-page/themed-my-dspace-page.component.ts b/src/app/my-dspace-page/themed-my-dspace-page.component.ts similarity index 89% rename from src/app/+my-dspace-page/themed-my-dspace-page.component.ts rename to src/app/my-dspace-page/themed-my-dspace-page.component.ts index 47275496ca..2c74da052e 100644 --- a/src/app/+my-dspace-page/themed-my-dspace-page.component.ts +++ b/src/app/my-dspace-page/themed-my-dspace-page.component.ts @@ -18,7 +18,7 @@ export class ThemedMyDSpacePageComponent extends ThemedComponent { - return import(`../../themes/${themeName}/app/+my-dspace-page/my-dspace-page.component`); + return import(`../../themes/${themeName}/app/my-dspace-page/my-dspace-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts index f623643a8d..cffe2a7349 100644 --- a/src/app/register-page/register-page-routing.module.ts +++ b/src/app/register-page/register-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { RegisterEmailComponent } from './register-email/register-email.component'; -import { ItemPageResolver } from '../+item-page/item-page.resolver'; +import { ItemPageResolver } from '../item-page/item-page.resolver'; import { RegistrationResolver } from '../register-email-form/registration.resolver'; import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard'; import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component'; diff --git a/src/app/+search-page/configuration-search-page.component.spec.ts b/src/app/search-page/configuration-search-page.component.spec.ts similarity index 100% rename from src/app/+search-page/configuration-search-page.component.spec.ts rename to src/app/search-page/configuration-search-page.component.spec.ts diff --git a/src/app/+search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts similarity index 97% rename from src/app/+search-page/configuration-search-page.component.ts rename to src/app/search-page/configuration-search-page.component.ts index 62663a6fb3..1eefeeb569 100644 --- a/src/app/+search-page/configuration-search-page.component.ts +++ b/src/app/search-page/configuration-search-page.component.ts @@ -10,7 +10,7 @@ import { OnInit } from '@angular/core'; import { pushInOut } from '../shared/animations/push'; -import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { hasValue } from '../shared/empty.util'; import { RouteService } from '../core/services/route.service'; diff --git a/src/app/+search-page/configuration-search-page.guard.ts b/src/app/search-page/configuration-search-page.guard.ts similarity index 100% rename from src/app/+search-page/configuration-search-page.guard.ts rename to src/app/search-page/configuration-search-page.guard.ts diff --git a/src/app/+search-page/search-page-routing.module.ts b/src/app/search-page/search-page-routing.module.ts similarity index 100% rename from src/app/+search-page/search-page-routing.module.ts rename to src/app/search-page/search-page-routing.module.ts diff --git a/src/app/+search-page/search-page.component.html b/src/app/search-page/search-page.component.html similarity index 100% rename from src/app/+search-page/search-page.component.html rename to src/app/search-page/search-page.component.html diff --git a/src/app/+search-page/search-page.component.ts b/src/app/search-page/search-page.component.ts similarity index 100% rename from src/app/+search-page/search-page.component.ts rename to src/app/search-page/search-page.component.ts diff --git a/src/app/+search-page/search-page.module.ts b/src/app/search-page/search-page.module.ts similarity index 100% rename from src/app/+search-page/search-page.module.ts rename to src/app/search-page/search-page.module.ts diff --git a/src/app/+search-page/search-tracker.component.html b/src/app/search-page/search-tracker.component.html similarity index 100% rename from src/app/+search-page/search-tracker.component.html rename to src/app/search-page/search-tracker.component.html diff --git a/src/app/+search-page/search-tracker.component.scss b/src/app/search-page/search-tracker.component.scss similarity index 100% rename from src/app/+search-page/search-tracker.component.scss rename to src/app/search-page/search-tracker.component.scss diff --git a/src/app/+search-page/search-tracker.component.ts b/src/app/search-page/search-tracker.component.ts similarity index 97% rename from src/app/+search-page/search-tracker.component.ts rename to src/app/search-page/search-tracker.component.ts index 1bb5c249ce..e7f59a2f23 100644 --- a/src/app/+search-page/search-tracker.component.ts +++ b/src/app/search-page/search-tracker.component.ts @@ -4,7 +4,7 @@ import { map, switchMap } from 'rxjs/operators'; import { SearchComponent } from './search.component'; import { SidebarService } from '../shared/sidebar/sidebar.service'; import { HostWindowService } from '../shared/host-window.service'; -import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component'; import { RouteService } from '../core/services/route.service'; import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { SearchService } from '../core/shared/search/search.service'; diff --git a/src/app/+search-page/search.component.html b/src/app/search-page/search.component.html similarity index 100% rename from src/app/+search-page/search.component.html rename to src/app/search-page/search.component.html diff --git a/src/app/+search-page/search.component.scss b/src/app/search-page/search.component.scss similarity index 100% rename from src/app/+search-page/search.component.scss rename to src/app/search-page/search.component.scss diff --git a/src/app/+search-page/search.component.spec.ts b/src/app/search-page/search.component.spec.ts similarity index 98% rename from src/app/+search-page/search.component.spec.ts rename to src/app/search-page/search.component.spec.ts index bcbf3f0f77..445f4614d3 100644 --- a/src/app/+search-page/search.component.spec.ts +++ b/src/app/search-page/search.component.spec.ts @@ -19,7 +19,7 @@ import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { SidebarService } from '../shared/sidebar/sidebar.service'; import { SearchFilterService } from '../core/shared/search/search-filter.service'; import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component'; import { RouteService } from '../core/services/route.service'; import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service.stub'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; diff --git a/src/app/+search-page/search.component.ts b/src/app/search-page/search.component.ts similarity index 98% rename from src/app/+search-page/search.component.ts rename to src/app/search-page/search.component.ts index c1caf27b9a..d4d65b87fe 100644 --- a/src/app/+search-page/search.component.ts +++ b/src/app/search-page/search.component.ts @@ -10,7 +10,7 @@ import { SidebarService } from '../shared/sidebar/sidebar.service'; import { hasValue, isEmpty } from '../shared/empty.util'; import { getFirstSucceededRemoteData } from '../core/shared/operators'; import { RouteService } from '../core/services/route.service'; -import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component'; import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model'; import { SearchResult } from '../shared/search/search-result.model'; import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; diff --git a/src/app/+search-page/themed-configuration-search-page.component.ts b/src/app/search-page/themed-configuration-search-page.component.ts similarity index 95% rename from src/app/+search-page/themed-configuration-search-page.component.ts rename to src/app/search-page/themed-configuration-search-page.component.ts index 9f7277be0e..1419d18a88 100644 --- a/src/app/+search-page/themed-configuration-search-page.component.ts +++ b/src/app/search-page/themed-configuration-search-page.component.ts @@ -62,7 +62,7 @@ export class ThemedConfigurationSearchPageComponent extends ThemedComponent { - return import(`../../themes/${themeName}/app/+search-page/configuration-search-page.component`); + return import(`../../themes/${themeName}/app/search-page/configuration-search-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+search-page/themed-search-page.component.ts b/src/app/search-page/themed-search-page.component.ts similarity index 89% rename from src/app/+search-page/themed-search-page.component.ts rename to src/app/search-page/themed-search-page.component.ts index 0b2f673373..12acd6174c 100644 --- a/src/app/+search-page/themed-search-page.component.ts +++ b/src/app/search-page/themed-search-page.component.ts @@ -17,7 +17,7 @@ export class ThemedSearchPageComponent extends ThemedComponent { - return import(`../../themes/${themeName}/app/+search-page/search-page.component`); + return import(`../../themes/${themeName}/app/search-page/search-page.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts index 1dbcec8eb6..aa78be9749 100644 --- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts +++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts @@ -6,7 +6,7 @@ import { select, Store } from '@ngrx/store'; import { EPerson } from '../../../core/eperson/models/eperson.model'; import { AppState } from '../../../app.reducer'; import { isAuthenticationLoading } from '../../../core/auth/selectors'; -import { MYDSPACE_ROUTE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component'; import { AuthService } from '../../../core/auth/auth.service'; import { getProfileModuleRoute } from '../../../app-routing-paths'; diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts index 4be5f31931..01912dbcaa 100644 --- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -4,8 +4,8 @@ import { map } from 'rxjs/operators'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface'; import { environment } from '../../../environments/environment'; -import { getCommunityPageRoute } from '../../+community-page/community-page-routing-paths'; -import { getCollectionPageRoute } from '../../+collection-page/collection-page-routing-paths'; +import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths'; +import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths'; export interface ComColPageNavOption { id: string; diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts index 64274f21e2..8b38b62378 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts @@ -7,7 +7,7 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-sel import { getCollectionCreateRoute, COLLECTION_PARENT_PARAMETER -} from '../../../../+collection-page/collection-page-routing-paths'; +} from '../../../../collection-page/collection-page-routing-paths'; /** * Component to wrap a list of existing communities inside a modal diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index 7abe8f6a0a..a7f583df50 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -11,7 +11,7 @@ import { import { getCommunityCreateRoute, COMMUNITY_PARENT_PARAMETER -} from '../../../../+community-page/community-page-routing-paths'; +} from '../../../../community-page/community-page-routing-paths'; /** * Component to wrap a button - for top communities - diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts index cd0dda9af3..cfc2ea282d 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts @@ -7,7 +7,7 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component'; -import { getCollectionEditRoute } from '../../../../+collection-page/collection-page-routing-paths'; +import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths'; /** * Component to wrap a list of existing collections inside a modal diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts index 0d440e16c9..d73a7b48c5 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts @@ -7,7 +7,7 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component'; -import { getCommunityEditRoute } from '../../../../+community-page/community-page-routing-paths'; +import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths'; /** * Component to wrap a list of existing communities inside a modal diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts index f79a067ea7..4822849e4c 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts @@ -4,7 +4,7 @@ import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.mod import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component'; -import { getItemEditRoute } from '../../../../+item-page/item-page-routing-paths'; +import { getItemEditRoute } from '../../../../item-page/item-page-routing-paths'; import { Item } from '../../../../core/shared/item.model'; /** diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts index b8024346f5..7adb9a837b 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts @@ -112,7 +112,7 @@ import { FormService } from '../../form.service'; import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer'; import { SubmissionService } from '../../../../submission/submission.service'; import { followLink } from '../../../utils/follow-link-config.model'; -import { paginatedRelationsToItems } from '../../../../+item-page/simple/item-types/shared/item-relationships-utils'; +import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils'; import { RelationshipOptions } from '../models/relationship-options.model'; import { FormBuilderService } from '../form-builder.service'; import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index 6d3b14d8e8..5ce451d6c2 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -3,7 +3,7 @@ import { combineLatest as observableCombineLatest, Observable, Subscription } fr import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { hasValue, isNotEmpty } from '../../../../empty.util'; import { map, skip, switchMap, take } from 'rxjs/operators'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service'; import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index f0a86fef7c..57abdd1a32 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { Router } from '@angular/router'; import { ExternalSourceService } from '../../../../../../core/data/external-source.service'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts index e778b524b0..c6771f8d16 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { Item } from '../../../../../../core/shared/item.model'; import { SearchResult } from '../../../../../search/search-result.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts index 2c8bc22bff..79228a1376 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { Observable } from 'rxjs'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 97d80390ea..268c6f00db 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -18,7 +18,7 @@ import { AlertType } from '../../alert/aletr-type'; import { followLink } from '../../utils/follow-link-config.model'; import { hasValue, hasValueOperator } from '../../empty.util'; import { PaginationService } from '../../../core/pagination/pagination.service'; -import { getItemPageRoute } from '../../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; @Component({ selector: 'ds-item-versions', diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts index e4dbe0b838..2fd39b661c 100644 --- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts +++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts @@ -12,7 +12,7 @@ import { filter, map, startWith, switchMap } from 'rxjs/operators'; import { followLink } from '../../../utils/follow-link-config.model'; import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; import { AlertType } from '../../../alert/aletr-type'; -import { getItemPageRoute } from '../../../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths'; @Component({ selector: 'ds-item-versions-notice', diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts index bc22b254b8..32fd938f4e 100644 --- a/src/app/shared/menu/menu.component.ts +++ b/src/app/shared/menu/menu.component.ts @@ -8,7 +8,7 @@ import { GenericConstructor } from '../../core/shared/generic-constructor'; import { hasValue } from '../empty.util'; import { MenuSectionComponent } from './menu-section/menu-section.component'; import { getComponentForMenu } from './menu-section.decorator'; -import { compareArraysUsingIds } from '../../+item-page/simple/item-types/shared/item-relationships-utils'; +import { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/item-relationships-utils'; /** * A basic implementation of a MenuComponent diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts index 5b142a64ec..65ddd76bc4 100644 --- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts @@ -17,7 +17,7 @@ import { SearchService } from '../../../core/shared/search/search.service'; import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; import { WORKFLOW_TASK_OPTION_RETURN_TO_POOL } from './return-to-pool/claimed-task-actions-return-to-pool.component'; -import { getWorkflowItemViewRoute } from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths'; +import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; /** * This component represents actions related to ClaimedTask object. diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.ts b/src/app/shared/mydspace-actions/item/item-actions.component.ts index c4ae0544fc..4df11d65d9 100644 --- a/src/app/shared/mydspace-actions/item/item-actions.component.ts +++ b/src/app/shared/mydspace-actions/item/item-actions.component.ts @@ -7,7 +7,7 @@ import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../notifications/notifications.service'; import { RequestService } from '../../../core/data/request.service'; import { SearchService } from '../../../core/shared/search/search.service'; -import { getItemPageRoute } from '../../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; /** * This component represents mydspace actions related to Item object. diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts index 619a980e9b..a628c1e7e8 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts @@ -5,7 +5,7 @@ import { listableObjectComponent } from '../../../../object-collection/shared/li import { SearchResultGridElementComponent } from '../../search-result-grid-element.component'; import { Item } from '../../../../../core/shared/item.model'; import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; -import { getItemPageRoute } from '../../../../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths'; @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement) @listableObjectComponent(ItemSearchResult, ViewMode.GridElement) diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts index 51fd6f8d36..967b09986d 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts @@ -1,7 +1,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component'; import { Component, OnInit } from '@angular/core'; import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; -import { getItemPageRoute } from '../../../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths'; @Component({ selector: 'ds-item-metadata-representation-list-element', diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index a955be558f..b5eb64869d 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -4,7 +4,7 @@ import { ViewMode } from '../../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model'; import { SearchResultListElementComponent } from '../../../search-result-list-element.component'; import { Item } from '../../../../../../core/shared/item.model'; -import { getItemPageRoute } from '../../../../../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths'; @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement) @listableObjectComponent(ItemSearchResult, ViewMode.ListElement) diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts index 80808311a0..5cf32c2953 100644 --- a/src/app/shared/object-select/item-select/item-select.component.ts +++ b/src/app/shared/object-select/item-select/item-select.component.ts @@ -6,7 +6,7 @@ import { hasValueOperator, isNotEmpty } from '../../empty.util'; import { Observable } from 'rxjs'; import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators'; import { map } from 'rxjs/operators'; -import { getItemPageRoute } from '../../../+item-page/item-page-routing-paths'; +import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; @Component({ diff --git a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts index 77931400a2..67947c3425 100644 --- a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts +++ b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts @@ -11,7 +11,7 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { EnumKeysPipe } from '../utils/enum-keys-pipe'; import { VarDirective } from '../utils/var.directive'; -import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts index 764a8063db..ddfe1ca4d9 100644 --- a/src/app/shared/page-size-selector/page-size-selector.component.ts +++ b/src/app/shared/page-size-selector/page-size-selector.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { Observable } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; -import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { PaginatedSearchOptions } from '../search/paginated-search-options.model'; import { map, take } from 'rxjs/operators'; diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts index f9b9ff8e90..64a3bc5361 100644 --- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts +++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts @@ -16,7 +16,7 @@ import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { Component, ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core'; import { PaginationComponent } from '../pagination/pagination.component'; import { ObjectValuesPipe } from '../utils/object-values-pipe'; -import { compareArraysUsing } from '../../+item-page/simple/item-types/shared/item-relationships-utils'; +import { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils'; import { PaginationService } from '../../core/pagination/pagination.service'; /** diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.ts index 83e77f5646..24abd05a86 100644 --- a/src/app/shared/resource-policies/create/resource-policy-create.component.ts +++ b/src/app/shared/resource-policies/create/resource-policy-create.component.ts @@ -12,7 +12,7 @@ import { RemoteData } from '../../../core/data/remote-data'; import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; import { ResourcePolicyEvent } from '../form/resource-policy-form.component'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../+item-page/edit-item-page/edit-item-page.routing-paths'; +import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; @Component({ diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts index 1ee0aa3c4a..a515eef675 100644 --- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts +++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts @@ -11,7 +11,7 @@ import { RemoteData } from '../../../core/data/remote-data'; import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; import { ResourcePolicyEvent } from '../form/resource-policy-form.component'; import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type'; -import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../+item-page/edit-item-page/edit-item-page.routing-paths'; +import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; @Component({ diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts index a8081e8f2d..dc58a8c853 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts @@ -21,7 +21,7 @@ import { PageInfo } from '../../../../../core/shared/page-info.model'; import { SearchFacetFilterComponent } from './search-facet-filter.component'; import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; describe('SearchFacetFilterComponent', () => { diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts index afb47f9be5..0b28929554 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts @@ -23,7 +23,7 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators'; import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model'; import { SearchOptions } from '../../../search-options.model'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { currentPath } from '../../../../utils/route.utils'; import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils'; import { createPendingRemoteDataObject } from '../../../../remote-data.utils'; diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts index 5e0077e11d..ee337a503b 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts @@ -11,7 +11,7 @@ import { SearchFilterComponent } from './search-filter.component'; import { SearchFilterConfig } from '../../search-filter-config.model'; import { FilterType } from '../../filter-type.model'; import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub'; -import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { SequenceService } from '../../../../core/shared/sequence.service'; describe('SearchFilterComponent', () => { diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts index 0f7f763b45..a1b66eb332 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts @@ -9,7 +9,7 @@ import { slide } from '../../../animations/slide'; import { isNotEmpty } from '../../../empty.util'; import { SearchService } from '../../../../core/shared/search/search.service'; import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { SequenceService } from '../../../../core/shared/sequence.service'; @Component({ diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts index 598a397fe7..41f0b4307d 100644 --- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts @@ -20,7 +20,7 @@ import { Router } from '@angular/router'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { SearchRangeFilterComponent } from './search-range-filter.component'; import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; import { RouteService } from '../../../../../core/services/route.service'; diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts index a9ad789d4d..702854dee5 100644 --- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts @@ -11,7 +11,7 @@ import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../.. import { SearchService } from '../../../../../core/shared/search/search.service'; import { Router } from '@angular/router'; import * as moment from 'moment'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; import { RouteService } from '../../../../../core/services/route.service'; import { hasValue } from '../../../../empty.util'; diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts index 2dd810db63..031c2e132b 100644 --- a/src/app/shared/search/search-filters/search-filters.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts @@ -8,7 +8,7 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s import { SearchFiltersComponent } from './search-filters.component'; import { SearchService } from '../../../core/shared/search/search.service'; import { of as observableOf, Subject } from 'rxjs'; -import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; describe('SearchFiltersComponent', () => { diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts index 348af6743d..0556da4426 100644 --- a/src/app/shared/search/search-filters/search-filters.component.ts +++ b/src/app/shared/search/search-filters/search-filters.component.ts @@ -9,7 +9,7 @@ import { SearchFilterConfig } from '../search-filter-config.model'; import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; -import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { currentPath } from '../../utils/route.utils'; import { Router } from '@angular/router'; import { hasValue } from '../../empty.util'; diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts index 35de768977..b3f9471cbd 100644 --- a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts +++ b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts @@ -7,7 +7,7 @@ import { Observable, of as observableOf } from 'rxjs'; import { Params, Router } from '@angular/router'; import { SearchLabelComponent } from './search-label.component'; import { ObjectKeysPipe } from '../../../utils/object-keys-pipe'; -import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { SearchServiceStub } from '../../../testing/search-service.stub'; import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub'; import { SearchService } from '../../../../core/shared/search/search.service'; diff --git a/src/app/shared/search/search-labels/search-labels.component.spec.ts b/src/app/shared/search/search-labels/search-labels.component.spec.ts index f96ba56279..e00c56aabc 100644 --- a/src/app/shared/search/search-labels/search-labels.component.spec.ts +++ b/src/app/shared/search/search-labels/search-labels.component.spec.ts @@ -9,7 +9,7 @@ import { SearchService } from '../../../core/shared/search/search.service'; import { RouterTestingModule } from '@angular/router/testing'; import { ObjectKeysPipe } from '../../utils/object-keys-pipe'; import { SearchServiceStub } from '../../testing/search-service.stub'; -import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; describe('SearchLabelsComponent', () => { let comp: SearchLabelsComponent; diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts index 2322c80acf..8f77d73b21 100644 --- a/src/app/shared/search/search-labels/search-labels.component.ts +++ b/src/app/shared/search/search-labels/search-labels.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, Input } from '@angular/core'; -import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { Observable } from 'rxjs'; import { Params, Router } from '@angular/router'; import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; diff --git a/src/app/shared/search/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts index 6c483a5bc4..6cf8ffc618 100644 --- a/src/app/shared/search/search-settings/search-settings.component.spec.ts +++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts @@ -12,7 +12,7 @@ import { EnumKeysPipe } from '../../utils/enum-keys-pipe'; import { By } from '@angular/platform-browser'; import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; import { VarDirective } from '../../utils/var.directive'; -import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { SidebarService } from '../../sidebar/sidebar.service'; import { SidebarServiceStub } from '../../testing/sidebar-service.stub'; import { PaginationService } from '../../../core/pagination/pagination.service'; diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts index b9d86571f6..9f6cab4a7b 100644 --- a/src/app/shared/search/search-settings/search-settings.component.ts +++ b/src/app/shared/search/search-settings/search-settings.component.ts @@ -4,7 +4,7 @@ import { SortDirection, SortOptions } from '../../../core/cache/models/sort-opti import { ActivatedRoute, Router } from '@angular/router'; import { PaginatedSearchOptions } from '../paginated-search-options.model'; import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { PaginationService } from '../../../core/pagination/pagination.service'; @Component({ diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts index 8796442d9f..3c0b9d156b 100644 --- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts +++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts @@ -10,8 +10,8 @@ import { NavigationExtras, Router } from '@angular/router'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; import { RouterStub } from '../../testing/router.stub'; import { SearchService } from '../../../core/shared/search/search.service'; -import { MYDSPACE_ROUTE, SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; -import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type'; +import { MYDSPACE_ROUTE, SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; +import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; describe('SearchSwitchConfigurationComponent', () => { diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts index 73312e072e..061ca96a70 100644 --- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts +++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts @@ -4,9 +4,9 @@ import { NavigationExtras, Router } from '@angular/router'; import { Subscription } from 'rxjs'; import { hasValue } from '../../empty.util'; -import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type'; +import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type'; import { SearchConfigurationOption } from './search-configuration-option.model'; import { SearchService } from '../../../core/shared/search/search.service'; import { currentPath } from '../../utils/route.utils'; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index c5a91bd02c..9b993e551f 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -120,8 +120,8 @@ import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-it import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component'; import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component'; import { ItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component'; -import { MetadataFieldWrapperComponent } from '../+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component'; -import { MetadataValuesComponent } from '../+item-page/field-components/metadata-values/metadata-values.component'; +import { MetadataFieldWrapperComponent } from '../item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component'; +import { MetadataValuesComponent } from '../item-page/field-components/metadata-values/metadata-values.component'; import { RoleDirective } from './roles/role.directive'; import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component'; import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component'; @@ -187,7 +187,7 @@ import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-ve import { FileValidator } from './utils/require-file.validator'; import { FileValueAccessorDirective } from './utils/file-value-accessor.directive'; import { ExistingRelationListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component'; -import { ModifyItemOverviewComponent } from '../+item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; +import { ModifyItemOverviewComponent } from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { ClaimedTaskActionsLoaderComponent } from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component'; import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive'; import { ClaimedTaskActionsEditMetadataComponent } from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component'; @@ -222,16 +222,16 @@ import { SearchResult } from './search/search-result.model'; import { FacetConfigResponse } from './search/facet-config-response.model'; import { FacetValues } from './search/facet-values.model'; import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component'; -import { GenericItemPageFieldComponent } from '../+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; -import { MetadataRepresentationListComponent } from '../+item-page/simple/metadata-representation-list/metadata-representation-list.component'; -import { RelatedItemsComponent } from '../+item-page/simple/related-items/related-items-component'; -import { TabbedRelatedEntitiesSearchComponent } from '../+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; -import { RelatedEntitiesSearchComponent } from '../+item-page/simple/related-entities/related-entities-search/related-entities-search.component'; -import { ConfigurationSearchPageComponent } from '../+search-page/configuration-search-page.component'; +import { GenericItemPageFieldComponent } from '../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; +import { MetadataRepresentationListComponent } from '../item-page/simple/metadata-representation-list/metadata-representation-list.component'; +import { RelatedItemsComponent } from '../item-page/simple/related-items/related-items-component'; +import { TabbedRelatedEntitiesSearchComponent } from '../item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; +import { RelatedEntitiesSearchComponent } from '../item-page/simple/related-entities/related-entities-search/related-entities-search.component'; +import { ConfigurationSearchPageComponent } from '../search-page/configuration-search-page.component'; import { LinkMenuItemComponent } from './menu/menu-item/link-menu-item.component'; import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.component'; import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component'; -import { ThemedConfigurationSearchPageComponent } from '../+search-page/themed-configuration-search-page.component'; +import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component'; import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'; /** diff --git a/src/app/shared/testing/test-module.ts b/src/app/shared/testing/test-module.ts index 6721e3042b..b43adde8ae 100644 --- a/src/app/shared/testing/test-module.ts +++ b/src/app/shared/testing/test-module.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { MySimpleItemActionComponent } from '../../+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec'; +import { MySimpleItemActionComponent } from '../../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec'; import { SharedModule } from '../shared.module'; import { NgComponentOutletDirectiveStub } from './ng-component-outlet-directive.stub'; import { QueryParamsDirectiveStub } from './query-params-directive.stub'; diff --git a/src/app/statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts index 5b96bcca6e..3c88e096e7 100644 --- a/src/app/statistics-page/statistics-page-routing.module.ts +++ b/src/app/statistics-page/statistics-page-routing.module.ts @@ -3,13 +3,13 @@ import { RouterModule } from '@angular/router'; import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; import { StatisticsPageModule } from './statistics-page.module'; -import { CollectionPageResolver } from '../+collection-page/collection-page.resolver'; -import { CommunityPageResolver } from '../+community-page/community-page.resolver'; +import { CollectionPageResolver } from '../collection-page/collection-page.resolver'; +import { CommunityPageResolver } from '../community-page/community-page.resolver'; import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component'; import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component'; import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component'; import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed-site-statistics-page.component'; -import { ItemResolver } from '../+item-page/item.resolver'; +import { ItemResolver } from '../item-page/item.resolver'; @NgModule({ imports: [ diff --git a/src/app/+submit-page/submit-page-routing.module.ts b/src/app/submit-page/submit-page-routing.module.ts similarity index 100% rename from src/app/+submit-page/submit-page-routing.module.ts rename to src/app/submit-page/submit-page-routing.module.ts diff --git a/src/app/+submit-page/submit-page.module.ts b/src/app/submit-page/submit-page.module.ts similarity index 100% rename from src/app/+submit-page/submit-page.module.ts rename to src/app/submit-page/submit-page.module.ts diff --git a/src/app/+workflowitems-edit-page/item-from-workflow.resolver.spec.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts similarity index 100% rename from src/app/+workflowitems-edit-page/item-from-workflow.resolver.spec.ts rename to src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts diff --git a/src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts similarity index 100% rename from src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts rename to src/app/workflowitems-edit-page/item-from-workflow.resolver.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-action-page.component.html b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-action-page.component.html rename to src/app/workflowitems-edit-page/workflow-item-action-page.component.html diff --git a/src/app/+workflowitems-edit-page/workflow-item-action-page.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-action-page.component.spec.ts rename to src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-action-page.component.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-action-page.component.ts rename to src/app/workflowitems-edit-page/workflow-item-action-page.component.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts similarity index 85% rename from src/app/+workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts rename to src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts index 498975075f..358d26b482 100644 --- a/src/app/+workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts @@ -17,7 +17,7 @@ export class ThemedWorkflowItemDeleteComponent extends ThemedComponent { - return import(`../../../themes/${themeName}/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component`); + return import(`../../../themes/${themeName}/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts rename to src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts rename to src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-page.resolver.spec.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-page.resolver.spec.ts rename to src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts rename to src/app/workflowitems-edit-page/workflow-item-page.resolver.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts similarity index 85% rename from src/app/+workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts rename to src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts index a2cc68ac74..5a3e9ca476 100644 --- a/src/app/+workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts @@ -17,7 +17,7 @@ export class ThemedWorkflowItemSendBackComponent extends ThemedComponent { - return import(`../../../themes/${themeName}/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component`); + return import(`../../../themes/${themeName}/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts rename to src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts diff --git a/src/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts rename to src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts similarity index 100% rename from src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts rename to src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts similarity index 96% rename from src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts rename to src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts index 7daee0a472..9c24bacb98 100644 --- a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts @@ -14,7 +14,7 @@ import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component'; import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ItemFromWorkflowResolver } from './item-from-workflow.resolver'; -import { ThemedFullItemPageComponent } from '../+item-page/full/themed-full-item-page.component'; +import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component'; @NgModule({ imports: [ diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts similarity index 95% rename from src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts rename to src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts index 463e76e54d..e99a3ca958 100644 --- a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts @@ -8,7 +8,7 @@ import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflo import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component'; import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component'; import { StatisticsModule } from '../statistics/statistics.module'; -import { ItemPageModule } from '../+item-page/item-page.module'; +import { ItemPageModule } from '../item-page/item-page.module'; @NgModule({ imports: [ diff --git a/src/app/+workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts similarity index 100% rename from src/app/+workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts rename to src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts diff --git a/src/app/+workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts similarity index 100% rename from src/app/+workspaceitems-edit-page/workspaceitems-edit-page.module.ts rename to src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts diff --git a/src/config/browse-by-type-config.interface.ts b/src/config/browse-by-type-config.interface.ts index fae7890613..f15846c210 100644 --- a/src/config/browse-by-type-config.interface.ts +++ b/src/config/browse-by-type-config.interface.ts @@ -1,5 +1,5 @@ import { Config } from './config.interface'; -import { BrowseByType } from '../app/+browse-by/+browse-by-switcher/browse-by-decorator'; +import { BrowseByType } from '../app/browse-by/browse-by-switcher/browse-by-decorator'; /** * Config used for rendering Browse-By pages and links diff --git a/src/config/theme.model.spec.ts b/src/config/theme.model.spec.ts index fce61bd718..16c76539d6 100644 --- a/src/config/theme.model.spec.ts +++ b/src/config/theme.model.spec.ts @@ -1,13 +1,13 @@ import { HandleTheme, RegExTheme, Theme, UUIDTheme } from './theme.model'; -import { getCommunityModuleRoute } from '../app/+community-page/community-page-routing-paths'; +import { getCommunityModuleRoute } from '../app/community-page/community-page-routing-paths'; import { Community } from '../app/core/shared/community.model'; import { COMMUNITY } from '../app/core/shared/community.resource-type'; -import { getCollectionModuleRoute } from '../app/+collection-page/collection-page-routing-paths'; +import { getCollectionModuleRoute } from '../app/collection-page/collection-page-routing-paths'; import { COLLECTION } from '../app/core/shared/collection.resource-type'; import { Collection } from '../app/core/shared/collection.model'; import { Item } from '../app/core/shared/item.model'; import { ITEM } from '../app/core/shared/item.resource-type'; -import { getItemModuleRoute } from '../app/+item-page/item-page-routing-paths'; +import { getItemModuleRoute } from '../app/item-page/item-page-routing-paths'; describe('Theme Models', () => { let theme: Theme; diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts index a7957e9fe1..9091773041 100644 --- a/src/environments/environment.common.ts +++ b/src/environments/environment.common.ts @@ -1,6 +1,6 @@ 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 { BrowseByType } from '../app/browse-by/browse-by-switcher/browse-by-decorator'; import { RestRequestMethod } from '../app/core/data/rest-request-method'; export const environment: GlobalConfig = { diff --git a/src/environments/mock-environment.ts b/src/environments/mock-environment.ts index cfe160389f..824c8c8a83 100644 --- a/src/environments/mock-environment.ts +++ b/src/environments/mock-environment.ts @@ -1,5 +1,5 @@ // This configuration is only used for unit tests, end-to-end tests use environment.prod.ts -import { BrowseByType } from '../app/+browse-by/+browse-by-switcher/browse-by-decorator'; +import { BrowseByType } from '../app/browse-by/browse-by-switcher/browse-by-decorator'; import { RestRequestMethod } from '../app/core/data/rest-request-method'; import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type'; import { GlobalConfig } from '../config/global-config.interface'; diff --git a/src/themes/custom/app/+logout-page/logout-page.component.scss b/src/themes/custom/app/+logout-page/logout-page.component.scss deleted file mode 100644 index 7e594c0d9b..0000000000 --- a/src/themes/custom/app/+logout-page/logout-page.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../+login-page/login-page.component.scss'; diff --git a/src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html similarity index 100% rename from src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html rename to src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html diff --git a/src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.scss b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss similarity index 100% rename from src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.scss rename to src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss diff --git a/src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts similarity index 71% rename from src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts rename to src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts index 58fee73779..e65997eaf4 100644 --- a/src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; -import { BrowseBySwitcherComponent as BaseComponent } from '../../../../../app/+browse-by/+browse-by-switcher/browse-by-switcher.component'; +import { BrowseBySwitcherComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-switcher/browse-by-switcher.component'; @Component({ selector: 'ds-browse-by-switcher', // styleUrls: ['./browse-by-switcher.component.scss'], // templateUrl: './browse-by-switcher.component.html' - templateUrl: '../../../../../app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html' + templateUrl: '../../../../../app/browse-by/browse-by-switcher/browse-by-switcher.component.html' }) /** diff --git a/src/themes/custom/app/+collection-page/collection-page.component.html b/src/themes/custom/app/collection-page/collection-page.component.html similarity index 100% rename from src/themes/custom/app/+collection-page/collection-page.component.html rename to src/themes/custom/app/collection-page/collection-page.component.html diff --git a/src/themes/custom/app/+collection-page/collection-page.component.scss b/src/themes/custom/app/collection-page/collection-page.component.scss similarity index 100% rename from src/themes/custom/app/+collection-page/collection-page.component.scss rename to src/themes/custom/app/collection-page/collection-page.component.scss diff --git a/src/themes/custom/app/+collection-page/collection-page.component.ts b/src/themes/custom/app/collection-page/collection-page.component.ts similarity index 73% rename from src/themes/custom/app/+collection-page/collection-page.component.ts rename to src/themes/custom/app/collection-page/collection-page.component.ts index 9d1d5f03f9..d91c7025d7 100644 --- a/src/themes/custom/app/+collection-page/collection-page.component.ts +++ b/src/themes/custom/app/collection-page/collection-page.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { CollectionPageComponent as BaseComponent} from '../../../../app/+collection-page/collection-page.component'; +import { CollectionPageComponent as BaseComponent} from '../../../../app/collection-page/collection-page.component'; import { fadeIn, fadeInOut } from '../../../../app/shared/animations/fade'; @Component({ selector: 'ds-collection-page', // templateUrl: './collection-page.component.html', - templateUrl: '../../../../app/+collection-page/collection-page.component.html', + templateUrl: '../../../../app/collection-page/collection-page.component.html', // styleUrls: ['./collection-page.component.scss'] - styleUrls: ['../../../../app/+collection-page/collection-page.component.scss'], + styleUrls: ['../../../../app/collection-page/collection-page.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, animations: [ fadeIn, diff --git a/src/themes/custom/app/+community-page/community-page.component.html b/src/themes/custom/app/community-page/community-page.component.html similarity index 100% rename from src/themes/custom/app/+community-page/community-page.component.html rename to src/themes/custom/app/community-page/community-page.component.html diff --git a/src/themes/custom/app/+community-page/community-page.component.scss b/src/themes/custom/app/community-page/community-page.component.scss similarity index 100% rename from src/themes/custom/app/+community-page/community-page.component.scss rename to src/themes/custom/app/community-page/community-page.component.scss diff --git a/src/themes/custom/app/+community-page/community-page.component.ts b/src/themes/custom/app/community-page/community-page.component.ts similarity index 72% rename from src/themes/custom/app/+community-page/community-page.component.ts rename to src/themes/custom/app/community-page/community-page.component.ts index 54e9352eb8..ce7d85dddc 100644 --- a/src/themes/custom/app/+community-page/community-page.component.ts +++ b/src/themes/custom/app/community-page/community-page.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { CommunityPageComponent as BaseComponent} from '../../../../app/+community-page/community-page.component'; +import { CommunityPageComponent as BaseComponent} from '../../../../app/community-page/community-page.component'; import { fadeInOut } from '../../../../app/shared/animations/fade'; @Component({ selector: 'ds-community-page', // templateUrl: './community-page.component.html', - templateUrl: '../../../../app/+community-page/community-page.component.html', + templateUrl: '../../../../app/community-page/community-page.component.html', // styleUrls: ['./community-page.component.scss'] - styleUrls: ['../../../../app/+community-page/community-page.component.scss'], + styleUrls: ['../../../../app/community-page/community-page.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, animations: [fadeInOut] }) diff --git a/src/themes/custom/app/+home-page/home-news/home-news.component.html b/src/themes/custom/app/home-page/home-news/home-news.component.html similarity index 100% rename from src/themes/custom/app/+home-page/home-news/home-news.component.html rename to src/themes/custom/app/home-page/home-news/home-news.component.html diff --git a/src/themes/custom/app/+home-page/home-news/home-news.component.scss b/src/themes/custom/app/home-page/home-news/home-news.component.scss similarity index 100% rename from src/themes/custom/app/+home-page/home-news/home-news.component.scss rename to src/themes/custom/app/home-page/home-news/home-news.component.scss diff --git a/src/themes/custom/app/+home-page/home-news/home-news.component.ts b/src/themes/custom/app/home-page/home-news/home-news.component.ts similarity index 63% rename from src/themes/custom/app/+home-page/home-news/home-news.component.ts rename to src/themes/custom/app/home-page/home-news/home-news.component.ts index eaf788e599..c9c070f6cf 100644 --- a/src/themes/custom/app/+home-page/home-news/home-news.component.ts +++ b/src/themes/custom/app/home-page/home-news/home-news.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; -import { HomeNewsComponent as BaseComponent } from '../../../../../app/+home-page/home-news/home-news.component'; +import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component'; @Component({ selector: 'ds-home-news', // styleUrls: ['./home-news.component.scss'], - styleUrls: ['../../../../../app/+home-page/home-news/home-news.component.scss'], + styleUrls: ['../../../../../app/home-page/home-news/home-news.component.scss'], // templateUrl: './home-news.component.html' - templateUrl: '../../../../../app/+home-page/home-news/home-news.component.html' + templateUrl: '../../../../../app/home-page/home-news/home-news.component.html' }) /** diff --git a/src/themes/custom/app/+home-page/home-page.component.html b/src/themes/custom/app/home-page/home-page.component.html similarity index 100% rename from src/themes/custom/app/+home-page/home-page.component.html rename to src/themes/custom/app/home-page/home-page.component.html diff --git a/src/themes/custom/app/+home-page/home-page.component.scss b/src/themes/custom/app/home-page/home-page.component.scss similarity index 100% rename from src/themes/custom/app/+home-page/home-page.component.scss rename to src/themes/custom/app/home-page/home-page.component.scss diff --git a/src/themes/custom/app/+home-page/home-page.component.ts b/src/themes/custom/app/home-page/home-page.component.ts similarity index 63% rename from src/themes/custom/app/+home-page/home-page.component.ts rename to src/themes/custom/app/home-page/home-page.component.ts index 602492e9bd..bf04216b14 100644 --- a/src/themes/custom/app/+home-page/home-page.component.ts +++ b/src/themes/custom/app/home-page/home-page.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; -import { HomePageComponent as BaseComponent } from '../../../../app/+home-page/home-page.component'; +import { HomePageComponent as BaseComponent } from '../../../../app/home-page/home-page.component'; @Component({ selector: 'ds-home-page', // styleUrls: ['./home-page.component.scss'], - styleUrls: ['../../../../app/+home-page/home-page.component.scss'], + styleUrls: ['../../../../app/home-page/home-page.component.scss'], // templateUrl: './home-page.component.html' - templateUrl: '../../../../app/+home-page/home-page.component.html' + templateUrl: '../../../../app/home-page/home-page.component.html' }) export class HomePageComponent extends BaseComponent { diff --git a/src/themes/custom/app/+item-page/full/full-item-page.component.html b/src/themes/custom/app/item-page/full/full-item-page.component.html similarity index 100% rename from src/themes/custom/app/+item-page/full/full-item-page.component.html rename to src/themes/custom/app/item-page/full/full-item-page.component.html diff --git a/src/themes/custom/app/+item-page/full/full-item-page.component.scss b/src/themes/custom/app/item-page/full/full-item-page.component.scss similarity index 100% rename from src/themes/custom/app/+item-page/full/full-item-page.component.scss rename to src/themes/custom/app/item-page/full/full-item-page.component.scss diff --git a/src/themes/custom/app/+item-page/full/full-item-page.component.ts b/src/themes/custom/app/item-page/full/full-item-page.component.ts similarity index 73% rename from src/themes/custom/app/+item-page/full/full-item-page.component.ts rename to src/themes/custom/app/item-page/full/full-item-page.component.ts index 1e6230132b..6385a27400 100644 --- a/src/themes/custom/app/+item-page/full/full-item-page.component.ts +++ b/src/themes/custom/app/item-page/full/full-item-page.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { fadeInOut } from '../../../../../app/shared/animations/fade'; -import { FullItemPageComponent as BaseComponent } from '../../../../../app/+item-page/full/full-item-page.component'; +import { FullItemPageComponent as BaseComponent } from '../../../../../app/item-page/full/full-item-page.component'; /** * This component renders a full item page. @@ -10,9 +10,9 @@ import { FullItemPageComponent as BaseComponent } from '../../../../../app/+item @Component({ selector: 'ds-full-item-page', // styleUrls: ['./full-item-page.component.scss'], - styleUrls: ['../../../../../app/+item-page/full/full-item-page.component.scss'], + styleUrls: ['../../../../../app/item-page/full/full-item-page.component.scss'], // templateUrl: './full-item-page.component.html', - templateUrl: '../../../../../app/+item-page/full/full-item-page.component.html', + templateUrl: '../../../../../app/item-page/full/full-item-page.component.html', changeDetection: ChangeDetectionStrategy.OnPush, animations: [fadeInOut] }) diff --git a/src/themes/custom/app/+item-page/simple/item-page.component.html b/src/themes/custom/app/item-page/simple/item-page.component.html similarity index 100% rename from src/themes/custom/app/+item-page/simple/item-page.component.html rename to src/themes/custom/app/item-page/simple/item-page.component.html diff --git a/src/themes/custom/app/+item-page/simple/item-page.component.scss b/src/themes/custom/app/item-page/simple/item-page.component.scss similarity index 100% rename from src/themes/custom/app/+item-page/simple/item-page.component.scss rename to src/themes/custom/app/item-page/simple/item-page.component.scss diff --git a/src/themes/custom/app/+item-page/simple/item-page.component.ts b/src/themes/custom/app/item-page/simple/item-page.component.ts similarity index 76% rename from src/themes/custom/app/+item-page/simple/item-page.component.ts rename to src/themes/custom/app/item-page/simple/item-page.component.ts index dfd792b3e2..b535a29ead 100644 --- a/src/themes/custom/app/+item-page/simple/item-page.component.ts +++ b/src/themes/custom/app/item-page/simple/item-page.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { ItemPageComponent as BaseComponent } from '../../../../../app/+item-page/simple/item-page.component'; +import { ItemPageComponent as BaseComponent } from '../../../../../app/item-page/simple/item-page.component'; import { fadeInOut } from '../../../../../app/shared/animations/fade'; /** @@ -10,9 +10,9 @@ import { fadeInOut } from '../../../../../app/shared/animations/fade'; @Component({ selector: 'ds-item-page', // styleUrls: ['./item-page.component.scss'], - styleUrls: ['../../../../../app/+item-page/simple/item-page.component.scss'], + styleUrls: ['../../../../../app/item-page/simple/item-page.component.scss'], // templateUrl: './item-page.component.html', - templateUrl: '../../../../../app/+item-page/simple/item-page.component.html', + templateUrl: '../../../../../app/item-page/simple/item-page.component.html', changeDetection: ChangeDetectionStrategy.OnPush, animations: [fadeInOut] }) diff --git a/src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.html b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.html similarity index 100% rename from src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.html rename to src/themes/custom/app/item-page/simple/item-types/publication/publication.component.html diff --git a/src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.scss b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.scss similarity index 100% rename from src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.scss rename to src/themes/custom/app/item-page/simple/item-types/publication/publication.component.scss diff --git a/src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.ts b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts similarity index 73% rename from src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.ts rename to src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts index 4eda82a10a..b07247731b 100644 --- a/src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.ts +++ b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; import { Context } from '../../../../../../../app/core/shared/context.model'; -import { PublicationComponent as BaseComponent } from '../../../../../../../app/+item-page/simple/item-types/publication/publication.component'; +import { PublicationComponent as BaseComponent } from '../../../../../../../app/item-page/simple/item-types/publication/publication.component'; /** * Component that represents a publication Item page @@ -12,9 +12,9 @@ import { PublicationComponent as BaseComponent } from '../../../../../../../app/ @Component({ selector: 'ds-publication', // styleUrls: ['./publication.component.scss'], - styleUrls: ['../../../../../../../app/+item-page/simple/item-types/publication/publication.component.scss'], + styleUrls: ['../../../../../../../app/item-page/simple/item-types/publication/publication.component.scss'], // templateUrl: './publication.component.html', - templateUrl: '../../../../../../../app/+item-page/simple/item-types/publication/publication.component.html', + templateUrl: '../../../../../../../app/item-page/simple/item-types/publication/publication.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) export class PublicationComponent extends BaseComponent { diff --git a/src/themes/custom/app/+login-page/login-page.component.html b/src/themes/custom/app/login-page/login-page.component.html similarity index 100% rename from src/themes/custom/app/+login-page/login-page.component.html rename to src/themes/custom/app/login-page/login-page.component.html diff --git a/src/themes/custom/app/+login-page/login-page.component.scss b/src/themes/custom/app/login-page/login-page.component.scss similarity index 100% rename from src/themes/custom/app/+login-page/login-page.component.scss rename to src/themes/custom/app/login-page/login-page.component.scss diff --git a/src/themes/custom/app/+login-page/login-page.component.ts b/src/themes/custom/app/login-page/login-page.component.ts similarity index 66% rename from src/themes/custom/app/+login-page/login-page.component.ts rename to src/themes/custom/app/login-page/login-page.component.ts index 4c5922c8fd..2eb98a288e 100644 --- a/src/themes/custom/app/+login-page/login-page.component.ts +++ b/src/themes/custom/app/login-page/login-page.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { LoginPageComponent as BaseComponent } from '../../../../app/+login-page/login-page.component'; +import { LoginPageComponent as BaseComponent } from '../../../../app/login-page/login-page.component'; /** * This component represents the login page @@ -7,9 +7,9 @@ import { LoginPageComponent as BaseComponent } from '../../../../app/+login-page @Component({ selector: 'ds-login-page', // styleUrls: ['./login-page.component.scss'], - styleUrls: ['../../../../app/+login-page/login-page.component.scss'], + styleUrls: ['../../../../app/login-page/login-page.component.scss'], // templateUrl: './login-page.component.html' - templateUrl: '../../../../app/+login-page/login-page.component.html' + templateUrl: '../../../../app/login-page/login-page.component.html' }) export class LoginPageComponent extends BaseComponent { } diff --git a/src/themes/custom/app/+logout-page/logout-page.component.html b/src/themes/custom/app/logout-page/logout-page.component.html similarity index 100% rename from src/themes/custom/app/+logout-page/logout-page.component.html rename to src/themes/custom/app/logout-page/logout-page.component.html diff --git a/src/themes/custom/app/logout-page/logout-page.component.scss b/src/themes/custom/app/logout-page/logout-page.component.scss new file mode 100644 index 0000000000..a25e77fb6b --- /dev/null +++ b/src/themes/custom/app/logout-page/logout-page.component.scss @@ -0,0 +1 @@ +@import '../login-page/login-page.component.scss'; diff --git a/src/themes/custom/app/+logout-page/logout-page.component.ts b/src/themes/custom/app/logout-page/logout-page.component.ts similarity index 62% rename from src/themes/custom/app/+logout-page/logout-page.component.ts rename to src/themes/custom/app/logout-page/logout-page.component.ts index 5b94d906c0..303abe9b2b 100644 --- a/src/themes/custom/app/+logout-page/logout-page.component.ts +++ b/src/themes/custom/app/logout-page/logout-page.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; -import { LogoutPageComponent as BaseComponent} from '../../../../app/+logout-page/logout-page.component'; +import { LogoutPageComponent as BaseComponent} from '../../../../app/logout-page/logout-page.component'; @Component({ selector: 'ds-logout-page', // styleUrls: ['./logout-page.component.scss'], - styleUrls: ['../../../../app/+logout-page/logout-page.component.scss'], + styleUrls: ['../../../../app/logout-page/logout-page.component.scss'], // templateUrl: './logout-page.component.html' - templateUrl: '../../../../app/+logout-page/logout-page.component.html' + templateUrl: '../../../../app/logout-page/logout-page.component.html' }) export class LogoutPageComponent extends BaseComponent { } diff --git a/src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.html b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.html similarity index 100% rename from src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.html rename to src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.html diff --git a/src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.scss similarity index 100% rename from src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss rename to src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.scss diff --git a/src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts similarity index 64% rename from src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts rename to src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts index 2c10ddde53..1fbe089bc4 100644 --- a/src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts +++ b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/+lookup-by-id/objectnotfound/objectnotfound.component'; +import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component'; @Component({ selector: 'ds-objnotfound', // styleUrls: ['./objectnotfound.component.scss'], - styleUrls: ['../../../../../app/+lookup-by-id/objectnotfound/objectnotfound.component.scss'], + styleUrls: ['../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.scss'], // templateUrl: './objectnotfound.component.html', - templateUrl: '../../../../../app/+lookup-by-id/objectnotfound/objectnotfound.component.html', + templateUrl: '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.html', changeDetection: ChangeDetectionStrategy.Default }) diff --git a/src/themes/custom/app/+my-dspace-page/my-dspace-page.component.html b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.html similarity index 100% rename from src/themes/custom/app/+my-dspace-page/my-dspace-page.component.html rename to src/themes/custom/app/my-dspace-page/my-dspace-page.component.html diff --git a/src/themes/custom/app/+my-dspace-page/my-dspace-page.component.scss b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.scss similarity index 100% rename from src/themes/custom/app/+my-dspace-page/my-dspace-page.component.scss rename to src/themes/custom/app/my-dspace-page/my-dspace-page.component.scss diff --git a/src/themes/custom/app/+my-dspace-page/my-dspace-page.component.ts b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts similarity index 65% rename from src/themes/custom/app/+my-dspace-page/my-dspace-page.component.ts rename to src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts index 8ea24a041d..11b4ee38e1 100644 --- a/src/themes/custom/app/+my-dspace-page/my-dspace-page.component.ts +++ b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { pushInOut } from '../../../../app/shared/animations/push'; -import { MyDSpacePageComponent as BaseComponent, SEARCH_CONFIG_SERVICE } from '../../../../app/+my-dspace-page/my-dspace-page.component'; -import { MyDSpaceConfigurationService } from '../../../../app/+my-dspace-page/my-dspace-configuration.service'; +import { MyDSpacePageComponent as BaseComponent, SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component'; +import { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-dspace-configuration.service'; /** * This component represents the whole mydspace page @@ -9,9 +9,9 @@ import { MyDSpaceConfigurationService } from '../../../../app/+my-dspace-page/my @Component({ selector: 'ds-my-dspace-page', // styleUrls: ['./my-dspace-page.component.scss'], - styleUrls: ['../../../../app/+my-dspace-page/my-dspace-page.component.scss'], + styleUrls: ['../../../../app/my-dspace-page/my-dspace-page.component.scss'], // templateUrl: './my-dspace-page.component.html', - templateUrl: '../../../../app/+my-dspace-page/my-dspace-page.component.html', + templateUrl: '../../../../app/my-dspace-page/my-dspace-page.component.html', changeDetection: ChangeDetectionStrategy.OnPush, animations: [pushInOut], providers: [ diff --git a/src/themes/custom/app/+search-page/configuration-search-page.component.html b/src/themes/custom/app/search-page/configuration-search-page.component.html similarity index 100% rename from src/themes/custom/app/+search-page/configuration-search-page.component.html rename to src/themes/custom/app/search-page/configuration-search-page.component.html diff --git a/src/themes/custom/app/+search-page/configuration-search-page.component.scss b/src/themes/custom/app/search-page/configuration-search-page.component.scss similarity index 100% rename from src/themes/custom/app/+search-page/configuration-search-page.component.scss rename to src/themes/custom/app/search-page/configuration-search-page.component.scss diff --git a/src/themes/custom/app/+search-page/configuration-search-page.component.ts b/src/themes/custom/app/search-page/configuration-search-page.component.ts similarity index 73% rename from src/themes/custom/app/+search-page/configuration-search-page.component.ts rename to src/themes/custom/app/search-page/configuration-search-page.component.ts index 42e8dbf2d0..b578ed5d8c 100644 --- a/src/themes/custom/app/+search-page/configuration-search-page.component.ts +++ b/src/themes/custom/app/search-page/configuration-search-page.component.ts @@ -1,15 +1,15 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { pushInOut } from '../../../../app/shared/animations/push'; -import { SEARCH_CONFIG_SERVICE } from '../../../../app/+my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service'; -import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/+search-page/configuration-search-page.component'; +import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/search-page/configuration-search-page.component'; @Component({ selector: 'ds-configuration-search-page', // styleUrls: ['./configuration-search-page.component.scss'], - styleUrls: ['../../../../app/+search-page/search.component.scss'], + styleUrls: ['../../../../app/search-page/search.component.scss'], // templateUrl: './configuration-search-page.component.html' - templateUrl: '../../../../app/+search-page/search.component.html', + templateUrl: '../../../../app/search-page/search.component.html', changeDetection: ChangeDetectionStrategy.OnPush, animations: [pushInOut], providers: [ diff --git a/src/themes/custom/app/+search-page/search-page.component.html b/src/themes/custom/app/search-page/search-page.component.html similarity index 100% rename from src/themes/custom/app/+search-page/search-page.component.html rename to src/themes/custom/app/search-page/search-page.component.html diff --git a/src/themes/custom/app/+search-page/search-page.component.scss b/src/themes/custom/app/search-page/search-page.component.scss similarity index 100% rename from src/themes/custom/app/+search-page/search-page.component.scss rename to src/themes/custom/app/search-page/search-page.component.scss diff --git a/src/themes/custom/app/+search-page/search-page.component.ts b/src/themes/custom/app/search-page/search-page.component.ts similarity index 79% rename from src/themes/custom/app/+search-page/search-page.component.ts rename to src/themes/custom/app/search-page/search-page.component.ts index c9bcd65349..e8973975b5 100644 --- a/src/themes/custom/app/+search-page/search-page.component.ts +++ b/src/themes/custom/app/search-page/search-page.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; -import { SearchPageComponent as BaseComponent } from '../../../../app/+search-page/search-page.component'; +import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component'; @Component({ selector: 'ds-search-page', // styleUrls: ['./search-page.component.scss'], // templateUrl: './search-page.component.html' - templateUrl: '../../../../app/+search-page/search-page.component.html' + templateUrl: '../../../../app/search-page/search-page.component.html' }) /** diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html similarity index 100% rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss similarity index 100% rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts similarity index 67% rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts index c9c140835a..7c4831484f 100644 --- a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts +++ b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; -import { WorkflowItemDeleteComponent as BaseComponent } from '../../../../../app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component'; +import { WorkflowItemDeleteComponent as BaseComponent } from '../../../../../app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component'; @Component({ selector: 'ds-workflow-item-delete', // styleUrls: ['workflow-item-delete.component.scss'], // templateUrl: './workflow-item-delete.component.html' - templateUrl: '../../../../../app/+workflowitems-edit-page/workflow-item-action-page.component.html' + templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html' }) /** * Component representing a page to delete a workflow item diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.html b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.html similarity index 100% rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.html rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.html diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss similarity index 100% rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts similarity index 68% rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts index 343faf765c..49121e64b9 100644 --- a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts +++ b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; -import { WorkflowItemSendBackComponent as BaseComponent } from '../../../../../app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component'; +import { WorkflowItemSendBackComponent as BaseComponent } from '../../../../../app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component'; @Component({ selector: 'ds-workflow-item-send-back', // styleUrls: ['workflow-item-send-back.component.scss'], // templateUrl: './workflow-item-send-back.component.html' - templateUrl: '../../../../../app/+workflowitems-edit-page/workflow-item-action-page.component.html' + templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html' }) /** * Component representing a page to send back a workflow item to the submitter diff --git a/src/themes/custom/entry-components.ts b/src/themes/custom/entry-components.ts index d859b56333..b518e4cc45 100644 --- a/src/themes/custom/entry-components.ts +++ b/src/themes/custom/entry-components.ts @@ -1,4 +1,4 @@ -import { PublicationComponent } from './app/+item-page/simple/item-types/publication/publication.component'; +import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component'; export const ENTRY_COMPONENTS = [ PublicationComponent diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts index 49b54cd850..dac941546b 100644 --- a/src/themes/custom/theme.module.ts +++ b/src/themes/custom/theme.module.ts @@ -1,20 +1,20 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AdminRegistriesModule } from '../../app/+admin/admin-registries/admin-registries.module'; -import { AdminSearchModule } from '../../app/+admin/admin-search-page/admin-search.module'; -import { AdminWorkflowModuleModule } from '../../app/+admin/admin-workflow-page/admin-workflow.module'; -import { BitstreamFormatsModule } from '../../app/+admin/admin-registries/bitstream-formats/bitstream-formats.module'; -import { BrowseByModule } from '../../app/+browse-by/browse-by.module'; -import { CollectionFormModule } from '../../app/+collection-page/collection-form/collection-form.module'; -import { CommunityFormModule } from '../../app/+community-page/community-form/community-form.module'; +import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module'; +import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module'; +import { AdminWorkflowModuleModule } from '../../app/admin/admin-workflow-page/admin-workflow.module'; +import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module'; +import { BrowseByModule } from '../../app/browse-by/browse-by.module'; +import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module'; +import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module'; import { CoreModule } from '../../app/core/core.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; -import { EditItemPageModule } from '../../app/+item-page/edit-item-page/edit-item-page.module'; +import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module'; import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; import { IdlePreloadModule } from 'angular-idle-preload'; import { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module'; -import { MyDspaceSearchModule } from '../../app/+my-dspace-page/my-dspace-search.module'; +import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module'; import { MenuModule } from '../../app/shared/menu/menu.module'; import { NavbarModule } from '../../app/navbar/navbar.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -22,29 +22,29 @@ import { ProfilePageModule } from '../../app/profile-page/profile-page.module'; import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module'; import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; -import { SearchPageModule } from '../../app/+search-page/search-page.module'; +import { SearchPageModule } from '../../app/search-page/search-page.module'; import { SharedModule } from '../../app/shared/shared.module'; import { StatisticsModule } from '../../app/statistics/statistics.module'; import { StoreModule } from '@ngrx/store'; import { StoreRouterConnectingModule } from '@ngrx/router-store'; import { TranslateModule } from '@ngx-translate/core'; -import { HomeNewsComponent } from './app/+home-page/home-news/home-news.component'; -import { HomePageComponent } from './app/+home-page/home-page.component'; -import { HomePageModule } from '../../app/+home-page/home-page.module'; +import { HomeNewsComponent } from './app/home-page/home-news/home-news.component'; +import { HomePageComponent } from './app/home-page/home-page.component'; +import { HomePageModule } from '../../app/home-page/home-page.module'; import { RootComponent } from './app/root/root.component'; import { AppModule } from '../../app/app.module'; -import { PublicationComponent } from './app/+item-page/simple/item-types/publication/publication.component'; -import { ItemPageModule } from '../../app/+item-page/item-page.module'; +import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component'; +import { ItemPageModule } from '../../app/item-page/item-page.module'; import { RouterModule } from '@angular/router'; import { AccessControlModule } from '../../app/access-control/access-control.module'; -import { BrowseBySwitcherComponent } from './app/+browse-by/+browse-by-switcher/browse-by-switcher.component'; +import { BrowseBySwitcherComponent } from './app/browse-by/browse-by-switcher/browse-by-switcher.component'; import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component'; import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module'; -import { SearchPageComponent } from './app/+search-page/search-page.component'; +import { SearchPageComponent } from './app/search-page/search-page.component'; import { InfoModule } from '../../app/info/info.module'; import { EndUserAgreementComponent } from './app/info/end-user-agreement/end-user-agreement.component'; import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component'; -import { ObjectNotFoundComponent } from './app/+lookup-by-id/objectnotfound/objectnotfound.component'; +import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component'; import { ForbiddenComponent } from './app/forbidden/forbidden.component'; import { PrivacyComponent } from './app/info/privacy/privacy.component'; import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component'; @@ -52,15 +52,15 @@ import { CommunityStatisticsPageComponent } from './app/statistics-page/communit import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module'; import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component'; import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component'; -import { CommunityPageComponent } from './app/+community-page/community-page.component'; -import { CollectionPageComponent } from './app/+collection-page/collection-page.component'; -import { CommunityPageModule } from '../../app/+community-page/community-page.module'; -import { CollectionPageModule } from '../../app/+collection-page/collection-page.module'; -import { ConfigurationSearchPageComponent } from './app/+search-page/configuration-search-page.component'; -import { ItemPageComponent } from './app/+item-page/simple/item-page.component'; -import { FullItemPageComponent } from './app/+item-page/full/full-item-page.component'; -import { LoginPageComponent } from './app/+login-page/login-page.component'; -import { LogoutPageComponent } from './app/+logout-page/logout-page.component'; +import { CommunityPageComponent } from './app/community-page/community-page.component'; +import { CollectionPageComponent } from './app/collection-page/collection-page.component'; +import { CommunityPageModule } from '../../app/community-page/community-page.module'; +import { CollectionPageModule } from '../../app/collection-page/collection-page.module'; +import { ConfigurationSearchPageComponent } from './app/search-page/configuration-search-page.component'; +import { ItemPageComponent } from './app/item-page/simple/item-page.component'; +import { FullItemPageComponent } from './app/item-page/full/full-item-page.component'; +import { LoginPageComponent } from './app/login-page/login-page.component'; +import { LogoutPageComponent } from './app/logout-page/logout-page.component'; import { CreateProfileComponent } from './app/register-page/create-profile/create-profile.component'; import { ForgotEmailComponent } from './app/forgot-password/forgot-password-email/forgot-email.component'; import { ForgotPasswordFormComponent } from './app/forgot-password/forgot-password-form/forgot-password-form.component'; @@ -69,11 +69,11 @@ import { RegisterEmailComponent } from './app/register-page/register-email/regis import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component'; import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component'; import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component'; -import { MyDSpacePageComponent } from './app/+my-dspace-page/my-dspace-page.component'; -import { WorkflowItemSendBackComponent } from './app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component'; -import { WorkflowItemDeleteComponent } from './app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component'; +import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component'; +import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component'; +import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component'; import { SubmissionModule } from '../../app/submission/submission.module'; -import { MyDSpacePageModule } from '../../app/+my-dspace-page/my-dspace-page.module'; +import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module'; import { NavbarComponent } from './app/navbar/navbar.component'; import { HeaderComponent } from './app/header/header.component'; import { FooterComponent } from './app/footer/footer.component'; diff --git a/src/themes/dspace/app/+home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html similarity index 100% rename from src/themes/dspace/app/+home-page/home-news/home-news.component.html rename to src/themes/dspace/app/home-page/home-news/home-news.component.html diff --git a/src/themes/dspace/app/+home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss similarity index 100% rename from src/themes/dspace/app/+home-page/home-news/home-news.component.scss rename to src/themes/dspace/app/home-page/home-news/home-news.component.scss diff --git a/src/themes/dspace/app/+home-page/home-news/home-news.component.ts b/src/themes/dspace/app/home-page/home-news/home-news.component.ts similarity index 87% rename from src/themes/dspace/app/+home-page/home-news/home-news.component.ts rename to src/themes/dspace/app/home-page/home-news/home-news.component.ts index 7f06295407..d4032011dc 100644 --- a/src/themes/dspace/app/+home-page/home-news/home-news.component.ts +++ b/src/themes/dspace/app/home-page/home-news/home-news.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { HomeNewsComponent as BaseComponent } from '../../../../../app/+home-page/home-news/home-news.component'; +import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component'; @Component({ selector: 'ds-home-news', diff --git a/src/themes/dspace/theme.module.ts b/src/themes/dspace/theme.module.ts index 40138aa490..b03d5af5b4 100644 --- a/src/themes/dspace/theme.module.ts +++ b/src/themes/dspace/theme.module.ts @@ -1,20 +1,20 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AdminRegistriesModule } from '../../app/+admin/admin-registries/admin-registries.module'; -import { AdminSearchModule } from '../../app/+admin/admin-search-page/admin-search.module'; -import { AdminWorkflowModuleModule } from '../../app/+admin/admin-workflow-page/admin-workflow.module'; -import { BitstreamFormatsModule } from '../../app/+admin/admin-registries/bitstream-formats/bitstream-formats.module'; -import { BrowseByModule } from '../../app/+browse-by/browse-by.module'; -import { CollectionFormModule } from '../../app/+collection-page/collection-form/collection-form.module'; -import { CommunityFormModule } from '../../app/+community-page/community-form/community-form.module'; +import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module'; +import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module'; +import { AdminWorkflowModuleModule } from '../../app/admin/admin-workflow-page/admin-workflow.module'; +import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module'; +import { BrowseByModule } from '../../app/browse-by/browse-by.module'; +import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module'; +import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module'; import { CoreModule } from '../../app/core/core.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; -import { EditItemPageModule } from '../../app/+item-page/edit-item-page/edit-item-page.module'; +import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module'; import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; import { IdlePreloadModule } from 'angular-idle-preload'; import { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module'; -import { MyDspaceSearchModule } from '../../app/+my-dspace-page/my-dspace-search.module'; +import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module'; import { MenuModule } from '../../app/shared/menu/menu.module'; import { NavbarModule } from '../../app/navbar/navbar.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -22,24 +22,24 @@ import { ProfilePageModule } from '../../app/profile-page/profile-page.module'; import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module'; import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; -import { SearchPageModule } from '../../app/+search-page/search-page.module'; +import { SearchPageModule } from '../../app/search-page/search-page.module'; import { SharedModule } from '../../app/shared/shared.module'; import { StatisticsModule } from '../../app/statistics/statistics.module'; import { StoreModule } from '@ngrx/store'; import { StoreRouterConnectingModule } from '@ngrx/router-store'; import { TranslateModule } from '@ngx-translate/core'; -import { HomeNewsComponent } from './app/+home-page/home-news/home-news.component'; -import { HomePageModule } from '../../app/+home-page/home-page.module'; +import { HomeNewsComponent } from './app/home-page/home-news/home-news.component'; +import { HomePageModule } from '../../app/home-page/home-page.module'; import { AppModule } from '../../app/app.module'; -import { ItemPageModule } from '../../app/+item-page/item-page.module'; +import { ItemPageModule } from '../../app/item-page/item-page.module'; import { RouterModule } from '@angular/router'; import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module'; import { InfoModule } from '../../app/info/info.module'; import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module'; -import { CommunityPageModule } from '../../app/+community-page/community-page.module'; -import { CollectionPageModule } from '../../app/+collection-page/collection-page.module'; +import { CommunityPageModule } from '../../app/community-page/community-page.module'; +import { CollectionPageModule } from '../../app/collection-page/collection-page.module'; import { SubmissionModule } from '../../app/submission/submission.module'; -import { MyDSpacePageModule } from '../../app/+my-dspace-page/my-dspace-page.module'; +import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module'; import { NavbarComponent } from './app/navbar/navbar.component'; import { HeaderComponent } from './app/header/header.component'; import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';