diff --git a/src/app/app.component.html b/src/app/app.component.html index 94a21db1e..4997c5280 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,2 +1,3 @@ + diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0bd55f7d1..a87b340a3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,23 +1,23 @@ -import { Store } from '@ngxs/store'; +import { createDispatchMap } from '@ngxs/store'; -import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { RouterOutlet } from '@angular/router'; import { GetCurrentUser } from '@core/store/user'; -import { ToastComponent } from './shared/components'; +import { FullScreenLoaderComponent, ToastComponent } from './shared/components'; @Component({ selector: 'osf-root', - imports: [RouterOutlet, ToastComponent], + imports: [RouterOutlet, ToastComponent, FullScreenLoaderComponent], templateUrl: './app.component.html', styleUrl: './app.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) export class AppComponent implements OnInit { - #store = inject(Store); + actions = createDispatchMap({ getCurrentUser: GetCurrentUser }); ngOnInit(): void { - this.#store.dispatch(GetCurrentUser); + this.actions.getCurrentUser(); } } diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index 521118f98..b11f9dd2b 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -8,8 +8,12 @@ diff --git a/src/app/core/components/footer/footer.component.scss b/src/app/core/components/footer/footer.component.scss index 35c12aa6b..c6b90a91a 100644 --- a/src/app/core/components/footer/footer.component.scss +++ b/src/app/core/components/footer/footer.component.scss @@ -18,6 +18,20 @@ color: var.$dark-blue-1; text-align: center; } + + .social-link { + background-color: var.$pr-blue-1; + border-radius: mix.rem(6px); + color: var.$white; + padding: mix.rem(6px); + width: mix.rem(36px); + height: mix.rem(36px); + + &:hover { + background-color: var.$pr-blue-3; + text-decoration: none; + } + } } .footer-links { diff --git a/src/app/core/components/footer/footer.component.ts b/src/app/core/components/footer/footer.component.ts index 86029ce69..1c0b59ab7 100644 --- a/src/app/core/components/footer/footer.component.ts +++ b/src/app/core/components/footer/footer.component.ts @@ -1,16 +1,16 @@ import { TranslateModule } from '@ngx-translate/core'; -import { NgOptimizedImage } from '@angular/common'; import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { RouterLink } from '@angular/router'; -import { SocialIcon } from '@osf/shared/models'; +import { SOCIAL_ICONS } from '@osf/core/constants'; +import { IconComponent } from '@osf/shared/components'; import { IS_WEB } from '@shared/utils'; @Component({ selector: 'osf-footer', - imports: [RouterLink, NgOptimizedImage, TranslateModule], + imports: [RouterLink, TranslateModule, IconComponent], templateUrl: './footer.component.html', styleUrl: './footer.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, @@ -18,26 +18,5 @@ import { IS_WEB } from '@shared/utils'; export class FooterComponent { isWeb = toSignal(inject(IS_WEB)); - protected readonly socialIcons: SocialIcon[] = [ - { - name: 'x', - url: 'https://x.com/OSFramework', - ariaLabel: 'X (formerly Twitter)', - }, - { - name: 'facebook', - url: 'https://www.facebook.com/CenterForOpenScience/', - ariaLabel: 'Facebook', - }, - { - name: 'group', - url: 'https://groups.google.com/g/openscienceframework', - ariaLabel: 'Group', - }, - { - name: 'github', - url: 'https://github.com/centerforopenscience', - ariaLabel: 'GitHub', - }, - ]; + protected readonly socialIcons = SOCIAL_ICONS; } diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index c0c26ab32..040f23473 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -3,6 +3,7 @@