diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/2_proposal/des-textos-revelent-comment-bfm-sest-mise-au-service-de-sarkozy-le-boss.pdf.txt b/public/content/projects/1_miss-dior-blooming-bouquet/2_proposal/des-textos-revelent-comment-bfm-sest-mise-au-service-de-sarkozy-le-boss.pdf.txt index 6872059..623c4e1 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/2_proposal/des-textos-revelent-comment-bfm-sest-mise-au-service-de-sarkozy-le-boss.pdf.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/2_proposal/des-textos-revelent-comment-bfm-sest-mise-au-service-de-sarkozy-le-boss.pdf.txt @@ -1,4 +1,63 @@ -Comments: +Comments: + +- + location: + page: + uri: > + projects/miss-dior-blooming-bouquet/proposal + title: Offre commerciale + project: + title: Miss Dior Blooming Bouquet + uri: projects/miss-dior-blooming-bouquet + dialogUri: '/projects/miss-dior-blooming-bouquet?dialog=proposal&fileIndex=0' + file: + uuid: file://3vTh1tMFeFM2JxaN + url: > + http://localhost:8888/media/pages/projects/miss-dior-blooming-bouquet/proposal/788ddebfe3-1731941917/des-textos-revelent-comment-bfm-sest-mise-au-service-de-sarkozy-le-boss.pdf + position: + pageIndex: 1 + x: "57.105131038425" + y: "13.127413127413" + text: un commentaire + author: + name: Adrien Payet + email: adrien.payet@outlook.com + uuid: user://WWjXgPWk + role: admin + date: 2024-12-19T10:26:05+01:00 + id: e16a5304-330b-4460-acbd-a6e471f4cda2 + type: comment + replies: + - + location: + page: + uri: > + projects/miss-dior-blooming-bouquet/proposal + title: Offre commerciale + project: + title: Miss Dior Blooming Bouquet + uri: projects/miss-dior-blooming-bouquet + dialogUri: '/projects/miss-dior-blooming-bouquet?dialog=proposal&fileIndex=0' + file: + uuid: file://3vTh1tMFeFM2JxaN + url: > + http://localhost:8888/media/pages/projects/miss-dior-blooming-bouquet/proposal/788ddebfe3-1731941917/des-textos-revelent-comment-bfm-sest-mise-au-service-de-sarkozy-le-boss.pdf + parent: + author: + name: Adrien Payet + email: adrien.payet@outlook.com + id: e16a5304-330b-4460-acbd-a6e471f4cda2 + position: + pageIndex: 1 + text: une réponse + author: + name: Adrien Payet + email: adrien.payet@outlook.com + uuid: user://WWjXgPWk + role: admin + date: 2024-12-19T10:26:09+01:00 + id: bc64e066-299d-4d80-a651-2c17482cda2f + type: comment-reply ---- diff --git a/public/content/projects/3_projet-lcp2025/2_proposal/20241203-devis-givenchy-lcp-morphoz-vc-50-100-200ml.pdf.txt b/public/content/projects/3_projet-lcp2025/2_proposal/20241203-devis-givenchy-lcp-morphoz-vc-50-100-200ml.pdf.txt index eec360f..ac4afe7 100644 --- a/public/content/projects/3_projet-lcp2025/2_proposal/20241203-devis-givenchy-lcp-morphoz-vc-50-100-200ml.pdf.txt +++ b/public/content/projects/3_projet-lcp2025/2_proposal/20241203-devis-givenchy-lcp-morphoz-vc-50-100-200ml.pdf.txt @@ -26,7 +26,7 @@ Comments: date: 2024-12-03T13:42:18+01:00 id: m48g8hrb type: comment - isRead: false + isread: false - location: page: @@ -53,7 +53,7 @@ Comments: date: 2024-12-03T13:43:08+01:00 id: m48g9kau type: comment - isRead: false + isread: false ---- diff --git a/public/site/blueprints/users/admin.yml b/public/site/blueprints/users/admin.yml index 1f67800..09bcce7 100644 --- a/public/site/blueprints/users/admin.yml +++ b/public/site/blueprints/users/admin.yml @@ -45,9 +45,7 @@ fields: type: email disabled: true date: - type: date - display: DD-MM-YY - disabled: true - isRead: + type: hidden + isread: type: toggle disabled: true diff --git a/public/site/config/routes/validate-brief.php b/public/site/config/routes/validate-brief.php index d9d7e32..bfea8e2 100644 --- a/public/site/config/routes/validate-brief.php +++ b/public/site/config/routes/validate-brief.php @@ -26,7 +26,7 @@ return [ 'dialogUri' => (string) $dialogUri, ], 'date' => $dateTime->format('Y-m-d\TH:i:sP'), - 'text' => "Brief (" . $project->title()->value() . ")", + 'text' => "Nouveau brief", 'author' => kirby()->user(), 'id' => Str::uuid(), 'type' => 'content' diff --git a/public/site/plugins/classes/location/Location.php b/public/site/plugins/classes/location/Location.php index 8c85bfd..bc91c0c 100644 --- a/public/site/plugins/classes/location/Location.php +++ b/public/site/plugins/classes/location/Location.php @@ -8,7 +8,7 @@ class Location protected ?string $dialogUri = null; protected ProjectDetails $project; protected ?FileDetails $file = null; - protected ?string $parentCommentId = null; + protected ?array $parent = null; public function __construct(array $data) { @@ -19,19 +19,17 @@ class Location if (isset($data['file'])) { $this->file = new FileDetails($data["file"]); } - if (isset($data["parentCommentId"])) { - $this->parentCommentId(); + if (isset($data["parent"])) { + $this->parent = [ + "author" => [ + "name" => $data["parent"]["author"]["name"], + "email" => $data["parent"]["author"]["email"], + ], + "id" => $data["parent"]["id"] + ]; } } - public function setParentCommentId($id) { - $this->parentCommentId = $id; - } - - public function parentId() { - return $this->parentCommentId; - } - public function toArray() { $array = [ "page" => $this->page->toArray(), @@ -46,8 +44,8 @@ class Location $array["file"] = $this->file; } - if ($this->parentCommentId) { - $array["parentId"] = $this->parentCommentId; + if ($this->parent) { + $array["parent"] = $this->parent; } return $array; diff --git a/public/site/plugins/comments/routes/reply.php b/public/site/plugins/comments/routes/reply.php index 3eb04c2..91c9ceb 100644 --- a/public/site/plugins/comments/routes/reply.php +++ b/public/site/plugins/comments/routes/reply.php @@ -24,28 +24,27 @@ return [ $comments = $file->comments()->isEmpty() == true ? [] : Yaml::decode($file->comments()->value()); - $replyData = [ - "location" => [ - "page" => $page, - "project" => $project, - "dialogUri" => $data->dialogUri, - "file" => $file, - ], - "parentId" => $data->parentId, - "position" => [ - "pageIndex" => $data->position->pageIndex, - ], - "date" => (string) $data->date, - "text" => $data->text, - "author" => kirby()->user(), - "id" => Str::uuid(), - "type" => "comment", - ]; - - $newReply = new Reply($replyData); - foreach ($comments as &$comment) { - if ($comment['id'] === $newReply->parentId()) { + $isParentComment = $comment['id'] === $data->parentId; + if ($isParentComment) { + $replyData = [ + "location" => [ + "page" => $page, + "project" => $project, + "dialogUri" => $data->dialogUri, + "file" => $file, + "parent" => $comment + ], + "position" => [ + "pageIndex" => $data->position->pageIndex, + ], + "date" => (string) $data->date, + "text" => $data->text, + "author" => kirby()->user(), + "id" => Str::uuid(), + "type" => "comment-reply", + ]; + $newReply = new Reply($replyData); $comment['replies'][] = $newReply->toArray(); } } diff --git a/public/site/plugins/comments/src/BaseComment.php b/public/site/plugins/comments/src/BaseComment.php index a98d40e..407697c 100644 --- a/public/site/plugins/comments/src/BaseComment.php +++ b/public/site/plugins/comments/src/BaseComment.php @@ -6,7 +6,6 @@ use adrienpayet\D2P\data\Author; use adrienpayet\D2P\data\Position; class BaseComment { - protected string $type; protected Location $location; protected Author $author; protected string $text; diff --git a/public/site/plugins/comments/src/Reply.php b/public/site/plugins/comments/src/Reply.php index 7ab2b04..e425662 100644 --- a/public/site/plugins/comments/src/Reply.php +++ b/public/site/plugins/comments/src/Reply.php @@ -7,11 +7,6 @@ class Reply extends BaseComment { public function __construct($data) { parent::__construct($data); - $this->location->setParentCommentId($data["parentId"]); - } - - public function parentId() { - return $this->location->parentId(); } public function toArray() { diff --git a/public/site/plugins/notifications/src/Notification.php b/public/site/plugins/notifications/src/Notification.php index 614413a..9d0dfbc 100644 --- a/public/site/plugins/notifications/src/Notification.php +++ b/public/site/plugins/notifications/src/Notification.php @@ -12,7 +12,7 @@ class Notification protected Author $author; protected string $date; protected string $id; - protected string $isRead = "false"; + protected string $isread = "false"; protected ?Position $position = null; @@ -33,7 +33,7 @@ class Notification "author" => $this->author->toArray(), "date" => $this->date, "id" => $this->id, - "isRead" => $this->isRead, + "isread" => $this->isread, ]; return $array; diff --git a/public/site/plugins/notifications/user-methods/read.php b/public/site/plugins/notifications/user-methods/read.php index cb61db0..01f0c3f 100644 --- a/public/site/plugins/notifications/user-methods/read.php +++ b/public/site/plugins/notifications/user-methods/read.php @@ -10,7 +10,7 @@ return function($notificationId) { foreach ($notifications as $key => $notification) { if (!isset($notification['id'])) continue; if ($notification['id'] === $notificationId) { - $notifications[$key]['isRead'] = true; + $notifications[$key]['isread'] = "true"; $newNotification = $notifications[$key]; } } diff --git a/public/site/plugins/notifications/user-methods/readAll.php b/public/site/plugins/notifications/user-methods/readAll.php index 4a16156..988547a 100644 --- a/public/site/plugins/notifications/user-methods/readAll.php +++ b/public/site/plugins/notifications/user-methods/readAll.php @@ -8,7 +8,7 @@ return function() { $newNotification = null; foreach ($notifications as $key => $notification) { - $notifications[$key]['isRead'] = true; + $notifications[$key]['isread'] = true; } $updatedUser = $this->update([ diff --git a/src/components/Menu.vue b/src/components/Menu.vue index ea63424..dbe088d 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -117,7 +117,7 @@ const { page } = storeToRefs(usePageStore()); const unreadNotificationsCount = computed(() => { if (!user.value) return undefined; const count = user.value.notifications.filter( - (notification) => notification.isRead + (notification) => notification.isread ).length; if (count === 0) return undefined; return count; @@ -164,7 +164,7 @@ function hasUnreadNotification(project) { if (!user.value) return false; return user.value.notifications.some((notification) => { return ( - notification.isRead != true && + notification.isread != true && project.uri.includes(notification.location.project.uri) ); }); diff --git a/src/components/comments/Comment.vue b/src/components/comments/Comment.vue index 9f6db40..e5d485c 100644 --- a/src/components/comments/Comment.vue +++ b/src/components/comments/Comment.vue @@ -16,7 +16,7 @@ {{ formatDate(comment.date) }}

