- ©
- 2016 - 2024 All rights reserved
- -
- 2.1
-
- favorite
-
+ ©
+ 2016 - 2026 All rights reserved
+ -
+ 2.2
+
+ favorite
+
- menu_book
- -
- Development realised by Florian THIERRY
-
\ No newline at end of file
+
-
-
- 
- Codiki
-
+
+
+
+ Codiki
+
- Codiki
-
+
+
+
+ Codiki
+
-
- @if (isAuthenticated) {
-
-
-
-
- } @else {
- Login
- }
+ @if (isAuthenticated) {
+
+
+
+
+ } @else {
+ Login
+ }
-Add a code block
+Add a code block
Select an illustration
+Select an illustration
- @if (isLoading) {
- 
+ }
} @else {
- @if (pictures.length) {
- @for(picture of pictures; track picture) {
-
- }
- } @else {
-
\ No newline at end of file
+
+
+
+
diff --git a/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.scss b/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.scss
index d5ead41..0d0d121 100644
--- a/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.scss
+++ b/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.scss
@@ -1,83 +1,83 @@
:host {
+ display: flex;
+ flex-direction: column;
+ padding: 1em;
+ gap: 1em;
+ position: relative;
+ max-height: 90vh;
+
+ header {
+ flex: 1;
display: flex;
- flex-direction: column;
- padding: 1em;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .picture-container {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: center;
+ align-items: center;
gap: 1em;
- position: relative;
- max-height: 90vh;
+ max-height: 30em;
+ overflow-y: auto;
+ min-height: 10em;
+ padding: .5em 0;
- header {
- flex: 1;
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
+ img {
+ width: 15em;
+ height: 10em;
+ object-fit: cover;
+ border-radius: 1em;
+ opacity: .9;
+ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12);
+ transition: opacity .2s ease-in-out, box-shadow .2s ease-in-out;
+
+ &:hover {
+ cursor: pointer;
+ opacity: 1;
+ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .32), 0 2px 10px 0 rgba(0, 0, 0, .24);
+ }
+ }
+ }
+
+ footer {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+
+ button {
+ padding: .8em 1.2em;
+ border-radius: 10em;
+ border: none;
+ background-color: #3f51b5;
+ color: white;
+ transition: background-color .2s ease-in-out;
+ cursor: pointer;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ &:hover {
+ background-color: #5b6ed8;
+ }
+
+ &.secondary {
+ color: #3f51b5;
+ background-color: white;
+
+ &:hover {
+ background-color: #f2f4ff;
+ cursor: pointer;
+ }
+ }
}
- .picture-container {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- justify-content: center;
- align-items: center;
- gap: 1em;
- max-height: 30em;
- overflow-y: auto;
- min-height: 10em;
- padding: .5em 0;
-
- img {
- width: 15em;
- height: 10em;
- object-fit: cover;
- border-radius: 1em;
- opacity: .9;
- box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
- transition: opacity .2s ease-in-out, box-shadow .2s ease-in-out;
-
- &:hover {
- cursor: pointer;
- opacity: 1;
- box-shadow: 0 2px 5px 0 rgba(0,0,0,.32),0 2px 10px 0 rgba(0,0,0,.24);
- }
- }
+ input[type=file] {
+ display: none;
}
-
- footer {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- align-items: center;
-
- button {
- padding: .8em 1.2em;
- border-radius: 10em;
- border: none;
- background-color: #3f51b5;
- color: white;
- transition: background-color .2s ease-in-out;
- cursor: pointer;
- display: flex;
- justify-content: center;
- align-items: center;
-
- &:hover {
- background-color: #5b6ed8;
- }
-
- &.secondary {
- color: #3f51b5;
- background-color: white;
-
- &:hover {
- background-color: #f2f4ff;
- cursor: pointer;
- }
- }
- }
-
- input[type=file] {
- display: none;
- }
- }
-}
\ No newline at end of file
+ }
+}
diff --git a/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.ts b/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.ts
index 2e989bb..bbf8eac 100644
--- a/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.ts
+++ b/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.ts
@@ -1,74 +1,74 @@
-import { Component, inject, OnInit } from "@angular/core";
-import { Picture } from "../../../core/rest-services/picture/model/picture";
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import { MatSnackBar } from "@angular/material/snack-bar";
-import { PictureRestService } from "../../../core/rest-services/picture/picture.rest-service";
-import { MatIcon } from "@angular/material/icon";
-import { MatDialogRef } from "@angular/material/dialog";
-import {MatRippleModule} from '@angular/material/core';
-import { MatTooltip } from "@angular/material/tooltip";
+import {Component, inject, OnInit, signal} from "@angular/core";
+import {Picture} from "../../../core/rest-services/picture/model/picture";
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatSnackBar} from "@angular/material/snack-bar";
+import {PictureRestService} from "../../../core/rest-services/picture/picture.rest-service";
+import {MatIcon} from "@angular/material/icon";
+import {MatDialogRef} from "@angular/material/dialog";
+import {MatRippleModule} from '@angular/material/core';
+import {MatTooltip} from "@angular/material/tooltip";
@Component({
- selector: 'app-picture-selection',
- templateUrl: './picture-selection-dialog.component.html',
- styleUrl: './picture-selection-dialog.component.scss',
- imports: [
- MatIcon,
- MatRippleModule,
- MatProgressSpinnerModule,
- MatTooltip
- ]
+ selector: 'app-picture-selection',
+ templateUrl: './picture-selection-dialog.component.html',
+ styleUrl: './picture-selection-dialog.component.scss',
+ imports: [
+ MatIcon,
+ MatRippleModule,
+ MatProgressSpinnerModule,
+ MatTooltip
+ ]
})
export class PictureSelectionDialog implements OnInit {
- private readonly pictureRestService = inject(PictureRestService);
- private readonly snackBar = inject(MatSnackBar);
- private readonly dialogRef = inject(MatDialogRefPictures loading...
-Pictures loading...
+
+ }
} @else {
- @if (pictures.length) {
- @for(picture of pictures; track picture) {
-
- }
- } @else {
- There is no any picture.
- } +There is no any picture.
} + }
-
-
- {{publication.title}}
-{{publication.description}}
-
- 
- Publication posted by {{publication.author.name}}
-
+@for (publication of publications(); track publication.id) {
+
+
+
+
+}
diff --git a/frontend/src/app/components/publication-list/publication-list.component.scss b/frontend/src/app/components/publication-list/publication-list.component.scss
index a43901b..45670db 100644
--- a/frontend/src/app/components/publication-list/publication-list.component.scss
+++ b/frontend/src/app/components/publication-list/publication-list.component.scss
@@ -1,87 +1,87 @@
$cardBorderRadius: .5em;
:host {
+ display: flex;
+ flex-direction: column;
+ gap: 2em;
+ max-width: 50em;
+ width: 90%;
+ margin: auto;
+
+ .publication {
display: flex;
flex-direction: column;
- gap: 2em;
- max-width: 50em;
- width: 90%;
- margin: auto;
+ border-radius: $cardBorderRadius;
+ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12);
+ transition: box-shadow .2s ease-in-out;
+ text-decoration: none;
+ color: black;
+ background-color: #ffffff;
- .publication {
- display: flex;
- flex-direction: column;
- border-radius: $cardBorderRadius;
- box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
- transition: box-shadow .2s ease-in-out;
- text-decoration: none;
- color: black;
- background-color: #ffffff;
-
- &:hover {
- box-shadow: 0 4px 8px 0 rgba(0,0,0,.24),0 4px 14px 0 rgba(0,0,0,.16);
- }
-
- img {
- object-fit: cover;
- height: 15em;
- border-radius: $cardBorderRadius $cardBorderRadius 0 0;
- transition: height .2s ease-in-out;
-
- @media screen and (min-width: 450px) {
- height: 20em;
- }
-
- @media screen and (min-width: 600px) {
- height: 25em;
- }
-
- @media screen and (min-width: 750px) {
- height: 32em;
- }
- }
-
- .body {
- display: flex;
- flex-direction: column;
- padding: 1.5em 2em;
-
- h1 {
- font-size: 1.8em;
- margin-bottom: .5em;
- }
-
- h2 {
- font-size: 1em;
- line-height: 1.4em;
- margin: 0;
- color: #747373;
- font-weight: 400;
- }
- }
-
- .footer {
- display: flex;
- flex-direction: row;
- align-items: center;
- background-color: #f0f0f0;
- border-radius: 0 0 $cardBorderRadius $cardBorderRadius;
- padding: 1em 2em;
- gap: 1em;
- color: #6c757d;
-
- img {
- $imageSize: 4em;
- border-radius: 10em;
- width: $imageSize;
- height: $imageSize;
- object-fit: cover;
- }
-
- .publication-date {
- font-style: italic;
- color: #bdbdbd;
- }
- }
+ &:hover {
+ box-shadow: 0 4px 8px 0 rgba(0, 0, 0, .24), 0 4px 14px 0 rgba(0, 0, 0, .16);
}
-}
\ No newline at end of file
+
+ img {
+ object-fit: cover;
+ height: 15em;
+ border-radius: $cardBorderRadius $cardBorderRadius 0 0;
+ transition: height .2s ease-in-out;
+
+ @media screen and (min-width: 450px) {
+ height: 20em;
+ }
+
+ @media screen and (min-width: 600px) {
+ height: 25em;
+ }
+
+ @media screen and (min-width: 750px) {
+ height: 32em;
+ }
+ }
+
+ .body {
+ display: flex;
+ flex-direction: column;
+ padding: 1.5em 2em;
+
+ h1 {
+ font-size: 1.8em;
+ margin-bottom: .5em;
+ }
+
+ h2 {
+ font-size: 1em;
+ line-height: 1.4em;
+ margin: 0;
+ color: #747373;
+ font-weight: 400;
+ }
+ }
+
+ .footer {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ background-color: #f0f0f0;
+ border-radius: 0 0 $cardBorderRadius $cardBorderRadius;
+ padding: 1em 2em;
+ gap: 1em;
+ color: #6c757d;
+
+ img {
+ $imageSize: 4em;
+ border-radius: 10em;
+ width: $imageSize;
+ height: $imageSize;
+ object-fit: cover;
+ }
+
+ .publication-date {
+ font-style: italic;
+ color: #bdbdbd;
+ }
+ }
+ }
+}
diff --git a/frontend/src/app/components/publication-list/publication-list.component.ts b/frontend/src/app/components/publication-list/publication-list.component.ts
index f9d55b6..b18cdda 100644
--- a/frontend/src/app/components/publication-list/publication-list.component.ts
+++ b/frontend/src/app/components/publication-list/publication-list.component.ts
@@ -1,17 +1,15 @@
-import { Component, Input } from "@angular/core";
-import { Publication } from "../../core/rest-services/publications/model/publication";
-import { Observable } from "rxjs";
-import { CommonModule } from "@angular/common";
-import { RouterModule } from "@angular/router";
-import { MatTooltipModule } from "@angular/material/tooltip";
+import {Component, input} from "@angular/core";
+import {Publication} from "../../core/rest-services/publications/model/publication";
+import {CommonModule} from "@angular/common";
+import {RouterModule} from "@angular/router";
+import {MatTooltipModule} from "@angular/material/tooltip";
@Component({
- selector: 'app-publication-list',
- templateUrl: './publication-list.component.html',
- styleUrl: './publication-list.component.scss',
- imports: [CommonModule, RouterModule, MatTooltipModule]
+ selector: 'app-publication-list',
+ templateUrl: './publication-list.component.html',
+ styleUrl: './publication-list.component.scss',
+ imports: [CommonModule, RouterModule, MatTooltipModule]
})
export class PublicationListComponent {
- @Input()
- publications$!: Observable
- Publication posted by {{publication.author.name}}
-
+@for (publication of publications(); track publication.id) {
+
+
+
+
+ {{ publication.title }}
+{{ publication.description }}
+
+
+ Publication posted by {{ publication.author.name }}
+
({{ publication.creationDate | date: 'short' }})
-
-
-}
\ No newline at end of file
+
+ Publication posted by {{ publication.author.name }}
+
({{ publication.creationDate | date: 'short' }})
-
-
- {{category.name}}
- chevron_right
-
-
- @for(subCategory of category.subCategories; track subCategory) {
-
- {{subCategory.name}}
-
- }
-
+@for (category of categories$ | async; track category) {
+
+
+}
diff --git a/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.scss b/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.scss
index bcd6a8f..df29967 100644
--- a/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.scss
+++ b/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.scss
@@ -1,57 +1,57 @@
:host {
- display: flex;
- flex-direction: column;
+ display: flex;
+ flex-direction: column;
- .category {
+ .category {
+ transition: background-color .2s ease-in-out;
+
+ &:hover {
+ cursor: pointer;
+ background-color: #5c6bc0;
+ }
+
+ .category-header {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ padding: .5em 1em;
+
+ mat-icon {
+ transition: transform .2s ease-in-out;
+ }
+ }
+
+ &.openned {
+ .category-header {
+ mat-icon {
+ transform: rotate(90deg);
+ }
+ }
+
+ .sub-category-container {
+ max-height: none;
+ }
+ }
+
+ .sub-category-container {
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ max-height: 0;
+ transition: max-height .2s ease-in-out;
+ background-color: #303f9f;
+
+ .sub-category {
+ padding: .5em 1em .5em 2em;
+ text-decoration: none;
+ color: inherit;
transition: background-color .2s ease-in-out;
&:hover {
- cursor: pointer;
- background-color: #5c6bc0;
- }
-
- .category-header {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- align-items: center;
- padding: .5em 1em;
-
- mat-icon {
- transition: transform .2s ease-in-out;
- }
- }
-
- &.openned {
- .category-header {
- mat-icon {
- transform: rotate(90deg);
- }
- }
-
- .sub-category-container {
- max-height: none;
- }
- }
-
- .sub-category-container {
- display: flex;
- flex-direction: column;
- overflow: hidden;
- max-height: 0;
- transition: max-height .2s ease-in-out;
- background-color: #303f9f;
-
- .sub-category {
- padding: .5em 1em .5em 2em;
- text-decoration: none;
- color: inherit;
- transition: background-color .2s ease-in-out;
-
- &:hover {
- background-color: #5c6bc0;
- }
- }
+ background-color: #5c6bc0;
}
+ }
}
+ }
}
diff --git a/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.ts b/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.ts
index b0e8603..226a9c2 100644
--- a/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.ts
+++ b/frontend/src/app/components/side-menu/categories-menu/categories-menu.component.ts
@@ -1,19 +1,19 @@
-import { CommonModule } from "@angular/common";
-import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core";
-import { MatIconModule } from "@angular/material/icon";
-import { DisplayableCategory, SideMenuService } from "../side-menu.service";
-import { Observable } from "rxjs";
-import { RouterModule } from "@angular/router";
+import {CommonModule} from "@angular/common";
+import {Component, EventEmitter, inject, OnInit, Output} from "@angular/core";
+import {MatIconModule} from "@angular/material/icon";
+import {DisplayableCategory, SideMenuService} from "../side-menu.service";
+import {Observable} from "rxjs";
+import {RouterModule} from "@angular/router";
@Component({
- selector: 'app-categories-menu',
- templateUrl: './categories-menu.component.html',
- imports: [
- CommonModule,
- RouterModule,
- MatIconModule
- ],
- styleUrl: './categories-menu.component.scss'
+ selector: 'app-categories-menu',
+ templateUrl: './categories-menu.component.html',
+ imports: [
+ CommonModule,
+ RouterModule,
+ MatIconModule
+ ],
+ styleUrl: './categories-menu.component.scss'
})
export class CategoriesMenuComponent implements OnInit {
private sideMenuService = inject(SideMenuService);
@@ -37,10 +37,10 @@ export class CategoriesMenuComponent implements OnInit {
} else {
const categoriesDivs = document.getElementsByClassName('category-header');
Array.from(categoriesDivs)
- .map(category => category as HTMLElement)
+ .map(category => category as HTMLElement)
.forEach(categoryDiv => this.closeAccordion(categoryDiv));
-
- const categoryDiv = document.getElementById(`category-${category.id}`);
+
+ const categoryDiv = document.getElementById(`category-${category.id}`);
if (categoryDiv) {
this.openAccordion(categoryDiv);
}
@@ -58,4 +58,4 @@ export class CategoriesMenuComponent implements OnInit {
const divContent = categoryDiv?.nextElementSibling as HTMLElement;
divContent.style.maxHeight = `${divContent.scrollHeight}px`;
}
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/components/side-menu/side-menu.component.html b/frontend/src/app/components/side-menu/side-menu.component.html
index 28321a0..583647e 100644
--- a/frontend/src/app/components/side-menu/side-menu.component.html
+++ b/frontend/src/app/components/side-menu/side-menu.component.html
@@ -1,19 +1,19 @@
-
+ {{ category.name }}
+ chevron_right
-}
\ No newline at end of file
+
+ @for (subCategory of category.subCategories; track subCategory) {
+
+ {{ subCategory.name }}
+
+ }
+
+
-
-
-
- {
return this.categoriesSubject.asObservable();
}
-
+
get isLoading$(): Observable {
return this.isLoadingSubject.asObservable();
}
@@ -72,7 +72,7 @@ export class SideMenuService {
.catch(error => {
const errorMessage = $localize`An error occured while loading categories.`;
console.error(errorMessage, error);
- this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
+ this.snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
})
.finally(() => {
this.isLoadingSubject.next(false);
diff --git a/frontend/src/app/components/submit-button/submit-button.component.html b/frontend/src/app/components/submit-button/submit-button.component.html
index 01852ab..e8802f5 100644
--- a/frontend/src/app/components/submit-button/submit-button.component.html
+++ b/frontend/src/app/components/submit-button/submit-button.component.html
@@ -1,12 +1,12 @@
\ No newline at end of file
+
diff --git a/frontend/src/app/components/submit-button/submit-button.component.scss b/frontend/src/app/components/submit-button/submit-button.component.scss
index 13fe5c9..3c0c79f 100644
--- a/frontend/src/app/components/submit-button/submit-button.component.scss
+++ b/frontend/src/app/components/submit-button/submit-button.component.scss
@@ -1,43 +1,43 @@
button {
- padding: .8em 1.2em;
- border-radius: 10em;
- border: none;
- background-color: #3f51b5;
- color: white;
- transition: background-color .2s ease-in-out;
- position: relative;
+ padding: .8em 1.2em;
+ border-radius: 10em;
+ border: none;
+ background-color: #3f51b5;
+ color: white;
+ transition: background-color .2s ease-in-out;
+ position: relative;
+
+ &:hover {
+ background-color: #5b6ed8;
+ cursor: pointer;
+ }
+
+ &.secondary {
+ color: #3f51b5;
+ background-color: white;
&:hover {
- background-color: #5b6ed8;
- cursor: pointer;
+ background-color: #f2f4ff;
+ cursor: pointer;
}
+ }
- &.secondary {
- color: #3f51b5;
- background-color: white;
+ &:disabled {
+ background-color: #6d7ac5;
+ cursor: not-allowed;
+ }
- &:hover {
- background-color: #f2f4ff;
- cursor: pointer;
- }
- }
-
- &:disabled {
- background-color: #6d7ac5;
- cursor: not-allowed;
- }
-
- mat-spinner {
- position: absolute;
- top: calc(50% - 12px);
- left: calc(50% - 12px);
- }
+ mat-spinner {
+ position: absolute;
+ top: calc(50% - 12px);
+ left: calc(50% - 12px);
+ }
}
:host ::ng-deep .spinner circle {
- stroke: white;
+ stroke: white;
}
:host ::ng-deep .spinner.secondary circle {
- stroke: #3f51b5;
-}
\ No newline at end of file
+ stroke: #3f51b5;
+}
diff --git a/frontend/src/app/components/submit-button/submit-button.component.ts b/frontend/src/app/components/submit-button/submit-button.component.ts
index e4b43c5..43d061d 100644
--- a/frontend/src/app/components/submit-button/submit-button.component.ts
+++ b/frontend/src/app/components/submit-button/submit-button.component.ts
@@ -1,22 +1,20 @@
-
-import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { MatRippleModule } from "@angular/material/core";
-import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
+import {Component, input, output} from "@angular/core";
+import {MatRippleModule} from "@angular/material/core";
+import {MatProgressSpinnerModule} from "@angular/material/progress-spinner";
@Component({
- selector: 'app-submit-button',
- templateUrl: 'submit-button.component.html',
- styleUrl: 'submit-button.component.scss',
- imports: [
+ selector: 'app-submit-button',
+ templateUrl: 'submit-button.component.html',
+ styleUrl: 'submit-button.component.scss',
+ imports: [
MatRippleModule,
MatProgressSpinnerModule
-]
+ ]
})
export class SubmitButtonComponent {
- @Input() requestPending: boolean = false;
- @Input() label: string = '';
- @Input() disabled: boolean = false;
- @Input() color?: 'secondary';
- @Output() click = new EventEmitter();
- }
-
\ No newline at end of file
+ requestPending = input.required();
+ label = input();
+ disabled = input(false);
+ color = input<'secondary' | undefined>('secondary');
+ click = output();
+}
diff --git a/frontend/src/app/core/guard/already-authenticated.guard.ts b/frontend/src/app/core/guard/already-authenticated.guard.ts
index c2a589d..49380a4 100644
--- a/frontend/src/app/core/guard/already-authenticated.guard.ts
+++ b/frontend/src/app/core/guard/already-authenticated.guard.ts
@@ -1,18 +1,18 @@
-import { inject } from "@angular/core";
-import { CanActivateFn, Router } from "@angular/router";
-import { AuthenticationService } from "../service/authentication.service";
-import { MatSnackBar } from "@angular/material/snack-bar";
+import {inject} from "@angular/core";
+import {CanActivateFn, Router} from "@angular/router";
+import {AuthenticationService} from "../service/authentication.service";
+import {MatSnackBar} from "@angular/material/snack-bar";
export const alreadyAuthenticatedGuard: CanActivateFn = () => {
- const authenticationService = inject(AuthenticationService);
- const router = inject(Router);
- const snackBar = inject(MatSnackBar);
+ const authenticationService = inject(AuthenticationService);
+ const router = inject(Router);
+ const snackBar = inject(MatSnackBar);
- if (authenticationService.isAuthenticated()) {
- router.navigate(['/home']);
- snackBar.open($localize`You can't access to this page because you are already authenticated.`, $localize`Close`, { duration: 5000 });
- return false;
- } else {
- return true;
- }
-}
\ No newline at end of file
+ if (authenticationService.isAuthenticated()) {
+ router.navigate(['/home']);
+ snackBar.open($localize`You can't access to this page because you are already authenticated.`, $localize`Close`, {duration: 5000});
+ return false;
+ } else {
+ return true;
+ }
+}
diff --git a/frontend/src/app/core/guard/authentication.guard.ts b/frontend/src/app/core/guard/authentication.guard.ts
index 2e653dd..10b6903 100644
--- a/frontend/src/app/core/guard/authentication.guard.ts
+++ b/frontend/src/app/core/guard/authentication.guard.ts
@@ -1,20 +1,20 @@
-import { inject } from "@angular/core";
-import { CanActivateFn, Router } from "@angular/router";
-import { AuthenticationService } from "../service/authentication.service";
-import { MatSnackBar } from "@angular/material/snack-bar";
+import {inject} from "@angular/core";
+import {CanActivateFn, Router} from "@angular/router";
+import {AuthenticationService} from "../service/authentication.service";
+import {MatSnackBar} from "@angular/material/snack-bar";
export const authenticationGuard: CanActivateFn = async () => {
- const authenticationService = inject(AuthenticationService);
- const router = inject(Router);
- const snackBar = inject(MatSnackBar);
+ const authenticationService = inject(AuthenticationService);
+ const router = inject(Router);
+ const snackBar = inject(MatSnackBar);
- await authenticationService.checkIsAuthenticated();
+ await authenticationService.checkIsAuthenticated();
- if (authenticationService.isAuthenticated()) {
- return true;
- } else {
- router.navigate(['/login']);
- snackBar.open($localize`You are unauthenticated. Please, log-in first.`, $localize`Close`, { duration: 5000 });
- return false;
- }
-}
\ No newline at end of file
+ if (authenticationService.isAuthenticated()) {
+ return true;
+ } else {
+ router.navigate(['/login']);
+ snackBar.open($localize`You are unauthenticated. Please, log-in first.`, $localize`Close`, {duration: 5000});
+ return false;
+ }
+}
diff --git a/frontend/src/app/core/interceptor/jwt.interceptor.ts b/frontend/src/app/core/interceptor/jwt.interceptor.ts
index f4096d0..2058b9a 100644
--- a/frontend/src/app/core/interceptor/jwt.interceptor.ts
+++ b/frontend/src/app/core/interceptor/jwt.interceptor.ts
@@ -1,78 +1,77 @@
-import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { inject, Injectable } from '@angular/core';
-import { catchError, filter, Observable, Subject, switchMap, take, throwError } from 'rxjs';
-import { RefreshTokenRequest } from '../rest-services/user/model/refresh-token.model';
-import { UserRestService } from '../rest-services/user/user.rest-service';
-import { AuthenticationService } from '../service/authentication.service';
-import { Router } from '@angular/router';
-import { MatSnackBar } from '@angular/material/snack-bar';
+import {HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';
+import {inject, Injectable} from '@angular/core';
+import {catchError, filter, Observable, Subject, switchMap, take, throwError} from 'rxjs';
+import {UserRestService} from '../rest-services/user/user.rest-service';
+import {AuthenticationService} from '../service/authentication.service';
+import {Router} from '@angular/router';
+import {MatSnackBar} from '@angular/material/snack-bar';
@Injectable()
export class JwtInterceptor implements HttpInterceptor {
- private readonly authenticationService = inject(AuthenticationService);
- private readonly router = inject(Router);
- private readonly userRestService = inject(UserRestService);
- private readonly snackBar = inject(MatSnackBar);
- private isRefreshingToken = false;
- private refreshTokenSubject = new Subject();
+ private readonly authenticationService = inject(AuthenticationService);
+ private readonly router = inject(Router);
+ private readonly userRestService = inject(UserRestService);
+ private readonly snackBar = inject(MatSnackBar);
+ private isRefreshingToken = false;
+ private refreshTokenSubject = new Subject();
- intercept(request: HttpRequest, next: HttpHandler): Observable> {
+ intercept(request: HttpRequest, next: HttpHandler): Observable> {
+ let requestWithAuthentication = request;
+
+ const jwt = this.authenticationService.getToken();
+ if (jwt) {
+ requestWithAuthentication = this.addTokenInHeaders(request, jwt);
+ }
+
+ return next.handle(requestWithAuthentication)
+ .pipe(
+ catchError(error => {
+ if (error instanceof HttpErrorResponse && error.status === 401) {
+ return this.handleAunauthorizedError(request, next, error);
+ }
+
+ return throwError(() => error);
+ })
+ );
+ }
+
+ private handleAunauthorizedError(request: HttpRequest, next: HttpHandler, initialError: any): Observable> {
+ if (!this.isRefreshingToken) {
+ this.isRefreshingToken = true;
+ this.refreshTokenSubject.next(undefined);
+
+ this.authenticationService.refreshToken()
+ .then(refreshTokenResponse => {
+ this.refreshTokenSubject.next(refreshTokenResponse.accessToken);
+ })
+ .catch(() => this.handleNoRefreshToken(initialError))
+ .finally(() => this.isRefreshingToken = false);
+ }
+
+ return this.refreshTokenSubject.pipe(
+ filter(token => !!token),
+ take(1),
+ switchMap(token => {
let requestWithAuthentication = request;
-
- const jwt = this.authenticationService.getToken();
- if (jwt) {
- requestWithAuthentication = this.addTokenInHeaders(request, jwt);
+ if (token) {
+ requestWithAuthentication = this.addTokenInHeaders(request, token)
}
+ return next.handle(requestWithAuthentication);
+ })
+ );
+ }
- return next.handle(requestWithAuthentication)
- .pipe(
- catchError(error => {
- if (error instanceof HttpErrorResponse && error.status === 401) {
- return this.handleAunauthorizedError(request, next, error);
- }
+ private addTokenInHeaders(request: HttpRequest, token: string): HttpRequest {
+ return request.clone({
+ headers: request.headers.set('Authorization', `Bearer ${token}`)
+ });
+ }
- return throwError(() => error);
- })
- );
- }
-
- private handleAunauthorizedError(request: HttpRequest, next: HttpHandler, initialError: any): Observable> {
- if (!this.isRefreshingToken) {
- this.isRefreshingToken = true;
- this.refreshTokenSubject.next(undefined);
-
- this.authenticationService.refreshToken()
- .then(refreshTokenResponse => {
- this.refreshTokenSubject.next(refreshTokenResponse.accessToken);
- })
- .catch(() => this.handleNoRefreshToken(initialError))
- .finally(() => this.isRefreshingToken = false);
- }
-
- return this.refreshTokenSubject.pipe(
- filter(token => !!token),
- take(1),
- switchMap(token => {
- let requestWithAuthentication = request;
- if (token) {
- requestWithAuthentication = this.addTokenInHeaders(request, token)
- }
- return next.handle(requestWithAuthentication);
- })
- );
- }
-
- private addTokenInHeaders(request: HttpRequest, token: string): HttpRequest {
- return request.clone({
- headers: request.headers.set('Authorization', `Bearer ${token}`)
- });
- }
-
- private handleNoRefreshToken(initialError: any): Observable> {
- this.router.navigate(['/login']);
- this.refreshTokenSubject.next(undefined);
- this.authenticationService.unauthenticate();
- this.snackBar.open($localize`You are unauthenticated. Please, re-authenticate before retrying your action.`, $localize`Close`, { duration: 5000 });
- return throwError(() => initialError);
- }
-}
\ No newline at end of file
+ private handleNoRefreshToken(initialError: any): Observable> {
+ this.router.navigate(['/login']);
+ this.refreshTokenSubject.next(undefined);
+ this.authenticationService.unauthenticate();
+ this.snackBar.open($localize`You are unauthenticated. Please, re-authenticate before retrying your action.`, $localize`Close`, {duration: 5000});
+ return throwError(() => initialError);
+ }
+}
diff --git a/frontend/src/app/core/model/FormError.ts b/frontend/src/app/core/model/FormError.ts
index 52e4a26..c71f261 100644
--- a/frontend/src/app/core/model/FormError.ts
+++ b/frontend/src/app/core/model/FormError.ts
@@ -1,4 +1,4 @@
export interface FormError {
- fieldName: string;
- errorMessage: string;
-}
\ No newline at end of file
+ fieldName: string;
+ errorMessage: string;
+}
diff --git a/frontend/src/app/core/model/User.ts b/frontend/src/app/core/model/User.ts
index d02b8a6..c556a8a 100644
--- a/frontend/src/app/core/model/User.ts
+++ b/frontend/src/app/core/model/User.ts
@@ -1,7 +1,7 @@
export interface User {
- id: string;
- email: string;
- pseudo: string;
- photoId?: string;
- roles: string[];
-}
\ No newline at end of file
+ id: string;
+ email: string;
+ pseudo: string;
+ photoId?: string;
+ roles: string[];
+}
diff --git a/frontend/src/app/core/rest-services/category/category.rest-service.ts b/frontend/src/app/core/rest-services/category/category.rest-service.ts
index 9ad8e7b..5a8abe3 100644
--- a/frontend/src/app/core/rest-services/category/category.rest-service.ts
+++ b/frontend/src/app/core/rest-services/category/category.rest-service.ts
@@ -1,7 +1,7 @@
-import { HttpClient } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
-import { lastValueFrom } from 'rxjs';
-import { Category } from './model/category';
+import {HttpClient} from '@angular/common/http';
+import {inject, Injectable} from '@angular/core';
+import {lastValueFrom} from 'rxjs';
+import {Category} from './model/category';
@Injectable({
providedIn: 'root'
diff --git a/frontend/src/app/core/rest-services/category/model/category.ts b/frontend/src/app/core/rest-services/category/model/category.ts
index e7e0a43..fb1576d 100644
--- a/frontend/src/app/core/rest-services/category/model/category.ts
+++ b/frontend/src/app/core/rest-services/category/model/category.ts
@@ -1,5 +1,5 @@
export interface Category {
- id: string;
- name: string;
- subCategories: Category[];
-}
\ No newline at end of file
+ id: string;
+ name: string;
+ subCategories: Category[];
+}
diff --git a/frontend/src/app/core/rest-services/picture/model/picture.ts b/frontend/src/app/core/rest-services/picture/model/picture.ts
index 24d35ba..b193b28 100644
--- a/frontend/src/app/core/rest-services/picture/model/picture.ts
+++ b/frontend/src/app/core/rest-services/picture/model/picture.ts
@@ -1,4 +1,4 @@
export interface Picture {
- id: string,
- publishedAt: Date
-}
\ No newline at end of file
+ id: string,
+ publishedAt: Date
+}
diff --git a/frontend/src/app/core/rest-services/picture/picture.rest-service.ts b/frontend/src/app/core/rest-services/picture/picture.rest-service.ts
index c312077..8dcb959 100644
--- a/frontend/src/app/core/rest-services/picture/picture.rest-service.ts
+++ b/frontend/src/app/core/rest-services/picture/picture.rest-service.ts
@@ -1,21 +1,21 @@
-import { HttpClient, HttpParams } from "@angular/common/http";
-import { inject, Injectable } from "@angular/core";
-import { Picture } from "./model/picture";
-import { lastValueFrom } from "rxjs";
+import {HttpClient} from "@angular/common/http";
+import {inject, Injectable} from "@angular/core";
+import {Picture} from "./model/picture";
+import {lastValueFrom} from "rxjs";
@Injectable({
- providedIn: 'root'
+ providedIn: 'root'
})
export class PictureRestService {
- private readonly httpClient = inject(HttpClient);
+ private readonly httpClient = inject(HttpClient);
- getAllOfCurrentUser(): Promise {
- return lastValueFrom(this.httpClient.get('/api/pictures/current-user'));
- }
+ getAllOfCurrentUser(): Promise {
+ return lastValueFrom(this.httpClient.get('/api/pictures/current-user'));
+ }
- uploadPicture(pictureFile: File): Promise {
- const formData = new FormData();
- formData.append("file", pictureFile);
- return lastValueFrom(this.httpClient.post('/api/pictures', formData));
- }
-}
\ No newline at end of file
+ uploadPicture(pictureFile: File): Promise {
+ const formData = new FormData();
+ formData.append("file", pictureFile);
+ return lastValueFrom(this.httpClient.post('/api/pictures', formData));
+ }
+}
diff --git a/frontend/src/app/core/rest-services/publications/model/author.ts b/frontend/src/app/core/rest-services/publications/model/author.ts
index 84fc255..c4ecb27 100644
--- a/frontend/src/app/core/rest-services/publications/model/author.ts
+++ b/frontend/src/app/core/rest-services/publications/model/author.ts
@@ -1,5 +1,5 @@
export interface Author {
- id: string;
- name: string;
- image: string;
-}
\ No newline at end of file
+ id: string;
+ name: string;
+ image: string;
+}
diff --git a/frontend/src/app/core/rest-services/publications/model/preview.ts b/frontend/src/app/core/rest-services/publications/model/preview.ts
index 07b8314..28e3a3f 100644
--- a/frontend/src/app/core/rest-services/publications/model/preview.ts
+++ b/frontend/src/app/core/rest-services/publications/model/preview.ts
@@ -1,7 +1,7 @@
export interface PreviewContentRequest {
- text: string;
+ text: string;
}
export interface PreviewContentResponse {
- text: string;
-}
\ No newline at end of file
+ text: string;
+}
diff --git a/frontend/src/app/core/rest-services/publications/model/publication.ts b/frontend/src/app/core/rest-services/publications/model/publication.ts
index 3ab2c16..313d15d 100644
--- a/frontend/src/app/core/rest-services/publications/model/publication.ts
+++ b/frontend/src/app/core/rest-services/publications/model/publication.ts
@@ -1,14 +1,31 @@
-import { Author } from "./author";
+import {Author} from "./author";
export interface Publication {
- id: string;
- key: string;
- title: string;
- text: string;
- parsedText: string;
- description: string;
- creationDate: Date;
- illustrationId: string;
- categoryId: string;
- author: Author;
-}
\ No newline at end of file
+ id: string;
+ key: string;
+ title: string;
+ text: string;
+ parsedText: string;
+ description: string;
+ creationDate: Date;
+ illustrationId: string;
+ categoryId: string;
+ author: Author;
+}
+
+export const DEFAULT_PUBLICATION: Publication = {
+ id: '',
+ key: '',
+ title: '',
+ text: '',
+ parsedText: '',
+ description: '',
+ creationDate: new Date(),
+ illustrationId: '',
+ categoryId: '',
+ author: {
+ id: '',
+ name: '',
+ image: ''
+ }
+}
diff --git a/frontend/src/app/core/rest-services/publications/publication.rest-service.ts b/frontend/src/app/core/rest-services/publications/publication.rest-service.ts
index fc96878..1974fdc 100644
--- a/frontend/src/app/core/rest-services/publications/publication.rest-service.ts
+++ b/frontend/src/app/core/rest-services/publications/publication.rest-service.ts
@@ -1,8 +1,8 @@
-import { HttpClient, HttpParams } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
-import { last, lastValueFrom } from 'rxjs';
-import { Publication } from './model/publication';
-import { PreviewContentRequest, PreviewContentResponse } from './model/preview';
+import {HttpClient, HttpParams} from '@angular/common/http';
+import {inject, Injectable} from '@angular/core';
+import {lastValueFrom} from 'rxjs';
+import {Publication} from './model/publication';
+import {PreviewContentRequest, PreviewContentResponse} from './model/preview';
@Injectable({
providedIn: 'root'
@@ -29,7 +29,7 @@ export class PublicationRestService {
search(searchCriteria: string): Promise {
let params = new HttpParams();
params = params.set('query', searchCriteria);
- return lastValueFrom(this.httpClient.get('/api/publications', { params }));
+ return lastValueFrom(this.httpClient.get('/api/publications', {params}));
}
preview(request: PreviewContentRequest): Promise {
diff --git a/frontend/src/app/core/rest-services/user/model/login.model.ts b/frontend/src/app/core/rest-services/user/model/login.model.ts
index 81f9f21..755e135 100644
--- a/frontend/src/app/core/rest-services/user/model/login.model.ts
+++ b/frontend/src/app/core/rest-services/user/model/login.model.ts
@@ -1,10 +1,10 @@
export interface LoginRequest {
- email?: string;
- password?: string;
+ email?: string;
+ password?: string;
}
export interface LoginResponse {
- tokenType: string,
- accessToken: string,
- refreshToken: string
-}
\ No newline at end of file
+ tokenType: string,
+ accessToken: string,
+ refreshToken: string
+}
diff --git a/frontend/src/app/core/rest-services/user/model/refresh-token.model.ts b/frontend/src/app/core/rest-services/user/model/refresh-token.model.ts
index 818e225..29dd28e 100644
--- a/frontend/src/app/core/rest-services/user/model/refresh-token.model.ts
+++ b/frontend/src/app/core/rest-services/user/model/refresh-token.model.ts
@@ -1,3 +1,3 @@
export interface RefreshTokenRequest {
- refreshTokenValue: string;
-}
\ No newline at end of file
+ refreshTokenValue: string;
+}
diff --git a/frontend/src/app/core/rest-services/user/model/signin.model.ts b/frontend/src/app/core/rest-services/user/model/signin.model.ts
index e141b80..b1b4be5 100644
--- a/frontend/src/app/core/rest-services/user/model/signin.model.ts
+++ b/frontend/src/app/core/rest-services/user/model/signin.model.ts
@@ -1,5 +1,5 @@
export interface SigninRequest {
- pseudo?: string;
- email?: string;
- password?: string;
-}
\ No newline at end of file
+ pseudo?: string;
+ email?: string;
+ password?: string;
+}
diff --git a/frontend/src/app/core/rest-services/user/user.rest-service.ts b/frontend/src/app/core/rest-services/user/user.rest-service.ts
index c89f47d..5ed6f6b 100644
--- a/frontend/src/app/core/rest-services/user/user.rest-service.ts
+++ b/frontend/src/app/core/rest-services/user/user.rest-service.ts
@@ -1,25 +1,25 @@
-import { HttpClient } from "@angular/common/http";
-import { Injectable, inject } from "@angular/core";
-import { LoginRequest, LoginResponse } from "./model/login.model";
-import { lastValueFrom } from "rxjs";
-import { SigninRequest } from "./model/signin.model";
-import { RefreshTokenRequest } from "./model/refresh-token.model";
+import {HttpClient} from "@angular/common/http";
+import {inject, Injectable} from "@angular/core";
+import {LoginRequest, LoginResponse} from "./model/login.model";
+import {lastValueFrom} from "rxjs";
+import {SigninRequest} from "./model/signin.model";
+import {RefreshTokenRequest} from "./model/refresh-token.model";
@Injectable({
- providedIn: 'root'
+ providedIn: 'root'
})
export class UserRestService {
- private httpClient = inject(HttpClient);
+ private httpClient = inject(HttpClient);
- login(request: LoginRequest): Promise {
- return lastValueFrom(this.httpClient.post('/api/users/login', request));
- }
+ login(request: LoginRequest): Promise {
+ return lastValueFrom(this.httpClient.post('/api/users/login', request));
+ }
- signin(request: SigninRequest): Promise {
- return lastValueFrom(this.httpClient.post('/api/users', request));
- }
+ signin(request: SigninRequest): Promise {
+ return lastValueFrom(this.httpClient.post('/api/users', request));
+ }
- refreshToken(request: RefreshTokenRequest): Promise {
- return lastValueFrom(this.httpClient.post('/api/users/refresh-token', request));
- }
-}
\ No newline at end of file
+ refreshToken(request: RefreshTokenRequest): Promise {
+ return lastValueFrom(this.httpClient.post('/api/users/refresh-token', request));
+ }
+}
diff --git a/frontend/src/app/core/service/authentication.service.ts b/frontend/src/app/core/service/authentication.service.ts
index c4048a8..e21c963 100644
--- a/frontend/src/app/core/service/authentication.service.ts
+++ b/frontend/src/app/core/service/authentication.service.ts
@@ -1,146 +1,146 @@
-import { inject, Injectable } from "@angular/core";
-import { BehaviorSubject, interval } from "rxjs";
-import { User } from "../model/User";
-import { UserRestService } from "../rest-services/user/user.rest-service";
-import { RefreshTokenRequest } from "../rest-services/user/model/refresh-token.model";
-import { LoginResponse } from "../rest-services/user/model/login.model";
+import {inject, Injectable} from "@angular/core";
+import {BehaviorSubject, interval} from "rxjs";
+import {User} from "../model/User";
+import {UserRestService} from "../rest-services/user/user.rest-service";
+import {RefreshTokenRequest} from "../rest-services/user/model/refresh-token.model";
+import {LoginResponse} from "../rest-services/user/model/login.model";
const JWT_PARAM = 'jwt';
const REFRESH_TOKEN_PARAM = 'refresh-token';
interface UserDetails {
- sub: string;
- exp: number;
- email: string;
- pseudo: string;
- roles: string;
+ sub: string;
+ exp: number;
+ email: string;
+ pseudo: string;
+ roles: string;
}
@Injectable({
- providedIn: 'root'
+ providedIn: 'root'
})
export class AuthenticationService {
- private readonly AUTHENTICATION_CHECKING_PERIOD = 5 * 60 * 1000;
- private isAuthenticatedSubject = new BehaviorSubject(false);
- private readonly userRestService = inject(UserRestService);
+ private readonly AUTHENTICATION_CHECKING_PERIOD = 5 * 60 * 1000;
+ private isAuthenticatedSubject = new BehaviorSubject(false);
+ private readonly userRestService = inject(UserRestService);
- startAuthenticationCheckingProcess(): void {
- this.checkIsAuthenticated();
- interval(this.AUTHENTICATION_CHECKING_PERIOD)
- .subscribe(() => this.checkIsAuthenticated());
+ startAuthenticationCheckingProcess(): void {
+ this.checkIsAuthenticated();
+ interval(this.AUTHENTICATION_CHECKING_PERIOD)
+ .subscribe(() => this.checkIsAuthenticated());
+ }
+
+ authenticate(token: string, refreshToken: string): void {
+ localStorage.setItem(JWT_PARAM, token);
+ localStorage.setItem(REFRESH_TOKEN_PARAM, refreshToken);
+ this.isAuthenticatedSubject.next(true);
+ }
+
+ unauthenticate(): void {
+ localStorage.removeItem(JWT_PARAM);
+ localStorage.removeItem(REFRESH_TOKEN_PARAM);
+ this.isAuthenticatedSubject.next(false);
+ }
+
+ isAuthenticated(): boolean {
+ return this.isAuthenticatedSubject.value;
+ }
+
+ getAuthenticatedUser(): User | undefined {
+ return this.extractUserFromLocalStorage();
+ }
+
+ getToken(): string | undefined {
+ return localStorage.getItem(JWT_PARAM) ?? undefined;
+ }
+
+ getRefreshToken(): string | undefined {
+ return localStorage.getItem(REFRESH_TOKEN_PARAM) ?? undefined;
+ }
+
+ isTokenExpired(): boolean {
+ let result = true;
+
+ const userDetails = this.extractUserDetails();
+
+ if (userDetails) {
+ const expirationDate = new Date(userDetails.exp * 1000);
+ const now = new Date();
+
+ result = expirationDate < now;
}
- authenticate(token: string, refreshToken: string): void {
- localStorage.setItem(JWT_PARAM, token);
- localStorage.setItem(REFRESH_TOKEN_PARAM, refreshToken);
- this.isAuthenticatedSubject.next(true);
- }
+ return result;
+ }
- unauthenticate(): void {
- localStorage.removeItem(JWT_PARAM);
- localStorage.removeItem(REFRESH_TOKEN_PARAM);
- this.isAuthenticatedSubject.next(false);
- }
-
- isAuthenticated(): boolean {
- return this.isAuthenticatedSubject.value;
- }
-
- getAuthenticatedUser(): User | undefined {
- return this.extractUserFromLocalStorage();
- }
-
- getToken(): string | undefined {
- return localStorage.getItem(JWT_PARAM) ?? undefined;
- }
-
- getRefreshToken(): string | undefined {
- return localStorage.getItem(REFRESH_TOKEN_PARAM) ?? undefined;
- }
-
- isTokenExpired(): boolean {
- let result = true;
-
- const userDetails = this.extractUserDetails();
-
- if (userDetails) {
- const expirationDate = new Date(userDetails.exp * 1000);
- const now = new Date();
-
- result = expirationDate < now;
- }
-
- return result;
- }
-
- refreshToken(): Promise {
- const refreshToken = this.getRefreshToken();
- if (refreshToken) {
- const refreshTokenRequest: RefreshTokenRequest = {
- refreshTokenValue: refreshToken
- };
- return this.userRestService.refreshToken(refreshTokenRequest)
- .then(refreshTokenResponse => {
- this.authenticate(refreshTokenResponse.accessToken, refreshTokenResponse.refreshToken);
- return refreshTokenResponse;
- });
- }
-
- return Promise.reject('No any refresh token found.');
- }
-
- checkIsAuthenticated(): Promise {
- return new Promise((resolve, reject) => {
- const isTokenExpired = this.isTokenExpired();
- if (isTokenExpired) {
- if (this.getRefreshToken()) {
- this.refreshToken()
- .then(() => resolve())
- .catch(() => reject());
- } else {
- this.isAuthenticatedSubject.next(false);
- }
- } else {
- this.isAuthenticatedSubject.next(true);
- }
- resolve();
+ refreshToken(): Promise {
+ const refreshToken = this.getRefreshToken();
+ if (refreshToken) {
+ const refreshTokenRequest: RefreshTokenRequest = {
+ refreshTokenValue: refreshToken
+ };
+ return this.userRestService.refreshToken(refreshTokenRequest)
+ .then(refreshTokenResponse => {
+ this.authenticate(refreshTokenResponse.accessToken, refreshTokenResponse.refreshToken);
+ return refreshTokenResponse;
});
-
}
- private extractUserFromLocalStorage(): User | undefined {
- let result: User | undefined;
+ return Promise.reject('No any refresh token found.');
+ }
- const userDetails = this.extractUserDetails();
- if (userDetails) {
- const user = this.convertToUser(userDetails);
- result = user;
+ checkIsAuthenticated(): Promise {
+ return new Promise((resolve, reject) => {
+ const isTokenExpired = this.isTokenExpired();
+ if (isTokenExpired) {
+ if (this.getRefreshToken()) {
+ this.refreshToken()
+ .then(() => resolve())
+ .catch(() => reject());
+ } else {
+ this.isAuthenticatedSubject.next(false);
}
+ } else {
+ this.isAuthenticatedSubject.next(true);
+ }
+ resolve();
+ });
- return result;
+ }
+
+ private extractUserFromLocalStorage(): User | undefined {
+ let result: User | undefined;
+
+ const userDetails = this.extractUserDetails();
+ if (userDetails) {
+ const user = this.convertToUser(userDetails);
+ result = user;
}
- private extractUserDetails(): UserDetails | undefined {
- let result: UserDetails | undefined = undefined;
+ return result;
+ }
- const token = localStorage.getItem(JWT_PARAM);
+ private extractUserDetails(): UserDetails | undefined {
+ let result: UserDetails | undefined = undefined;
- const tokenParts = token?.split('.');
- if (tokenParts?.length === 3 && tokenParts[1].length) {
- const decodedTokenPart = atob(tokenParts[1]);
- const userDetails: UserDetails = JSON.parse(decodedTokenPart);
- result = userDetails;
- }
+ const token = localStorage.getItem(JWT_PARAM);
- return result;
+ const tokenParts = token?.split('.');
+ if (tokenParts?.length === 3 && tokenParts[1].length) {
+ const decodedTokenPart = atob(tokenParts[1]);
+ const userDetails: UserDetails = JSON.parse(decodedTokenPart);
+ result = userDetails;
}
- private convertToUser(userDetails: UserDetails): User {
- return {
- id: userDetails.sub,
- email: userDetails.email,
- pseudo: userDetails.pseudo,
- roles: userDetails.roles.split(',')
- };
- }
-}
\ No newline at end of file
+ return result;
+ }
+
+ private convertToUser(userDetails: UserDetails): User {
+ return {
+ id: userDetails.sub,
+ email: userDetails.email,
+ pseudo: userDetails.pseudo,
+ roles: userDetails.roles.split(',')
+ };
+ }
+}
diff --git a/frontend/src/app/core/service/category.service.ts b/frontend/src/app/core/service/category.service.ts
index 2352e88..ad12bf0 100644
--- a/frontend/src/app/core/service/category.service.ts
+++ b/frontend/src/app/core/service/category.service.ts
@@ -1,7 +1,7 @@
-import { Injectable, inject } from '@angular/core';
-import { CategoryRestService } from '../rest-services/category/category.rest-service';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { Category } from '../rest-services/category/model/category';
+import {inject, Injectable} from '@angular/core';
+import {CategoryRestService} from '../rest-services/category/category.rest-service';
+import {BehaviorSubject, Observable} from 'rxjs';
+import {Category} from '../rest-services/category/model/category';
@Injectable({
providedIn: 'root'
diff --git a/frontend/src/app/core/utils/ObjectUtils.ts b/frontend/src/app/core/utils/ObjectUtils.ts
index d0bd9c3..e3f22a9 100644
--- a/frontend/src/app/core/utils/ObjectUtils.ts
+++ b/frontend/src/app/core/utils/ObjectUtils.ts
@@ -1,5 +1,5 @@
export function copy(object: T): T {
- return JSON.parse(
- JSON.stringify(object)
- );
-}
\ No newline at end of file
+ return JSON.parse(
+ JSON.stringify(object)
+ );
+}
diff --git a/frontend/src/app/pages/disconnection/disconnection.component.scss b/frontend/src/app/pages/disconnection/disconnection.component.scss
index 01013a5..77683e5 100644
--- a/frontend/src/app/pages/disconnection/disconnection.component.scss
+++ b/frontend/src/app/pages/disconnection/disconnection.component.scss
@@ -1,6 +1,6 @@
:host {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
\ No newline at end of file
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
diff --git a/frontend/src/app/pages/disconnection/disconnection.component.ts b/frontend/src/app/pages/disconnection/disconnection.component.ts
index dfba69b..7b2a921 100644
--- a/frontend/src/app/pages/disconnection/disconnection.component.ts
+++ b/frontend/src/app/pages/disconnection/disconnection.component.ts
@@ -1,13 +1,13 @@
-import { Component, OnInit, inject } from '@angular/core';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import { AuthenticationService } from '../../core/service/authentication.service';
-import { Router } from '@angular/router';
+import {Component, inject, OnInit} from '@angular/core';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {AuthenticationService} from '../../core/service/authentication.service';
+import {Router} from '@angular/router';
@Component({
- selector: 'app-disconnection',
- imports: [MatProgressSpinnerModule],
- templateUrl: './disconnection.component.html',
- styleUrl: './disconnection.component.scss'
+ selector: 'app-disconnection',
+ imports: [MatProgressSpinnerModule],
+ templateUrl: './disconnection.component.html',
+ styleUrl: './disconnection.component.scss'
})
export class DisconnectionComponent implements OnInit {
private authenticationService = inject(AuthenticationService);
diff --git a/frontend/src/app/pages/home/home.component.html b/frontend/src/app/pages/home/home.component.html
index d5922ca..9ad3348 100644
--- a/frontend/src/app/pages/home/home.component.html
+++ b/frontend/src/app/pages/home/home.component.html
@@ -1,11 +1,11 @@
{
- return this.homeService.isLoading$;
- }
-
- get publications$(): Observable {
- return this.homeService.publications$;
- }
+ readonly #homeService = inject(HomeService);
+ isLoading = this.#homeService.isLoading;
+ publications = this.#homeService.publications;
ngOnInit(): void {
- this.homeService.startLatestPublicationsRetrieving();
+ this.#homeService.startLatestPublicationsRetrieving();
}
}
diff --git a/frontend/src/app/pages/home/home.service.ts b/frontend/src/app/pages/home/home.service.ts
index b3cd9bb..ebd3954 100644
--- a/frontend/src/app/pages/home/home.service.ts
+++ b/frontend/src/app/pages/home/home.service.ts
@@ -1,35 +1,34 @@
-import { Injectable, inject } from "@angular/core";
-import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
-import { BehaviorSubject, Observable } from "rxjs";
-import { MatSnackBar } from "@angular/material/snack-bar"
-import { Publication } from "../../core/rest-services/publications/model/publication";
+import {inject, Injectable, Signal, signal} from "@angular/core";
+import {PublicationRestService} from "../../core/rest-services/publications/publication.rest-service";
+import {MatSnackBar} from "@angular/material/snack-bar"
+import {Publication} from "../../core/rest-services/publications/model/publication";
@Injectable()
export class HomeService {
- private publicationRestService = inject(PublicationRestService);
- private snackBar = inject(MatSnackBar);
+ private publicationRestService = inject(PublicationRestService);
+ private snackBar = inject(MatSnackBar);
- private publicationsSubject = new BehaviorSubject([]);
- private isLoadingSubject = new BehaviorSubject(false);
+ #publications = signal([]);
+ #isLoadingSubject = signal(false);
- get isLoading$(): Observable {
- return this.isLoadingSubject.asObservable();
- }
+ get isLoading(): Signal {
+ return this.#isLoadingSubject.asReadonly();
+ }
- get publications$(): Observable {
- return this.publicationsSubject.asObservable();
- }
+ get publications(): Signal {
+ return this.#publications.asReadonly();
+ }
- startLatestPublicationsRetrieving(): void {
- this.isLoadingSubject.next(true);
+ startLatestPublicationsRetrieving(): void {
+ this.#isLoadingSubject.set(true);
- this.publicationRestService.getLatest()
- .then(publications => this.publicationsSubject.next(publications))
- .catch(error => {
- const errorMessage = $localize`An error occurred while retrieving latest publications...`;
- this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
- console.error(errorMessage, error);
- })
- .finally(() => this.isLoadingSubject.next(false));
- }
-}
\ No newline at end of file
+ this.publicationRestService.getLatest()
+ .then(publications => this.#publications.set(publications))
+ .catch(error => {
+ const errorMessage = $localize`An error occurred while retrieving latest publications...`;
+ this.snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
+ console.error(errorMessage, error);
+ })
+ .finally(() => this.#isLoadingSubject.set(false));
+ }
+}
diff --git a/frontend/src/app/pages/login/login.component.html b/frontend/src/app/pages/login/login.component.html
index 165af6f..79c4326 100644
--- a/frontend/src/app/pages/login/login.component.html
+++ b/frontend/src/app/pages/login/login.component.html
@@ -1,23 +1,23 @@
\ No newline at end of file
+ {
- return this.myPublicationsService.publications$;
- }
+ publications = this.myPublicationsService.publications;
+ isLoading = this.myPublicationsService.isLoading;
+ isLoaded = this.myPublicationsService.isLoaded;
- get isLoading$(): Observable {
- return this.myPublicationsService.isLoading$;
- }
-
- get isLoaded$(): Observable {
- return this.myPublicationsService.isLoaded$;
- }
-
- ngOnInit(): void {
- this.myPublicationsService.loadAuthenticatedUserPublications();
- }
-}
\ No newline at end of file
+ ngOnInit(): void {
+ this.myPublicationsService.loadAuthenticatedUserPublications();
+ }
+}
diff --git a/frontend/src/app/pages/my-publications/my-publications.routes.ts b/frontend/src/app/pages/my-publications/my-publications.routes.ts
index d0fe316..d5384c7 100644
--- a/frontend/src/app/pages/my-publications/my-publications.routes.ts
+++ b/frontend/src/app/pages/my-publications/my-publications.routes.ts
@@ -1,7 +1,7 @@
-import { Route } from "@angular/router";
-import { authenticationGuard } from "../../core/guard/authentication.guard";
-import { MyPublicationsComponent } from "./my-publications.component";
+import {Route} from "@angular/router";
+import {authenticationGuard} from "../../core/guard/authentication.guard";
+import {MyPublicationsComponent} from "./my-publications.component";
export const ROUTES: Route[] = [
- { path: '', component: MyPublicationsComponent, canActivate: [authenticationGuard] }
-]
\ No newline at end of file
+ {path: '', component: MyPublicationsComponent, canActivate: [authenticationGuard]}
+]
diff --git a/frontend/src/app/pages/my-publications/my-publications.service.ts b/frontend/src/app/pages/my-publications/my-publications.service.ts
index 5b15763..d25f3b0 100644
--- a/frontend/src/app/pages/my-publications/my-publications.service.ts
+++ b/frontend/src/app/pages/my-publications/my-publications.service.ts
@@ -1,57 +1,56 @@
-import { inject, Injectable } from "@angular/core";
-import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
-import { AuthenticationService } from "../../core/service/authentication.service";
-import { BehaviorSubject, Observable } from "rxjs";
-import { Publication } from "../../core/rest-services/publications/model/publication";
-import { Router } from "@angular/router";
-import { MatSnackBar } from "@angular/material/snack-bar";
+import {inject, Injectable, Signal, signal} from "@angular/core";
+import {PublicationRestService} from "../../core/rest-services/publications/publication.rest-service";
+import {AuthenticationService} from "../../core/service/authentication.service";
+import {Publication} from "../../core/rest-services/publications/model/publication";
+import {Router} from "@angular/router";
+import {MatSnackBar} from "@angular/material/snack-bar";
@Injectable()
export class MyPublicationsService {
- private readonly authenticationService = inject(AuthenticationService);
- private readonly publicationRestService = inject(PublicationRestService);
- private readonly snackBar = inject(MatSnackBar);
- private readonly router = inject(Router);
- private publicationsSubject = new BehaviorSubject([]);
- private isLoadingSubject = new BehaviorSubject(false);
- private isLoadedSubject = new BehaviorSubject(false);
+ readonly #authenticationService = inject(AuthenticationService);
+ readonly #publicationRestService = inject(PublicationRestService);
+ readonly #snackBar = inject(MatSnackBar);
+ readonly #router = inject(Router);
+ #publications = signal([]);
+ #isLoading = signal(false);
+ #isLoaded = signal(false);
- get publications$(): Observable {
- return this.publicationsSubject.asObservable();
+ get publications(): Signal {
+ return this.#publications.asReadonly();
+ }
+
+ get isLoading(): Signal {
+ return this.#isLoading.asReadonly();
+ }
+
+ get isLoaded(): Signal {
+ return this.#isLoaded.asReadonly();
+ }
+
+ loadAuthenticatedUserPublications(): void {
+ const authenticatedUser = this.#authenticationService.getAuthenticatedUser();
+ if (authenticatedUser) {
+ this.#isLoading.set(true);
+ this.#isLoaded.set(false);
+
+ const query = `author_id=${authenticatedUser.id}`;
+ this.#publicationRestService.search(query)
+ .then(publications => {
+ this.#publications.set(publications);
+ })
+ .catch(error => {
+ const errorMessage = $localize`An error occurred while retrieving your publications...`;
+ this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
+ console.error(errorMessage, error);
+ })
+ .finally(() => {
+ this.#isLoading.set(false);
+ this.#isLoaded.set(true);
+ });
+ } else {
+ this.#authenticationService.unauthenticate();
+ this.#snackBar.open($localize`You are unauthenticated. Please, log-in first.`, $localize`Close`, {duration: 5000});
+ this.#router.navigate(['/login']);
}
-
- get isLoading$(): Observable {
- return this.isLoadingSubject.asObservable();
- }
-
- get isLoaded$(): Observable {
- return this.isLoadedSubject.asObservable();
- }
-
- loadAuthenticatedUserPublications(): void {
- const authenticatedUser = this.authenticationService.getAuthenticatedUser();
- if (authenticatedUser) {
- this.isLoadingSubject.next(true);
- this.isLoadedSubject.next(false);
-
- const query = `author_id=${authenticatedUser.id}`;
- this.publicationRestService.search(query)
- .then(publications => {
- this.publicationsSubject.next(publications);
- })
- .catch(error => {
- const errorMessage = $localize`An error occurred while retrieving your publications...`;
- this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
- console.error(errorMessage, error);
- })
- .finally(() => {
- this.isLoadingSubject.next(false);
- this.isLoadedSubject.next(true);
- });
- } else {
- this.authenticationService.unauthenticate();
- this.snackBar.open($localize`You are unauthenticated. Please, log-in first.`, $localize`Close`, { duration: 5000 });
- this.router.navigate(['/login']);
- }
- }
-}
\ No newline at end of file
+ }
+}
diff --git a/frontend/src/app/pages/publication-creation/publication-creation.component.html b/frontend/src/app/pages/publication-creation/publication-creation.component.html
index afd1e70..aecd52e 100644
--- a/frontend/src/app/pages/publication-creation/publication-creation.component.html
+++ b/frontend/src/app/pages/publication-creation/publication-creation.component.html
@@ -1,7 +1,7 @@
-
\ No newline at end of file
+ title="Creation of a new publication"
+ [publication]="publication()"
+ [isSaving]="isSaving()"
+ (publicationSave)="onPublicationSave($event)"
+ i18n-title
+/>
diff --git a/frontend/src/app/pages/publication-creation/publication-creation.component.ts b/frontend/src/app/pages/publication-creation/publication-creation.component.ts
index 448732b..373edf7 100644
--- a/frontend/src/app/pages/publication-creation/publication-creation.component.ts
+++ b/frontend/src/app/pages/publication-creation/publication-creation.component.ts
@@ -1,74 +1,53 @@
-import { Component, inject, OnInit } from "@angular/core";
-import { PublicationEditionComponent } from "../../components/publication-edition/publication-edition.component";
-import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
-import { ActivatedRoute, Router } from "@angular/router";
-import { MatSnackBar } from "@angular/material/snack-bar";
-import { BehaviorSubject, Observable, Subscription } from "rxjs";
-import { Publication } from "../../core/rest-services/publications/model/publication";
-import { AuthenticationService } from "../../core/service/authentication.service";
-import { Author } from "../../core/rest-services/publications/model/author";
-
+import {Component, inject, OnInit, signal} from "@angular/core";
+import {PublicationEditionComponent} from "../../components/publication-edition/publication-edition.component";
+import {PublicationRestService} from "../../core/rest-services/publications/publication.rest-service";
+import {Router} from "@angular/router";
+import {MatSnackBar} from "@angular/material/snack-bar";
+import {DEFAULT_PUBLICATION, Publication} from "../../core/rest-services/publications/model/publication";
+import {AuthenticationService} from "../../core/service/authentication.service";
+import {Author} from "../../core/rest-services/publications/model/author";
@Component({
- selector: 'app-publication-creation',
- templateUrl: './publication-creation.component.html',
- styleUrl: './publication-creation.component.scss',
- imports: [
+ selector: 'app-publication-creation',
+ templateUrl: './publication-creation.component.html',
+ styleUrl: './publication-creation.component.scss',
+ imports: [
PublicationEditionComponent
-]
+ ]
})
export class PublicationCreationComponent implements OnInit {
- private readonly authenticationService = inject(AuthenticationService);
- private readonly publicationRestService = inject(PublicationRestService);
- private readonly router = inject(Router);
- private readonly snackBar = inject(MatSnackBar);
- private isSavingSubject = new BehaviorSubject(false);
- private subscriptions: Subscription[] = [];
- publication!: Publication;
+ readonly #authenticationService = inject(AuthenticationService);
+ readonly #publicationRestService = inject(PublicationRestService);
+ readonly #router = inject(Router);
+ readonly #snackBar = inject(MatSnackBar);
+ isSaving = signal(false);
+ publication = signal(DEFAULT_PUBLICATION);
- get isSaving$(): Observable {
- return this.isSavingSubject.asObservable();
+ ngOnInit(): void {
+ const authenticatedUser = this.#authenticationService.getAuthenticatedUser();
+ if (authenticatedUser) {
+ const author: Author = {
+ id: authenticatedUser.id,
+ name: authenticatedUser.pseudo,
+ image: authenticatedUser.photoId ?? ''
+ };
+ const newPublication: Publication = {...DEFAULT_PUBLICATION, author};
+ this.publication.set(newPublication);
}
+ }
- ngOnInit(): void {
- const authenticatedUser = this.authenticationService.getAuthenticatedUser();
- if (authenticatedUser) {
- const author: Author = {
- id: authenticatedUser.id,
- name: authenticatedUser.pseudo,
- image: authenticatedUser.photoId ?? ''
- };
- this.publication = {
- id: '',
- key: '',
- title: '',
- text: '',
- parsedText: '',
- description: '',
- creationDate: new Date(),
- illustrationId: '',
- categoryId: '',
- author
- };
- }
- }
-
- ngOnDestroy(): void {
- this.subscriptions.forEach(subscription => subscription?.unsubscribe());
- }
-
- onPublicationSave(publication: Publication): void {
- this.isSavingSubject.next(true);
- this.publicationRestService.create(publication)
- .then(() => {
- this.snackBar.open($localize`Publication created succesfully!`, $localize`Close`, { duration: 5000 });
- this.router.navigate(['/my-publications']);
- })
- .catch(error => {
- const errorMessage = $localize`An error occured while saving new publication.`;
- console.error(errorMessage, error);
- this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
- })
- .finally(() => this.isSavingSubject.next(false));
- }
-}
\ No newline at end of file
+ onPublicationSave(publication: Publication): void {
+ this.isSaving.set(true);
+ this.#publicationRestService.create(publication)
+ .then(() => {
+ this.#snackBar.open($localize`Publication created succesfully!`, $localize`Close`, {duration: 5000});
+ this.#router.navigate(['/my-publications']);
+ })
+ .catch(error => {
+ const errorMessage = $localize`An error occured while saving new publication.`;
+ console.error(errorMessage, error);
+ this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
+ })
+ .finally(() => this.isSaving.set(false));
+ }
+}
diff --git a/frontend/src/app/pages/publication-creation/publication-creation.routes.ts b/frontend/src/app/pages/publication-creation/publication-creation.routes.ts
index 5df6af3..baa64b6 100644
--- a/frontend/src/app/pages/publication-creation/publication-creation.routes.ts
+++ b/frontend/src/app/pages/publication-creation/publication-creation.routes.ts
@@ -1,7 +1,7 @@
-import { Route } from "@angular/router";
-import { authenticationGuard } from "../../core/guard/authentication.guard";
-import { PublicationCreationComponent } from "./publication-creation.component";
+import {Route} from "@angular/router";
+import {authenticationGuard} from "../../core/guard/authentication.guard";
+import {PublicationCreationComponent} from "./publication-creation.component";
export const ROUTES: Route[] = [
- { path: '', component: PublicationCreationComponent, canActivate: [authenticationGuard] }
-]
\ No newline at end of file
+ {path: '', component: PublicationCreationComponent, canActivate: [authenticationGuard]}
+]
diff --git a/frontend/src/app/pages/publication-update/publication-update.component.html b/frontend/src/app/pages/publication-update/publication-update.component.html
index 5de24e7..1e33dd2 100644
--- a/frontend/src/app/pages/publication-update/publication-update.component.html
+++ b/frontend/src/app/pages/publication-update/publication-update.component.html
@@ -1,20 +1,18 @@
-@if ((isLoading$ | async) == true) {
-
-
- }
- @else {
- (false);
- private isSavingSubject = new BehaviorSubject(false);
- private subscriptions: Subscription[] = [];
- publication: Publication | undefined;
+export class PublicationUpdateComponent {
+ readonly #activatedRoute = inject(ActivatedRoute);
+ readonly #location = inject(Location);
+ readonly #publicationRestService = inject(PublicationRestService);
+ readonly #router = inject(Router);
+ readonly #snackBar = inject(MatSnackBar);
+ #isLoading = signal(false);
+ #isSavingSubject = signal(false);
+ publication = signal(undefined);
- get isLoading$(): Observable {
- return this.isLoadingSubject.asObservable();
+ #publicationId$ = this.#activatedRoute.params
+ .pipe(map(queryParams => queryParams['publicationId']));
+ #publicationId = toSignal(this.#publicationId$, {initialValue: undefined});
+
+ get isLoading(): Signal {
+ return this.#isLoading.asReadonly();
}
- get isSaving$(): Observable {
- return this.isSavingSubject.asObservable();
+ get isSaving(): Signal {
+ return this.#isSavingSubject.asReadonly();
}
- ngOnInit(): void {
- this.isLoadingSubject.next(true);
- const activatedRouteSubscription = this.activatedRoute.paramMap.subscribe(params => {
- const publicationId = params.get('publicationId');
- if (publicationId == undefined) {
- this.snackBar.open($localize`A technical error occurred while loading publication data.`, $localize`Close`, { duration: 5000 });
- this.location.back();
- } else {
- this.publicationRestService.getById(publicationId)
- .then(publication => {
- this.publication = publication;
- })
- .catch(error => {
- const errorMessage = $localize`A technical error occurred while loading publication data.`;
- this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
- console.error(errorMessage, error)
- })
- .finally(() => this.isLoadingSubject.next(false));
- }
- });
- this.subscriptions.push(activatedRouteSubscription);
- }
+ constructor() {
+ effect(() => {
+ this.#isLoading.set(true);
- ngOnDestroy(): void {
- this.subscriptions.forEach(subscription => subscription?.unsubscribe());
+ const publicationId = this.#publicationId();
+ if (publicationId) {
+ this.#publicationRestService.getById(publicationId)
+ .then(publication => {
+ this.publication.set(publication);
+ })
+ .catch(error => {
+ const errorMessage = $localize`A technical error occurred while loading publication data.`;
+ this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
+ console.error(errorMessage, error)
+ })
+ .finally(() => this.#isLoading.set(false));
+ } else {
+ this.#snackBar.open($localize`A technical error occurred while loading publication data.`, $localize`Close`, {duration: 5000});
+ this.#location.back();
+ }
+ });
}
onPublicationSave(publication: Publication): void {
- this.isSavingSubject.next(true);
- this.publicationRestService.update(publication)
- .then(() => {
- this.snackBar.open($localize`Publication updated succesfully!`, $localize`Close`, { duration: 5000 });
- this.router.navigate(['/home']);
- })
- .catch(error => {
- const errorMessage = $localize`An error occured while saving publication modifications.`;
- console.error(errorMessage, error);
- this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
- })
- .finally(() => this.isSavingSubject.next(false));
+ this.#isSavingSubject.set(true);
+ this.#publicationRestService.update(publication)
+ .then(() => {
+ this.#snackBar.open($localize`Publication updated succesfully!`, $localize`Close`, {duration: 5000});
+ this.#router.navigate(['/home']);
+ })
+ .catch(error => {
+ const errorMessage = $localize`An error occured while saving publication modifications.`;
+ console.error(errorMessage, error);
+ this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
+ })
+ .finally(() => this.#isSavingSubject.set(false));
}
}
diff --git a/frontend/src/app/pages/publication-update/publication-update.routes.ts b/frontend/src/app/pages/publication-update/publication-update.routes.ts
index 90e519c..b63485c 100644
--- a/frontend/src/app/pages/publication-update/publication-update.routes.ts
+++ b/frontend/src/app/pages/publication-update/publication-update.routes.ts
@@ -1,7 +1,7 @@
-import { Route } from "@angular/router";
-import { PublicationUpdateComponent } from "./publication-update.component";
-import { authenticationGuard } from "../../core/guard/authentication.guard";
+import {Route} from "@angular/router";
+import {PublicationUpdateComponent} from "./publication-update.component";
+import {authenticationGuard} from "../../core/guard/authentication.guard";
export const ROUTES: Route[] = [
- { path: '', component: PublicationUpdateComponent, canActivate: [authenticationGuard] }
-]
\ No newline at end of file
+ {path: '', component: PublicationUpdateComponent, canActivate: [authenticationGuard]}
+]
diff --git a/frontend/src/app/pages/publication/publication.component.html b/frontend/src/app/pages/publication/publication.component.html
index 4ce22de..d6d88cc 100644
--- a/frontend/src/app/pages/publication/publication.component.html
+++ b/frontend/src/app/pages/publication/publication.component.html
@@ -1,50 +1,50 @@
-@if (isLoading) {
-
-
-
- Codiki
-
-
-
- Categories
-Last publications
-@if ((isLoading$ | async) === true) { -Publications loading...
-Publications loading...
+No any publication.
- } + @if (publications(); as publications) { +No any publication.
+ } } diff --git a/frontend/src/app/pages/home/home.component.scss b/frontend/src/app/pages/home/home.component.scss index 01013a5..77683e5 100644 --- a/frontend/src/app/pages/home/home.component.scss +++ b/frontend/src/app/pages/home/home.component.scss @@ -1,6 +1,6 @@ :host { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} \ No newline at end of file + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} diff --git a/frontend/src/app/pages/home/home.component.ts b/frontend/src/app/pages/home/home.component.ts index 600729a..f5c1c4c 100644 --- a/frontend/src/app/pages/home/home.component.ts +++ b/frontend/src/app/pages/home/home.component.ts @@ -1,34 +1,26 @@ -import { Component, OnInit, inject } from '@angular/core'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { Observable } from 'rxjs'; -import { PublicationListComponent } from '../../components/publication-list/publication-list.component'; -import { Publication } from '../../core/rest-services/publications/model/publication'; -import { HomeService } from './home.service'; -import { CommonModule } from '@angular/common'; +import {Component, inject, OnInit} from '@angular/core'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import {PublicationListComponent} from '../../components/publication-list/publication-list.component'; +import {HomeService} from './home.service'; +import {CommonModule} from '@angular/common'; @Component({ - selector: 'app-home', - imports: [ - CommonModule, - MatProgressSpinnerModule, - PublicationListComponent - ], - templateUrl: './home.component.html', - styleUrl: './home.component.scss', - providers: [HomeService] + selector: 'app-home', + imports: [ + CommonModule, + MatProgressSpinnerModule, + PublicationListComponent + ], + templateUrl: './home.component.html', + styleUrl: './home.component.scss', + providers: [HomeService] }) export class HomeComponent implements OnInit { - private homeService = inject(HomeService); - - get isLoading$(): ObservableLogin
+
+ mail
+
+
+
+
+ lock
+
+
+
+
+ Send
+ Create an account
+
+
diff --git a/frontend/src/app/pages/login/login.component.scss b/frontend/src/app/pages/login/login.component.scss
index 7aa78e0..856c2ee 100644
--- a/frontend/src/app/pages/login/login.component.scss
+++ b/frontend/src/app/pages/login/login.component.scss
@@ -1,7 +1,7 @@
:host {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- padding: 1em;
-}
\ No newline at end of file
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 1em;
+}
diff --git a/frontend/src/app/pages/login/login.component.ts b/frontend/src/app/pages/login/login.component.ts
index 823fe5e..19bb71b 100644
--- a/frontend/src/app/pages/login/login.component.ts
+++ b/frontend/src/app/pages/login/login.component.ts
@@ -1,25 +1,25 @@
-import { Component, OnDestroy, OnInit, inject } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { Subscription, debounceTime, map } from 'rxjs';
-import { LoginService } from './login.service';
-import { MatIconModule } from '@angular/material/icon';
-import { RouterModule } from '@angular/router';
-import { SubmitButtonComponent } from "../../components/submit-button/submit-button.component";
-import { MatRippleModule } from '@angular/material/core';
+import {Component, inject, OnDestroy, OnInit} from '@angular/core';
+import {FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
+import {MatSnackBarModule} from '@angular/material/snack-bar';
+import {debounceTime, map, Subscription} from 'rxjs';
+import {LoginService} from './login.service';
+import {MatIconModule} from '@angular/material/icon';
+import {RouterModule} from '@angular/router';
+import {SubmitButtonComponent} from "../../components/submit-button/submit-button.component";
+import {MatRippleModule} from '@angular/material/core';
@Component({
- selector: 'app-login',
- templateUrl: './login.component.html',
- styleUrl: './login.component.scss',
- imports: [
- MatIconModule,
- MatRippleModule,
- ReactiveFormsModule,
- RouterModule,
- SubmitButtonComponent
- ],
- providers: [LoginService, MatSnackBarModule]
+ selector: 'app-login',
+ templateUrl: './login.component.html',
+ styleUrl: './login.component.scss',
+ imports: [
+ MatIconModule,
+ MatRippleModule,
+ ReactiveFormsModule,
+ RouterModule,
+ SubmitButtonComponent
+ ],
+ providers: [LoginService, MatSnackBarModule]
})
export class LoginComponent implements OnInit, OnDestroy {
private loginService = inject(LoginService);
@@ -52,10 +52,10 @@ export class LoginComponent implements OnInit, OnDestroy {
this.subscriptions.push(passwordSubscription)
const stateSubscription = this.loginService.state$
- .subscribe(state => {
- this.loginForm.controls['email'].setValue(state.request.email, { emitEvent: false });
- this.loginForm.controls['password'].setValue(state.request.password, { emitEvent: false });
- });
+ .subscribe(state => {
+ this.loginForm.controls['email'].setValue(state.request.email, {emitEvent: false});
+ this.loginForm.controls['password'].setValue(state.request.password, {emitEvent: false});
+ });
this.subscriptions.push(stateSubscription);
}
diff --git a/frontend/src/app/pages/login/login.service.ts b/frontend/src/app/pages/login/login.service.ts
index cb0478b..88fd681 100644
--- a/frontend/src/app/pages/login/login.service.ts
+++ b/frontend/src/app/pages/login/login.service.ts
@@ -1,12 +1,12 @@
-import { Injectable, inject } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { copy } from '../../core/utils/ObjectUtils';
-import { FormError } from '../../core/model/FormError';
-import { UserRestService } from '../../core/rest-services/user/user.rest-service';
-import { LoginRequest } from '../../core/rest-services/user/model/login.model';
-import { AuthenticationService } from '../../core/service/authentication.service';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { Router } from '@angular/router';
+import {inject, Injectable} from '@angular/core';
+import {BehaviorSubject, Observable} from 'rxjs';
+import {copy} from '../../core/utils/ObjectUtils';
+import {FormError} from '../../core/model/FormError';
+import {UserRestService} from '../../core/rest-services/user/user.rest-service';
+import {LoginRequest} from '../../core/rest-services/user/model/login.model';
+import {AuthenticationService} from '../../core/service/authentication.service';
+import {MatSnackBar} from '@angular/material/snack-bar';
+import {Router} from '@angular/router';
export interface LoginState {
request: LoginRequest;
@@ -65,15 +65,15 @@ export class LoginService {
.login(state.request)
.then((response) => {
this.authenticationService.authenticate(response.accessToken, response.refreshToken);
- this.snackBar.open($localize`Authentication succeeded!`, $localize`Close`, { duration: 5000 });
+ this.snackBar.open($localize`Authentication succeeded!`, $localize`Close`, {duration: 5000});
this.router.navigate(['/home']);
})
.catch((error) => {
console.error(error);
- this.snackBar.open($localize`Authentication failed.`, $localize`Close`, { duration: 5000 });
+ this.snackBar.open($localize`Authentication failed.`, $localize`Close`, {duration: 5000});
});
} else {
- this.snackBar.open($localize`Please, fill the inputs before send.`, $localize`Close`, { duration: 5000 });
+ this.snackBar.open($localize`Please, fill the inputs before send.`, $localize`Close`, {duration: 5000});
}
}
diff --git a/frontend/src/app/pages/my-publications/my-publications.component.html b/frontend/src/app/pages/my-publications/my-publications.component.html
index bbaa30f..366e94d 100644
--- a/frontend/src/app/pages/my-publications/my-publications.component.html
+++ b/frontend/src/app/pages/my-publications/my-publications.component.html
@@ -1,21 +1,21 @@
Your publications
- + + class="new-publication" + matTooltip="Add a new publication" + matTooltipPosition="left" + matRipple + i18n-matTooltip> + + -@if ((isLoading$ | async) === true) { -Publication loading...
-Publication loading...
+There is no any publication...
- } -} \ No newline at end of file + @if (isLoaded()) { +There is no any publication...
+ } +} diff --git a/frontend/src/app/pages/my-publications/my-publications.component.scss b/frontend/src/app/pages/my-publications/my-publications.component.scss index 4acdd1d..9ea55ae 100644 --- a/frontend/src/app/pages/my-publications/my-publications.component.scss +++ b/frontend/src/app/pages/my-publications/my-publications.component.scss @@ -1,29 +1,29 @@ $newPublicationButtonSize: 1.7em; :host { - display: flex; - flex-direction: column; - align-items: center; + display: flex; + flex-direction: column; + align-items: center; - .new-publication { - position: fixed; - border-radius: 10em; - background-color: #14A44D; - color: white; - display: flex; - justify-content: center; - align-items: center; - bottom: $newPublicationButtonSize; - right: $newPublicationButtonSize; - width: $newPublicationButtonSize; - height: $newPublicationButtonSize; - text-decoration: none; - box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12); - transition: background-color .2s ease-in-out; - font-size: 2.2em; - - &:hover { - background-color: #0e7a3a; - } + .new-publication { + position: fixed; + border-radius: 10em; + background-color: #14A44D; + color: white; + display: flex; + justify-content: center; + align-items: center; + bottom: $newPublicationButtonSize; + right: $newPublicationButtonSize; + width: $newPublicationButtonSize; + height: $newPublicationButtonSize; + text-decoration: none; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12); + transition: background-color .2s ease-in-out; + font-size: 2.2em; + + &:hover { + background-color: #0e7a3a; } -} \ No newline at end of file + } +} diff --git a/frontend/src/app/pages/my-publications/my-publications.component.ts b/frontend/src/app/pages/my-publications/my-publications.component.ts index 7df92f5..83861b8 100644 --- a/frontend/src/app/pages/my-publications/my-publications.component.ts +++ b/frontend/src/app/pages/my-publications/my-publications.component.ts @@ -1,45 +1,35 @@ -import { Component, inject, OnInit } from "@angular/core"; -import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; -import { MyPublicationsService } from "./my-publications.service"; -import { Observable } from "rxjs"; -import { PublicationListComponent } from "../../components/publication-list/publication-list.component"; -import { Publication } from "../../core/rest-services/publications/model/publication"; -import { CommonModule } from "@angular/common"; -import { RouterModule } from "@angular/router"; -import { MatTooltipModule } from "@angular/material/tooltip"; -import { MatRippleModule } from "@angular/material/core"; +import {Component, inject, OnInit} from "@angular/core"; +import {MatProgressSpinnerModule} from "@angular/material/progress-spinner"; +import {MyPublicationsService} from "./my-publications.service"; +import {PublicationListComponent} from "../../components/publication-list/publication-list.component"; +import {CommonModule} from "@angular/common"; +import {RouterModule} from "@angular/router"; +import {MatTooltipModule} from "@angular/material/tooltip"; +import {MatRippleModule} from "@angular/material/core"; @Component({ - selector: 'app-my-component', - templateUrl: './my-publications.component.html', - styleUrl: './my-publications.component.scss', - imports: [ - CommonModule, - MatProgressSpinnerModule, - MatRippleModule, - MatTooltipModule, - PublicationListComponent, - RouterModule - ], - providers: [MyPublicationsService] + selector: 'app-my-component', + templateUrl: './my-publications.component.html', + styleUrl: './my-publications.component.scss', + imports: [ + CommonModule, + MatProgressSpinnerModule, + MatRippleModule, + MatTooltipModule, + PublicationListComponent, + RouterModule + ], + providers: [MyPublicationsService] }) export class MyPublicationsComponent implements OnInit { - private readonly myPublicationsService = inject(MyPublicationsService); + private readonly myPublicationsService = inject(MyPublicationsService); - get publications$(): ObservableLoading publication to edit...
-
-
- }
-}
\ No newline at end of file
+@if (isLoading()) {
+ Publication failed to load...
-Loading publication to edit...
+
+
+ }
+}
diff --git a/frontend/src/app/pages/publication-update/publication-update.component.scss b/frontend/src/app/pages/publication-update/publication-update.component.scss
index 71c44de..8d1c0ce 100644
--- a/frontend/src/app/pages/publication-update/publication-update.component.scss
+++ b/frontend/src/app/pages/publication-update/publication-update.component.scss
@@ -1,7 +1,7 @@
:host {
- display: flex;
+ display: flex;
- app-publication-edition {
- flex: 1;
- }
-}
\ No newline at end of file
+ app-publication-edition {
+ flex: 1;
+ }
+}
diff --git a/frontend/src/app/pages/publication-update/publication-update.component.ts b/frontend/src/app/pages/publication-update/publication-update.component.ts
index 76255a2..d02002b 100644
--- a/frontend/src/app/pages/publication-update/publication-update.component.ts
+++ b/frontend/src/app/pages/publication-update/publication-update.component.ts
@@ -1,93 +1,93 @@
-import { CommonModule, Location } from '@angular/common';
-import { Component, inject, OnDestroy, OnInit } from '@angular/core';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MatDialogModule } from '@angular/material/dialog';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { MatTabsModule } from '@angular/material/tabs';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { PublicationEditionComponent } from '../../components/publication-edition/publication-edition.component';
-import { Publication } from '../../core/rest-services/publications/model/publication';
-import { PublicationRestService } from '../../core/rest-services/publications/publication.rest-service';
+import {CommonModule, Location} from '@angular/common';
+import {Component, effect, inject, Signal, signal} from '@angular/core';
+import {ReactiveFormsModule} from '@angular/forms';
+import {MatDialogModule} from '@angular/material/dialog';
+import {MatIconModule} from '@angular/material/icon';
+import {MatInputModule} from '@angular/material/input';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatSnackBar} from '@angular/material/snack-bar';
+import {MatTabsModule} from '@angular/material/tabs';
+import {MatTooltipModule} from '@angular/material/tooltip';
+import {ActivatedRoute, Router} from '@angular/router';
+import {PublicationEditionComponent} from '../../components/publication-edition/publication-edition.component';
+import {Publication} from '../../core/rest-services/publications/model/publication';
+import {PublicationRestService} from '../../core/rest-services/publications/publication.rest-service';
+import {toSignal} from "@angular/core/rxjs-interop";
+import {map} from "rxjs";
@Component({
- selector: 'app-publication-update',
- imports: [
- CommonModule,
- MatDialogModule,
- MatIconModule,
- MatInputModule,
- MatProgressSpinnerModule,
- MatTabsModule,
- MatTooltipModule,
- ReactiveFormsModule,
- PublicationEditionComponent
- ],
- templateUrl: './publication-update.component.html',
- styleUrl: './publication-update.component.scss'
+ selector: 'app-publication-update',
+ imports: [
+ CommonModule,
+ MatDialogModule,
+ MatIconModule,
+ MatInputModule,
+ MatProgressSpinnerModule,
+ MatTabsModule,
+ MatTooltipModule,
+ ReactiveFormsModule,
+ PublicationEditionComponent
+ ],
+ templateUrl: './publication-update.component.html',
+ styleUrl: './publication-update.component.scss'
})
-export class PublicationUpdateComponent implements OnInit, OnDestroy {
- private readonly publicationRestService = inject(PublicationRestService);
- private readonly activatedRoute = inject(ActivatedRoute);
- private readonly location = inject(Location);
- private readonly router = inject(Router);
- private readonly snackBar = inject(MatSnackBar);
- private isLoadingSubject = new BehaviorSubjectPublication failed to load...
+Publication content loading...
-Publication content loading...
+
-
-
- edit
-
- }
-
-
-
-