Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3c559fe
moved components to the core/components folder
rnastyuk Mar 3, 2025
8273b6a
added basic login component
rnastyuk Mar 3, 2025
01776c3
added auth service and auth store
rnastyuk Mar 3, 2025
d9ee0b6
removed login component, added sign-in and sign-up components
rnastyuk Mar 3, 2025
d0f43ba
removed redundant modifiers in auth service
rnastyuk Mar 4, 2025
23da6fa
chore(merge): main into 49
rnastyuk Mar 4, 2025
77d8953
chore(primeng-setup): basic design system configuration
rnastyuk Mar 7, 2025
866b053
Merge branch 'refs/heads/main' into chore/101-setup-primeng-design-sy…
rnastyuk Mar 7, 2025
fb38072
chore(primeng-setup): removed sign-in component
rnastyuk Mar 7, 2025
5731428
chore(primeng-setup): changed all private modifiers to '#'
rnastyuk Mar 7, 2025
1aa3a94
Merge branch 'refs/heads/main' into chore/101-setup-primeng-design-sy…
rnastyuk Mar 10, 2025
e15b309
feat(sign-up-design): create initial form layout
rnastyuk Mar 10, 2025
773cc6d
Merge branch 'main' into feat/49-design-sign-up-form
rnastyuk Mar 10, 2025
2e796bf
Merge branch 'refs/heads/main' into feat/49-design-sign-up-form
rnastyuk Mar 10, 2025
1ecfbbf
feat(sign-up-design): changed icons, finished form layout
rnastyuk Mar 10, 2025
0cf97d1
feat(sign-up-design): changed regexp, added autocomplete input attrib…
rnastyuk Mar 10, 2025
e89ae1e
feat(sign-up-design): removed console log
rnastyuk Mar 11, 2025
31c1d05
Merge remote-tracking branch 'origin/feat/49-design-sign-up-form' int…
rnastyuk Mar 11, 2025
ca54337
feat(sign-up-design): fixed some styles, added dynamic header button …
rnastyuk Mar 11, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/core/components/header/header.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a routerLink="/sign-up" class="p-button"> Sign Up </a>
<a [routerLink]="authButtonLink()" class="p-button">{{ authButtonText() }}</a>

<p-button label="Donate" severity="contrast" />
2 changes: 1 addition & 1 deletion src/app/core/components/header/header.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:host {
position: absolute;
height: 4.5rem;
padding-right: 1rem;
padding-right: 1.5rem;
width: 100%;
@include mix.flex-center-right;
gap: 1rem;
Expand Down
25 changes: 22 additions & 3 deletions src/app/core/components/header/header.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import {
ChangeDetectionStrategy,
Component,
computed,
inject,
} from '@angular/core';
import { Button } from 'primeng/button';
import { RouterLink } from '@angular/router';
import { Router, RouterLink } from '@angular/router';
import { toSignal } from '@angular/core/rxjs-interop';
import { map } from 'rxjs';

@Component({
standalone: true,
Expand All @@ -10,4 +17,16 @@ import { RouterLink } from '@angular/router';
styleUrl: './header.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class HeaderComponent {}
export class HeaderComponent {
#router = inject(Router);

#currentUrl = toSignal(this.#router.events.pipe(map(() => this.#router.url)));

protected readonly authButtonText = computed(() =>
this.#currentUrl()?.includes('sign-up') ? 'Sign In' : 'Sign Up',
);

protected readonly authButtonLink = computed(() =>
this.#currentUrl()?.includes('sign-up') ? '/login' : '/sign-up',
);
}
2 changes: 0 additions & 2 deletions src/app/core/components/root/root.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
.content {
@include mix.flex-column;
min-height: 100%;
background: url("/assets/images/sign-up-background.png") center no-repeat;
background-size: cover;
position: relative;
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/app/features/auth/sign-up/sign-up.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
:host {
@include mix.flex-column-center;
flex: 1;
background: url("/assets/images/sign-up-background.png") center no-repeat;
background-size: cover;

.sign-up-container {
@include mix.flex-column;
flex: 1;
color: var.$dark-blue-1;
width: 32rem;
margin: 2rem 0;
margin: 6.5rem 0 2rem 0;
padding: 2rem;
background: white;
border-radius: 0.6rem;
Expand Down
6 changes: 2 additions & 4 deletions src/app/features/home/home.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@

.latest-research-container {
width: 100%;
background: var.$gradient-2;
background: var.$bg-blue-3;
height: 11.14rem;
padding: 3.43rem 3.43rem 3.43rem 1.71rem;

Expand Down Expand Up @@ -178,9 +178,7 @@
width: 100%;
height: 11.14rem;
padding: 3.43rem 3.43rem 3.43rem 1.71rem;
background: url("/assets/images/hosting-background.svg") no-repeat center
center;
background-size: cover;
background-color: var.$bg-blue-2;

.content {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "assets/styles/variables" as var;

.container {
margin-top: 4.5rem;
padding: 1.7rem;
color: var.$dark-blue-1;

Expand Down
1 change: 1 addition & 0 deletions src/app/features/terms-of-use/terms-of-use.component.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "assets/styles/variables" as var;

.container {
margin-top: 4.5rem;
padding: 1.7rem;
color: var.$dark-blue-1;

Expand Down