`
- [{ list: 'ordered' }, { list: 'bullet' }], // Listes
+ [{header: [2, false]}], // Permet d'ajouter un ``
+ [{list: 'ordered'}, {list: 'bullet'}], // Listes
['link', 'image', 'video'], // Ajout de liens et images
],
};
diff --git a/src/app/components/post-home/post-home.component.css b/src/app/components/post-home/post-home.component.css
index bda9f33..d6382d2 100644
--- a/src/app/components/post-home/post-home.component.css
+++ b/src/app/components/post-home/post-home.component.css
@@ -6,3 +6,33 @@ img {
display: block;
margin: auto;
}
+
+.user-profile {
+ display: flex;
+ align-self: flex-start;
+ flex-direction: row;
+ align-items: center;
+ gap: 1rem;
+}
+
+.content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 1rem;
+}
+
+.desc {
+ text-align: justify;
+ text-justify: inter-word;
+ align-self: flex-start;
+}
+
+a {
+ text-decoration: none;
+ color: #4b5563;
+}
+
+a:visited {
+ color: #4b5563;
+}
diff --git a/src/app/components/post-home/post-home.component.html b/src/app/components/post-home/post-home.component.html
index 84ad00e..ef426b9 100644
--- a/src/app/components/post-home/post-home.component.html
+++ b/src/app/components/post-home/post-home.component.html
@@ -1,8 +1,19 @@
- {{ title }}
- {{ category }}
- Publié le {{ date | date : "dd/MM/yyyy à HH:mm" }}
- {{ description }}
-
diff --git a/src/app/components/post-home/post-home.component.ts b/src/app/components/post-home/post-home.component.ts
index 2a1caab..48a7236 100644
--- a/src/app/components/post-home/post-home.component.ts
+++ b/src/app/components/post-home/post-home.component.ts
@@ -3,6 +3,7 @@ import {Button} from 'primeng/button';
import {CardModule} from 'primeng/card';
import {DatePipe} from '@angular/common';
import {RouterLink} from '@angular/router';
+import {AvatarModule} from 'primeng/avatar';
@Component({
selector: 'app-post-home',
@@ -11,12 +12,15 @@ import {RouterLink} from '@angular/router';
Button,
CardModule,
DatePipe,
- RouterLink
+ RouterLink,
+ AvatarModule
],
templateUrl: './post-home.component.html',
styleUrl: './post-home.component.css'
})
export class PostHomeComponent {
+ @Input() authorProfilePicture: string = '';
+ @Input() authorId: string = '';
@Input() postId: bigint = BigInt(0);
@Input() title: string = '';
@Input() illustration: string = '';
@@ -24,7 +28,6 @@ export class PostHomeComponent {
@Input() date: Date | undefined;
@Input() description: string = '';
@Input() username: string = '';
- @Input() avatar: string = '';
constructor() {}
}
diff --git a/src/app/models/author-with-post.ts b/src/app/models/author-with-post.ts
new file mode 100644
index 0000000..624820a
--- /dev/null
+++ b/src/app/models/author-with-post.ts
@@ -0,0 +1,14 @@
+export interface AuthorWithPost {
+ authorId: string;
+ authorName: string;
+ authorProfilePicture: string;
+ role: string;
+ postId: bigint;
+ postDescription: string;
+ postIllustration: string;
+ postTitle: string;
+ postBody: string;
+ postCategory: string;
+ postPublicationDate: Date;
+ postIsUpdated: boolean;
+}
diff --git a/src/app/pages/home/home.component.css b/src/app/pages/home/home.component.css
index 0766bf7..7530654 100644
--- a/src/app/pages/home/home.component.css
+++ b/src/app/pages/home/home.component.css
@@ -5,3 +5,9 @@
padding: 2rem;
}
}
+
+.main-content {
+ display: flex;
+ flex-direction: column;
+ gap: 2rem;
+}
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index fcb7cfe..62715d8 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -1,16 +1,19 @@
{{ concernedPost?.title }}
- Publié le {{ concernedPost?.publicationDate | date: "dd/MM/yyyy à HH:mm" }}
-
-
-
- Commentaires
- @if (actualAuthor) {
- {{actualAuthor | json}}
- Mis à jour le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
- } @else {
- Envoyé le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
- }
-
+@if (concernedPost) {
+
+ {{ concernedPost?.title }}
+ Publié le {{ concernedPost.publicationDate | date: "dd/MM/yyyy à HH:mm" }}
+
+
+
+ Commentaires
+ @if (actualAuthor) {
+ {{ comment.content }}
- }
-
+ @for (comment of comments; track comment.id) {
+ @if (comment.profilePicture) {
+
+ Mis à jour le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ } @else {
+ Envoyé le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ }
+
+ } @else {
+
+ Mis à jour le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ } @else {
+ Envoyé le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ }
+
+ }
+ {{ comment.content }}
+ }
+
+ Loading...
+}
diff --git a/src/app/pages/post/post.component.ts b/src/app/pages/post/post.component.ts
index 41469dc..cd30109 100644
--- a/src/app/pages/post/post.component.ts
+++ b/src/app/pages/post/post.component.ts
@@ -4,7 +4,7 @@ import {forkJoin, Subscription} from 'rxjs';
import {Post} from '../../models/post';
import {PostService} from '../../services/post.service';
import {HeaderComponent} from '../../components/header/header.component';
-import {DatePipe, JsonPipe} from '@angular/common';
+import {DatePipe} from '@angular/common';
import {CommentService} from '../../services/comment.service';
import {MessageService} from 'primeng/api';
import {Comment} from '../../models/comment';
@@ -14,6 +14,7 @@ import {SafeHtmlPipe} from '../../pipes/safe-html-pipe';
import {CookieService} from 'ngx-cookie-service';
import {Author} from '../../models/author';
import {CommentFormComponent} from '../../components/comment-form/comment-form.component';
+import {FooterComponent} from '../../components/footer/footer.component';
@Component({
selector: 'app-post',
@@ -25,7 +26,7 @@ import {CommentFormComponent} from '../../components/comment-form/comment-form.c
CardModule,
SafeHtmlPipe,
CommentFormComponent,
- JsonPipe
+ FooterComponent
],
templateUrl: './post.component.html',
styleUrl: './post.component.css'
@@ -56,10 +57,11 @@ export class PostComponent {
next: res => {
res.post.body = res.post.body.replace(/ /g, ' ')
this.concernedPost = res.post;
+ this.sortCommentList(res.comment)
this.comments = res.comment.sort((a, b) => {
- if (a.commentDate < b.commentDate) {
+ if (a.commentDate > b.commentDate) {
return -1
- } else if (a.commentDate > b.commentDate) {
+ } else if (a.commentDate < b.commentDate) {
return 1
}
return 0
@@ -74,6 +76,22 @@ export class PostComponent {
});
}
+ addNewCommentToList(comment: Comment) {
+ this.comments.push(comment);
+ this.sortCommentList(this.comments);
+ }
+
+ sortCommentList(comments: Comment[]) {
+ comments.sort((a, b) => {
+ if (a.commentDate > b.commentDate) {
+ return -1
+ } else if (a.commentDate < b.commentDate) {
+ return 1
+ }
+ return 0
+ })
+ }
+
failureMessage(summary: string, detail: string): void {
this.messageService.add({
severity: 'error',
diff --git a/src/app/pages/profile/profile.component.html b/src/app/pages/profile/profile.component.html
index 4098cf3..4142855 100644
--- a/src/app/pages/profile/profile.component.html
+++ b/src/app/pages/profile/profile.component.html
@@ -37,3 +37,4 @@
} @else {
Loading...
}
+(`${this.url}/posts/${postId}`);
}
- create(content: string, postId: bigint, authorId: string): Observable {
- return this.httpClient.post(`${this.url}/posts/${postId}`, {postId: postId, authorId: authorId, content: content});
+ create(content: string, postId: bigint, authorId: string, token: string): Observable {
+ const httpOptions = {
+ headers: new HttpHeaders({
+ 'Authorization': `Bearer ${token}`
+ })
+ };
+ return this.httpClient.post(`${this.url}/posts/${postId}`, {postId: postId, authorId: authorId, content: content}, httpOptions);
}
}
diff --git a/src/app/services/post.service.ts b/src/app/services/post.service.ts
index d3c4226..cf40876 100644
--- a/src/app/services/post.service.ts
+++ b/src/app/services/post.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import {Observable} from 'rxjs';
import {Post} from '../models/post';
import {HttpClient, HttpHeaders} from '@angular/common/http';
+import {AuthorWithPost} from '../models/author-with-post';
@Injectable({
providedIn: 'root'
@@ -14,6 +15,10 @@ export class PostService {
return this.httpClient.get(this.url);
}
+ listWithAuthors(): Observable {
+ return this.httpClient.get(`${this.url}/authors`);
+ }
+
getPost(id: bigint) {
return this.httpClient.get(`${this.url}/${id}`);
}
- {{ title }}
-{{ category }}
- Publié le {{ date | date : "dd/MM/yyyy à HH:mm" }} -{{ description }}
-
+
@if (posts.length) {
- @for (post of posts; track post.id) {
-
+
-
-
-{{ concernedPost?.title }}
- Publié le {{ concernedPost?.publicationDate | date: "dd/MM/yyyy à HH:mm" }} -
-
+ Commentaires
- @if (actualAuthor) { - {{actualAuthor | json}} -
-
+@if (concernedPost) {
+ Mis à jour le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
- } @else { -Envoyé le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
- } -
+
+
+ {{ concernedPost?.title }}
+ Publié le {{ concernedPost.publicationDate | date: "dd/MM/yyyy à HH:mm" }} +
+
+ @for (comment of comments; track comment.id) {
+ @if (comment.profilePicture) {
+ Commentaires
+ @if (actualAuthor) { +{{ comment.content }}
- } -
+
+ } @else {
+ Mis à jour le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ } @else { +Envoyé le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ } +
+
+ }
+ Mis à jour le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ } @else { +Envoyé le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
+ } +{{ comment.content }}
+ } +
- {{ comment.authorRole }}
- @if (comment.isUpdated) { -Mis à jour le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
- } @else { -Envoyé le {{ comment.commentDate | date: "dd/MM/yyyy à HH:mm" }}
- } -