Skip to content

Commit

Permalink
path based routing fixes (#87)
Browse files Browse the repository at this point in the history
* path based routing fixes
  • Loading branch information
sei-tspencer authored Sep 26, 2024
1 parent e86a217 commit 5925574
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @sei-tspencer @sei-awelle @sei-npacheco @sei-chershberger @sei-aschlackman @sei-noconnor
* @sei-tspencer @sei-awelle @sei-npacheco @sei-aschlackman @sei-mpriest
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gallery-ui",
"version": "1.6.4-rc1",
"version": "1.6.4-rc2",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down
12 changes: 6 additions & 6 deletions src/app/app.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ <h2 class="icon-text">Administration</h2>
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'
"
/>
</mat-sidenav>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/app/components/archive/archive.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
4 changes: 3 additions & 1 deletion src/app/components/wall/wall.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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$))
Expand Down
3 changes: 1 addition & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
<base href="/">

<meta name="viewport" content="width=device-width, initial-scale=1">
<link id="appFavicon" rel="icon" type="image/x-icon" href="/assets/img/monitor-dashboard-blue.png">
<link id="appFavicon" rel="icon" type="image/x-icon" href="assets/img/monitor-dashboard-blue.png">
<!-- <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> -->

</head>
<body>
<app-root></app-root>
</body>
</html>

0 comments on commit 5925574

Please sign in to comment.