Skip to content

Commit 81757ab

Browse files
committed
[DURACOM-327] Move info-routing-paths into core
1 parent d67e314 commit 81757ab

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

src/app/app-routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
ITEM_MODULE_PATH,
2222
LEGACY_BITSTREAM_MODULE_PATH,
2323
} from '@dspace/core/router/core-routing-paths';
24+
import { INFO_MODULE_PATH } from '@dspace/core/router/info-routing-paths';
2425
import { ServerCheckGuard } from '@dspace/core/server-check/server-check.guard';
2526

2627
import { ACCESS_CONTROL_MODULE_PATH } from './access-control/access-control-routing-paths';
@@ -29,7 +30,6 @@ import {
2930
ADMIN_MODULE_PATH,
3031
FORGOT_PASSWORD_PATH,
3132
HEALTH_PAGE_PATH,
32-
INFO_MODULE_PATH,
3333
PROFILE_MODULE_PATH,
3434
REGISTER_PATH,
3535
REQUEST_COPY_MODULE_PATH,

src/app/app-routing-paths.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ export function getWorkspaceItemModuleRoute() {
3838
return `/${WORKSPACE_ITEM_MODULE_PATH}`;
3939
}
4040

41-
export const INFO_MODULE_PATH = 'info';
42-
export function getInfoModulePath() {
43-
return `/${INFO_MODULE_PATH}`;
44-
}
45-
4641
export const REQUEST_COPY_MODULE_PATH = 'request-a-copy';
4742
export function getRequestCopyModulePath() {
4843
return `/${REQUEST_COPY_MODULE_PATH}`;

src/app/core/end-user-agreement/end-user-agreement.guard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
} from 'rxjs';
1414
import { map } from 'rxjs/operators';
1515

16-
import { getEndUserAgreementPath } from '../../info/info-routing-paths';
16+
import { getEndUserAgreementPath } from '../router/info-routing-paths';
1717

1818
export declare type HasAcceptedGuardParamFn = () => Observable<boolean>;
1919
/**
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { getInfoModulePath } from '../app-routing-paths';
2-
31
export const END_USER_AGREEMENT_PATH = 'end-user-agreement';
42
export const PRIVACY_PATH = 'privacy';
53
export const FEEDBACK_PATH = 'feedback';
@@ -26,6 +24,12 @@ export function getAccessibilitySettingsPath() {
2624
return getSubPath(ACCESSIBILITY_SETTINGS_PATH);
2725
}
2826

27+
export const INFO_MODULE_PATH = 'info';
28+
29+
export function getInfoModulePath() {
30+
return `/${INFO_MODULE_PATH}`;
31+
}
32+
2933
function getSubPath(path: string) {
3034
return `${getInfoModulePath()}/${path}`;
3135
}

src/app/info/info-routes.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ import {
55
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
66
import { notifyInfoGuard } from '@dspace/core/coar-notify/notify-info/notify-info.guard';
77
import { feedbackGuard } from '@dspace/core/feedback/feedback.guard';
8-
import { hasValue } from '@dspace/shared/utils/empty.util';
9-
10-
import { environment } from '../../environments/environment';
11-
import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component';
12-
import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
13-
import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
148
import {
159
ACCESSIBILITY_SETTINGS_PATH,
1610
COAR_NOTIFY_SUPPORT,
1711
END_USER_AGREEMENT_PATH,
1812
FEEDBACK_PATH,
1913
PRIVACY_PATH,
20-
} from './info-routing-paths';
14+
} from '@dspace/core/router/info-routing-paths';
15+
import { hasValue } from '@dspace/shared/utils/empty.util';
16+
17+
import { environment } from '../../environments/environment';
18+
import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component';
19+
import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
20+
import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
2121
import { NotifyInfoComponent } from './notify-info/notify-info.component';
2222
import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
2323

0 commit comments

Comments
 (0)