From 5925574fd6805c6fca3d205c6b5b3ff148288960 Mon Sep 17 00:00:00 2001
From: Tim Spencer <72101647+sei-tspencer@users.noreply.github.com>
Date: Thu, 26 Sep 2024 13:31:57 -0400
Subject: [PATCH] path based routing fixes (#87)
* path based routing fixes
---
.github/CODEOWNERS | 2 +-
package.json | 2 +-
src/app/app.component.scss | 12 ++++++------
.../admin-container/admin-container.component.html | 4 ++--
.../admin-container/admin-container.component.ts | 4 +++-
src/app/components/archive/archive.component.ts | 4 +++-
src/app/components/wall/wall.component.ts | 4 +++-
src/index.html | 3 +--
8 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f06278b..2c140ac 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @sei-tspencer @sei-awelle @sei-npacheco @sei-chershberger @sei-aschlackman @sei-noconnor
+* @sei-tspencer @sei-awelle @sei-npacheco @sei-aschlackman @sei-mpriest
diff --git a/package.json b/package.json
index 4f90e56..ff6090c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "gallery-ui",
- "version": "1.6.4-rc1",
+ "version": "1.6.4-rc2",
"scripts": {
"ng": "ng",
"start": "ng serve",
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index 72dabef..daee15c 100755
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -3,24 +3,24 @@
@font-face {
font-family: 'open_sansregular';
- src: url('/assets/fonts/opensans-regular.woff2') format('woff2'),
- url('/assets/fonts/opensans-regular.woff') format('woff');
+ src: url('^assets/fonts/opensans-regular.woff2') format('woff2'),
+ url('^assets/fonts/opensans-regular.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'open_sansbold';
- src: url('/assets/fonts/opensans-bold.woff2') format('woff2'),
- url('/assets/fonts/opensans-bold.woff') format('woff');
+ src: url('^assets/fonts/opensans-bold.woff2') format('woff2'),
+ url('^assets/fonts/opensans-bold.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'open_sansitalic';
- src: url('/assets/fonts/opensans-italic.woff2') format('woff2'),
- url('/assets/fonts/opensans-italic.woff') format('woff');
+ src: url('^assets/fonts/opensans-italic.woff2') format('woff2'),
+ url('^assets/fonts/opensans-italic.woff') format('woff');
font-weight: normal;
font-style: normal;
}
diff --git a/src/app/components/admin/admin-container/admin-container.component.html b/src/app/components/admin/admin-container/admin-container.component.html
index 98f9534..b9d8eba 100755
--- a/src/app/components/admin/admin-container/admin-container.component.html
+++ b/src/app/components/admin/admin-container/admin-container.component.html
@@ -163,8 +163,8 @@ Administration
class="cmu-logo"
[src]="
(theme$ | async) === 'light-theme'
- ? '/assets/img/cmu-red-gray.png'
- : '/assets/img/cmu-red-gray.png'
+ ? 'assets/img/cmu-red-gray.png'
+ : 'assets/img/cmu-red-gray.png'
"
/>
diff --git a/src/app/components/admin/admin-container/admin-container.component.ts b/src/app/components/admin/admin-container/admin-container.component.ts
index 42cb9c5..45d2188 100755
--- a/src/app/components/admin/admin-container/admin-container.component.ts
+++ b/src/app/components/admin/admin-container/admin-container.component.ts
@@ -69,7 +69,9 @@ export class AdminContainerComponent implements OnDestroy, OnInit {
) {
this.theme$ = this.authQuery.userTheme$;
this.hideTopbar = this.inIframe();
- this._document.getElementById('appFavicon').setAttribute('href', '/assets/img/monitor-dashboard-blue.png');
+ this._document
+ .getElementById('appFavicon')
+ .setAttribute('href', 'assets/img/monitor-dashboard-blue.png');
this._document.getElementById('appTitle').innerHTML = this.settingsService.settings.AppTitle + ' Admin';
this.userDataService.isSuperUser
diff --git a/src/app/components/archive/archive.component.ts b/src/app/components/archive/archive.component.ts
index 3637f2c..30c89d4 100755
--- a/src/app/components/archive/archive.component.ts
+++ b/src/app/components/archive/archive.component.ts
@@ -95,7 +95,9 @@ export class ArchiveComponent implements OnDestroy {
private settingsService: ComnSettingsService,
private xApiService: XApiService
) {
- this._document.getElementById('appFavicon').setAttribute('href', '/assets/img/archive-blue.png');
+ this._document
+ .getElementById('appFavicon')
+ .setAttribute('href', 'assets/img/archive-blue.png');
this._document.getElementById('appTitle').innerHTML = this.settingsService.settings.AppTitle + ' Archive';
// subscribe to userArticles
this.userArticleQuery.selectAll().pipe(takeUntil(this.unsubscribe$)).subscribe(userArticles => {
diff --git a/src/app/components/wall/wall.component.ts b/src/app/components/wall/wall.component.ts
index 5d5ffde..95802e8 100755
--- a/src/app/components/wall/wall.component.ts
+++ b/src/app/components/wall/wall.component.ts
@@ -38,7 +38,9 @@ export class WallComponent implements OnDestroy {
private router: Router,
private settingsService: ComnSettingsService
) {
- this._document.getElementById('appFavicon').setAttribute('href', '/assets/img/wall-blue.png');
+ this._document
+ .getElementById('appFavicon')
+ .setAttribute('href', 'assets/img/wall-blue.png');
this._document.getElementById('appTitle').innerHTML = this.settingsService.settings.AppTitle + ' Wall';
this.cardQuery.selectAll()
.pipe(takeUntil(this.unsubscribe$))
diff --git a/src/index.html b/src/index.html
index de7b5d8..b173022 100755
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
-
+
@@ -19,4 +19,3 @@