@@ -74,7 +74,7 @@ const status = computed(() => { const correspondingNotification = userStore.notifications.find( (notification) => notification.id === comment.id ); - if (correspondingNotification && !correspondingNotification.isRead) { + if (correspondingNotification && !correspondingNotification.isread) { return "unread"; } return undefined; diff --git a/src/components/notifications/Comment.vue b/src/components/notifications/Comment.vue new file mode 100644 index 0000000..df173fd --- /dev/null +++ b/src/components/notifications/Comment.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/components/notifications/Content.vue b/src/components/notifications/Content.vue new file mode 100644 index 0000000..c87a812 --- /dev/null +++ b/src/components/notifications/Content.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/components/notifications/Reply.vue b/src/components/notifications/Reply.vue new file mode 100644 index 0000000..aea2033 --- /dev/null +++ b/src/components/notifications/Reply.vue @@ -0,0 +1,49 @@ + + + diff --git a/src/stores/notifications.js b/src/stores/notifications.js new file mode 100644 index 0000000..6c5470d --- /dev/null +++ b/src/stores/notifications.js @@ -0,0 +1,45 @@ +import { defineStore } from "pinia"; +import dayjs from "dayjs"; +import "dayjs/locale/fr"; +import { useRouter } from "vue-router"; +import { useApiStore } from "./api"; + +export const useNotificationsStore = defineStore("notifications", () => { + dayjs.locale("fr"); + + const router = useRouter(); + const api = useApiStore(); + + function formatDate(notification) { + const notificationDigitalDate = parseInt( + dayjs(notification.date).format("YYYYMMDD") + ); + const todayDigitalDate = parseInt(dayjs().format("YYYYMMDD")); + const isToday = notificationDigitalDate === todayDigitalDate; + + if (isToday) { + return dayjs(notification.date).format("HH:mm"); + } else if (todayDigitalDate === notificationDigitalDate + 1) { + return "hier"; + } else { + return dayjs(notification.date).format("DD MMM YY"); + } + } + + function read(notification) { + if (!notification.id) { + console.error( + "Couldn't change notification status because it has no id." + ); + } else if (notification.isread != true) { + api + .readNotification(notification.id) + .then((res) => { + console.log(res); + }) + .catch((err) => console.error("Notification could not be read.", err)); + } + } + + return { formatDate, read }; +}); diff --git a/src/stores/user.js b/src/stores/user.js index 63d798e..d7c9b03 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -13,14 +13,14 @@ export const useUserStore = defineStore("user", () => { function readNotification(notificationId) { user.value.notifications.forEach((notification) => { if (notification.id === notificationId) { - notification.isRead = true; + notification.isread = true; } }); } function readAllNotifications(notificationId) { user.value.notifications.forEach((notification) => { - notification.isRead = true; + notification.isread = true; }); } diff --git a/src/utils/string.js b/src/utils/string.js index c209cb0..34daf89 100644 --- a/src/utils/string.js +++ b/src/utils/string.js @@ -6,6 +6,10 @@ function toPascalCase(string) { }); } -const StringUtils = { toPascalCase }; +function urlToPath(url) { + return url.replace(window.location.origin, ""); +} + +const StringUtils = { toPascalCase, urlToPath }; export default StringUtils; diff --git a/src/views/Brief.vue b/src/views/Brief.vue index 1b30267..a50cdc2 100644 --- a/src/views/Brief.vue +++ b/src/views/Brief.vue @@ -58,8 +58,7 @@ function setInitialStep() { function validate() { api.validateBrief(page.value.uri).then((res) => { - console.log(res); - // location.href = "/" + page.value.parent; + location.href = "/" + page.value.parent; }); } diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue index 090e5c8..51bf62a 100644 --- a/src/views/Notifications.vue +++ b/src/views/Notifications.vue @@ -38,64 +38,11 @@ v-for="notification in sortedNotifications" :key="notification.id" > -
-
-

- Nouveau - {{ - notification.type === "comment" ? "commentaire" : "contenu" - }} - {{ - notification.location.project.title - }} - -

-
-

- {{ notification.text }} -

-
+ - @@ -108,7 +55,9 @@ import { useUserStore } from "../stores/user"; import { ref, computed } from "vue"; import { storeToRefs } from "pinia"; import { useApiStore } from "../stores/api"; -import { useRouter } from "vue-router"; +import Comment from "../components/notifications/Comment.vue"; +import Reply from "../components/notifications/Reply.vue"; +import Content from "../components/notifications/Content.vue"; dayjs.locale("fr"); @@ -135,7 +84,11 @@ const tabs = computed(() => { ]; }); -const router = useRouter(); +const notificationComponents = { + comment: Comment, + "comment-reply": Reply, + content: Content, +}; const sortedNotifications = computed(() => { return [...notifications.value].sort((a, b) => { @@ -147,22 +100,6 @@ function changeTab(newValue) { currentTab.value = newValue; } -function formatDate(notification) { - const notificationDigitalDate = parseInt( - dayjs(notification.date).format("YYYYMMDD") - ); - const todayDigitalDate = parseInt(dayjs().format("YYYYMMDD")); - const isToday = notificationDigitalDate === todayDigitalDate; - - if (isToday) { - return dayjs(notification.date).format("HH:mm"); - } else if (todayDigitalDate === notificationDigitalDate + 1) { - return "hier"; - } else { - return dayjs(notification.date).format("DD MMM YY"); - } -} - function readAll() { try { api.readAllNotifications(); @@ -171,24 +108,6 @@ function readAll() { console.log("Could not read all notifications : ", error); } } - -function read(notification) { - if (!notification.id) { - console.error("Couldn't change notification status because it has no id."); - } else if (!notification.isRead) { - api - .readNotification(notification.id) - .then((res) => { - router.push(toPath(notification.location.href)); - }) - .catch((err) => console.error("Notification could not be read.", err)); - } - router.push(toPath(notification.location.href)); -} - -function toPath(string) { - return string.replace(window.location.origin, ""); -} + + +