diff --git a/client/src/Post.scss b/client/src/Post.scss
index e944445..4c17338 100644
--- a/client/src/Post.scss
+++ b/client/src/Post.scss
@@ -23,10 +23,24 @@
.info {
flex-grow: 1;
align-self: start;
+
+ > * {
+ margin-left: 0.5rem;
+ }
+
+ > *:first-child {
+ margin-left: 0;
+ }
+
+ a {
+ color: inherit;
+
+ }
}
.actions {
align-self: end;
+
button {
background: none;
border: none;
diff --git a/client/src/Post.tsx b/client/src/Post.tsx
index 2cf4f99..6a01eef 100644
--- a/client/src/Post.tsx
+++ b/client/src/Post.tsx
@@ -1,14 +1,16 @@
import "./Post.scss";
-import { Form } from "react-router-dom";
+import { Form, Link } from "react-router-dom";
export function Post({
text,
createdDate,
actions,
+ authorUsername,
id,
}: {
text: string;
createdDate: string;
+ authorUsername: string;
actions: boolean;
id: number;
}) {
@@ -18,6 +20,12 @@ export function Post({
{createdDate}
+
+ by {authorUsername}
+
{actions && (
diff --git a/client/src/PostList.tsx b/client/src/PostList.tsx
index 7cae320..c5be472 100644
--- a/client/src/PostList.tsx
+++ b/client/src/PostList.tsx
@@ -20,6 +20,7 @@ export function PostList({
createdDate={`${date.toUTCString()}`}
key={p.id}
id={p.id}
+ authorUsername={p.authorUsername}
actions={selfUuid == p.authorUuid}
/>
);
diff --git a/client/src/api/dto.ts b/client/src/api/dto.ts
index 2d84724..5dbe03c 100644
--- a/client/src/api/dto.ts
+++ b/client/src/api/dto.ts
@@ -58,6 +58,7 @@ export const PostTo = z.object({
authorUuid: z.string(),
text: z.string(),
createdAt: z.number(),
+ authorUsername: z.string(),
});
export type TPostTo = z.infer;
diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/dto/PostTo.java b/server/src/main/java/com/usatiuk/tjv/y/server/dto/PostTo.java
index 4d59ca1..d16b8d4 100644
--- a/server/src/main/java/com/usatiuk/tjv/y/server/dto/PostTo.java
+++ b/server/src/main/java/com/usatiuk/tjv/y/server/dto/PostTo.java
@@ -1,6 +1,4 @@
package com.usatiuk.tjv.y.server.dto;
-import com.usatiuk.tjv.y.server.entity.Post;
-
-public record PostTo(Long id, String authorUuid, String text, Long createdAt) {
+public record PostTo(Long id, String authorUuid, String authorUsername, String text, Long createdAt) {
}
diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/dto/converters/PostMapper.java b/server/src/main/java/com/usatiuk/tjv/y/server/dto/converters/PostMapper.java
index f88912d..28669ea 100644
--- a/server/src/main/java/com/usatiuk/tjv/y/server/dto/converters/PostMapper.java
+++ b/server/src/main/java/com/usatiuk/tjv/y/server/dto/converters/PostMapper.java
@@ -5,6 +5,6 @@ import com.usatiuk.tjv.y.server.entity.Post;
public class PostMapper {
public static PostTo makeDto(Post post) {
- return new PostTo(post.getId(), post.getAuthor().getUuid(), post.getText(), post.getCreatedAt().getEpochSecond());
+ return new PostTo(post.getId(), post.getAuthor().getUuid(), post.getAuthor().getUsername(), post.getText(), post.getCreatedAt().getEpochSecond());
}
}