diff --git a/package.json b/package.json index 5d0b56e6c..cf81bc27c 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "@angular/compiler-cli": "^19.2.0", "@commitlint/cli": "^19.7.1", "@commitlint/config-conventional": "^19.7.1", - "@types/jasmine": "~5.1.0", "@types/jest": "^29.5.14", "@types/markdown-it": "^14.1.2", "angular-eslint": "19.1.0", @@ -74,7 +73,6 @@ "eslint-plugin-unused-imports": "^4.1.4", "fantasticon": "^3.0.0", "husky": "^9.1.7", - "jasmine-core": "~5.6.0", "jest": "^29.7.0", "jest-preset-angular": "^14.5.5", "lint-staged": "^15.4.3", diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 0899c6cf8..c87d8166f 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -2,8 +2,6 @@ import { provideStates } from '@ngxs/store'; import { Routes } from '@angular/router'; -import { RegistryOverviewState } from '@osf/features/registry/store/registry-overview'; - import { MyProfileResourceFiltersOptionsState } from './features/my-profile/components/filters/store'; import { MyProfileResourceFiltersState } from './features/my-profile/components/my-profile-resource-filters/store'; import { MyProfileState } from './features/my-profile/store'; @@ -22,53 +20,44 @@ export const routes: Routes = [ redirectTo: 'home', }, { - path: 'sign-up', - loadComponent: () => - import('./features/auth/pages/sign-up/sign-up.component').then((mod) => mod.SignUpComponent), - data: { skipBreadcrumbs: true }, - }, - { - path: 'forgot-password', - loadComponent: () => - import('./features/auth/pages/forgot-password/forgot-password.component').then( - (mod) => mod.ForgotPasswordComponent - ), + path: 'home', + loadComponent: () => import('./features/home/home.component').then((mod) => mod.HomeComponent), data: { skipBreadcrumbs: true }, }, { - path: 'reset-password', + path: 'home-logged-out', loadComponent: () => - import('./features/auth/pages/reset-password/reset-password.component').then( - (mod) => mod.ResetPasswordComponent + import('@osf/features/home/pages/home-logged-out/home-logged-out.component').then( + (mod) => mod.HomeLoggedOutComponent ), data: { skipBreadcrumbs: true }, }, { - path: 'home', + path: 'confirm/:userId/:token', loadComponent: () => import('./features/home/home.component').then((mod) => mod.HomeComponent), data: { skipBreadcrumbs: true }, }, { - path: 'home-logged-out', + path: 'sign-up', loadComponent: () => - import('@osf/features/home/pages/home-logged-out/home-logged-out.component').then( - (mod) => mod.HomeLoggedOutComponent - ), + import('./features/auth/pages/sign-up/sign-up.component').then((mod) => mod.SignUpComponent), data: { skipBreadcrumbs: true }, }, { - path: 'support', - loadComponent: () => import('./features/support/support.component').then((mod) => mod.SupportComponent), - }, - { - path: 'terms-of-use', + path: 'forgot-password', loadComponent: () => - import('./features/static/terms-of-use/terms-of-use.component').then((mod) => mod.TermsOfUseComponent), + import('./features/auth/pages/forgot-password/forgot-password.component').then( + (mod) => mod.ForgotPasswordComponent + ), + data: { skipBreadcrumbs: true }, }, { - path: 'privacy-policy', + path: 'reset-password', loadComponent: () => - import('./features/static/privacy-policy/privacy-policy.component').then((mod) => mod.PrivacyPolicyComponent), + import('./features/auth/pages/reset-password/reset-password.component').then( + (mod) => mod.ResetPasswordComponent + ), + data: { skipBreadcrumbs: true }, }, { path: 'collections', @@ -76,24 +65,7 @@ export const routes: Routes = [ }, { path: 'meetings', - loadComponent: () => import('./features/meetings/meetings.component').then((mod) => mod.MeetingsComponent), - children: [ - { - path: '', - pathMatch: 'full', - loadComponent: () => - import('@osf/features/meetings/pages/meetings-landing/meetings-landing.component').then( - (mod) => mod.MeetingsLandingComponent - ), - }, - { - path: ':id', - loadComponent: () => - import('@osf/features/meetings/pages/meeting-details/meeting-details.component').then( - (mod) => mod.MeetingDetailsComponent - ), - }, - ], + loadChildren: () => import('./features/meetings/meetings.routes').then((mod) => mod.meetingsRoutes), }, { path: 'my-projects', @@ -104,11 +76,6 @@ export const routes: Routes = [ path: 'my-projects/:id', loadChildren: () => import('./features/project/project.routes').then((mod) => mod.projectRoutes), }, - { - path: 'registries', - loadChildren: () => import('./features/registries/registries.routes').then((mod) => mod.registriesRoutes), - }, - { path: 'settings', loadChildren: () => import('./features/settings/settings.routes').then((mod) => mod.settingsRoutes), @@ -134,9 +101,22 @@ export const routes: Routes = [ loadChildren: () => import('./features/institutions/institutions.routes').then((r) => r.routes), }, { - path: 'confirm/:userId/:token', - loadComponent: () => import('./features/home/home.component').then((mod) => mod.HomeComponent), - data: { skipBreadcrumbs: true }, + path: 'registries', + loadChildren: () => import('./features/registries/registries.routes').then((mod) => mod.registriesRoutes), + }, + { + path: 'registries/:id', + loadChildren: () => import('./features/registry/registry.routes').then((mod) => mod.registryRoutes), + }, + { + path: 'terms-of-use', + loadComponent: () => + import('./features/static/terms-of-use/terms-of-use.component').then((mod) => mod.TermsOfUseComponent), + }, + { + path: 'privacy-policy', + loadComponent: () => + import('./features/static/privacy-policy/privacy-policy.component').then((mod) => mod.PrivacyPolicyComponent), }, { path: 'forbidden', @@ -145,20 +125,11 @@ export const routes: Routes = [ data: { skipBreadcrumbs: true }, }, { - path: 'request-access/:projectId', + path: 'request-access/:id', loadComponent: () => import('./core/components/request-access/request-access.component').then((mod) => mod.RequestAccessComponent), data: { skipBreadcrumbs: true }, }, - { - path: 'registries', - loadChildren: () => import('./features/registries/registries.routes').then((mod) => mod.registriesRoutes), - }, - { - path: 'registries/my-registrations/:registrationId', - loadChildren: () => import('./features/registry/registry.routes').then((mod) => mod.registryRoutes), - providers: [provideStates([RegistryOverviewState])], - }, { path: '**', loadComponent: () => diff --git a/src/app/core/components/nav-menu/nav-menu.component.html b/src/app/core/components/nav-menu/nav-menu.component.html index b6f8fd12c..558eabef3 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.html +++ b/src/app/core/components/nav-menu/nav-menu.component.html @@ -1,13 +1,11 @@