Merge branch 'main' into add-eslint

ORCID · Oct 26, 2023 · fcb0385 · fcb0385
2 parents 20b1f30 + 114b00b
commit fcb0385
Show file tree

Hide file tree

Showing 9 changed files with 2,372 additions and 15 deletions.
diff --git a/gateway/src/main/webapp/index.html b/gateway/src/main/webapp/index.html
@@ -15,7 +15,6 @@
     <link rel="stylesheet" href="content/css/quill.snow.css">
     <link rel="stylesheet" href="content/css/quill.core.css">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
 
     <!-- jhipster-needle-add-resources-to-root - JHipster will add new resources here -->
 </head>

diff --git a/ui/angular.json b/ui/angular.json
@@ -29,7 +29,8 @@
               "src/content/images"
             ],
             "styles": [
-              "src/styles.scss"
+              "src/content/scss/wro.css",
+              "src/content/scss/global.scss"
             ],
             "scripts": []
           },
@@ -101,7 +102,8 @@
               "src/assets"
             ],
             "styles": [
-              "src/styles.scss"
+              "src/content/scss/wro.css",
+              "src/content/scss/global.scss"
             ],
             "scripts": []
           }

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -13,16 +13,19 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^16.2.9",
+    "@angular/cdk": "^16.2.9",
     "@angular/common": "^16.2.9",
     "@angular/compiler": "^16.2.9",
     "@angular/core": "^16.2.9",
     "@angular/forms": "^16.2.9",
+    "@angular/material": "^16.2.9",
     "@angular/platform-browser": "^16.2.9",
     "@angular/platform-browser-dynamic": "^16.2.9",
     "@angular/router": "^16.2.9",
     "@fortawesome/angular-fontawesome": "^0.13.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@ng-bootstrap/ng-bootstrap": "^15.1.1",
+    "bootstrap": "^5.3.2",
     "moment": "^2.29.4",
     "ngx-webstorage": "^12.0.0",
     "rxjs": "~7.5.0",
@@ -50,4 +53,4 @@
     "karma-jasmine-html-reporter": "~2.0.0",
     "typescript": "~4.9.5"
   }
-}
+}
diff --git a/ui/src/app/layout/navbar/navbar.component.ts b/ui/src/app/layout/navbar/navbar.component.ts
@@ -26,7 +26,7 @@ type EntityResponseType = HttpResponse<IMember>
 @Component({
   selector: 'app-navbar',
   templateUrl: './navbar.component.html',
-  styleUrls: ['navbar.scss'],
+  styleUrls: ['./navbar.scss'],
 })
 export class NavbarComponent implements OnInit {
   isNavbarCollapsed: boolean