diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 700f2af7b..0bd55f7d1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,7 +5,7 @@ import { RouterOutlet } from '@angular/router'; import { GetCurrentUser } from '@core/store/user'; -import { ToastComponent } from './shared'; +import { ToastComponent } from './shared/components'; @Component({ selector: 'osf-root', diff --git a/src/app/app.config.ts b/src/app/app.config.ts index e5217ad44..9931ac8fc 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -12,8 +12,8 @@ import { ApplicationConfig, ErrorHandler, importProvidersFrom, provideZoneChange import { provideAnimations } from '@angular/platform-browser/animations'; import { provideRouter } from '@angular/router'; -import { STATES } from '@core/constants/ngxs-states.constant'; -import { provideTranslation } from '@core/helpers/i18n.helper'; +import { STATES } from '@core/constants'; +import { provideTranslation } from '@core/helpers'; import { GlobalErrorHandler } from './core/handlers'; import { authInterceptor, errorInterceptor } from './core/interceptors'; diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index a238b3e87..adbad36dd 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -2,12 +2,12 @@ import { provideStates } from '@ngxs/store'; import { Routes } from '@angular/router'; -import { MyProfileResourceFiltersOptionsState } from '@osf/features/my-profile/components/resources/components/resource-filters/components/filters/store/my-profile-resource-filters-options.state'; -import { MyProfileResourceFiltersState } from '@osf/features/my-profile/components/resources/components/resource-filters/store/my-profile-resource-filters.state'; -import { MyProfileState } from '@osf/features/my-profile/store'; -import { ResourceFiltersOptionsState } from '@osf/features/search/components/resources/components/resource-filters/components/filters/store/resource-filters-options.state'; -import { ResourceFiltersState } from '@osf/features/search/components/resources/components/resource-filters/store/resource-filters.state'; -import { SearchState } from '@osf/features/search/store'; +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'; +import { ResourceFiltersOptionsState } from './features/search/components/filters/store'; +import { ResourceFiltersState } from './features/search/components/resource-filters/store'; +import { SearchState } from './features/search/store'; export const routes: Routes = [ { @@ -21,19 +21,22 @@ export const routes: Routes = [ }, { path: 'sign-up', - loadComponent: () => import('./features/auth/sign-up/sign-up.component').then((mod) => mod.SignUpComponent), + loadComponent: () => + import('./features/auth/pages/sign-up/sign-up.component').then((mod) => mod.SignUpComponent), }, { path: 'forgot-password', loadComponent: () => - import('./features/auth/forgot-password/forgot-password.component').then( + import('./features/auth/pages/forgot-password/forgot-password.component').then( (mod) => mod.ForgotPasswordComponent ), }, { path: 'reset-password', loadComponent: () => - import('./features/auth/reset-password/reset-password.component').then((mod) => mod.ResetPasswordComponent), + import('./features/auth/pages/reset-password/reset-password.component').then( + (mod) => mod.ResetPasswordComponent + ), }, { path: 'home', @@ -42,7 +45,7 @@ export const routes: Routes = [ { path: 'home-logged-out', loadComponent: () => - import('@osf/features/home/components/logged-out/home-logged-out.component').then( + import('@osf/features/home/pages/home-logged-out/home-logged-out.component').then( (mod) => mod.HomeLoggedOutComponent ), }, @@ -53,12 +56,12 @@ export const routes: Routes = [ { path: 'terms-of-use', loadComponent: () => - import('./features/terms-of-use/terms-of-use.component').then((mod) => mod.TermsOfUseComponent), + import('./features/static/terms-of-use/terms-of-use.component').then((mod) => mod.TermsOfUseComponent), }, { path: 'privacy-policy', loadComponent: () => - import('./features/privacy-policy/privacy-policy.component').then((mod) => mod.PrivacyPolicyComponent), + import('./features/static/privacy-policy/privacy-policy.component').then((mod) => mod.PrivacyPolicyComponent), }, { path: 'meetings', @@ -117,7 +120,7 @@ export const routes: Routes = [ { path: 'files/:fileId', loadComponent: () => - import('@osf/features/project/files/file-detail/file-detail.component').then( + import('@osf/features/project/files/components/file-detail/file-detail.component').then( (mod) => mod.FileDetailComponent ), }, @@ -174,4 +177,8 @@ export const routes: Routes = [ }, ], }, + { + path: '**', + redirectTo: 'home', + }, ]; diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index 2ec4903a9..fbb7a0a4d 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -1,42 +1,52 @@ -