Merge pull request #1147 from ORCID/landing-page

Landing page
ORCID · Apr 2, 2024 · 1214a6a · 1214a6a
2 parents 87f8c2a + ca66907
commit 1214a6a
Show file tree

Hide file tree

Showing 16 changed files with 692 additions and 68 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -28,6 +28,8 @@
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@ng-bootstrap/ng-bootstrap": "^15.1.1",
     "bootstrap": "^5.3.2",
+    "jsrsasign": "^11.1.0",
+    "jsrsasign-util": "^1.0.5",
     "moment": "^2.29.4",
     "ngx-clipboard": "^16.0.0",
     "ngx-webstorage": "^12.0.0",
@@ -45,6 +47,7 @@
     "@angular/cli": "~16.2.6",
     "@angular/compiler-cli": "^16.2.9",
     "@types/jasmine": "~4.0.0",
+    "@types/jsrsasign": "^10.5.13",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
     "eslint": "^8.49.0",

diff --git a/ui/src/app/affiliation/affiliation.route.ts b/ui/src/app/affiliation/affiliation.route.ts
@@ -28,7 +28,7 @@ export const AffiliationResolver: ResolveFn<Affiliation | null> = (
 
 export const affiliationRoutes: Routes = [
   {
-    path: 'affiliations',
+    path: '',
     component: AffiliationsComponent,
     data: {
       authorities: ['ASSERTION_SERVICE_ENABLED'],
@@ -76,7 +76,7 @@ export const affiliationRoutes: Routes = [
     ],
   },
   {
-    path: 'affiliations/:id/view',
+    path: ':id/view',
     component: AffiliationDetailComponent,
     resolve: {
       affiliation: AffiliationResolver,

diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts
@@ -1,9 +1,7 @@
 import { NgModule } from '@angular/core'
-import { ActivatedRouteSnapshot, Resolve, Route, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'
+import { RouterModule, Routes } from '@angular/router'
 import { navbarRoute } from './layout/navbar/navbar.route'
 import { errorRoutes } from './error/error.route'
-import { AuthGuard } from './account/auth.guard'
-import { UsersComponent } from './user/users.component'
 
 const routes: Routes = [
   {
@@ -22,6 +20,10 @@ const routes: Routes = [
     path: 'affiliations',
     loadChildren: () => import('./affiliation/affiliation.module').then((m) => m.AffiliationModule),
   },
+  {
+    path: 'landing-page',
+    loadChildren: () => import('./landing-page/landing-page.module').then((m) => m.LandingPageModule),
+  },
 ]
 
 @NgModule({