From 66f266c90b5fe02a469f3a1a73909fc27428d152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Landemaine?= <91159174+TheoLandemaine@users.noreply.github.com> Date: Tue, 13 Jun 2023 23:58:44 +0200 Subject: [PATCH 1/2] add capitalize to title && change design validation tuto && change justify-content for likes/dislikes --- front-end/src/components/blog/CardArticle.vue | 92 +++++++++---------- .../src/components/blog/MarkdownViewer.vue | 20 ++-- front-end/src/store/modules/article.store.ts | 8 +- 3 files changed, 62 insertions(+), 58 deletions(-) diff --git a/front-end/src/components/blog/CardArticle.vue b/front-end/src/components/blog/CardArticle.vue index 9980bd5f3..90b0274f0 100644 --- a/front-end/src/components/blog/CardArticle.vue +++ b/front-end/src/components/blog/CardArticle.vue @@ -1,8 +1,8 @@ diff --git a/front-end/src/components/blog/MarkdownViewer.vue b/front-end/src/components/blog/MarkdownViewer.vue index ebff75154..576c52839 100644 --- a/front-end/src/components/blog/MarkdownViewer.vue +++ b/front-end/src/components/blog/MarkdownViewer.vue @@ -89,8 +89,8 @@ class="mt-12 block max-w-xl p-6 bg-white border border-gray-200 rounded-lg shadow dark:bg-gray-800 dark:border-gray-700" >

{{ description }}

-

Publié le : {{ formatDate(date)}}

-

Par : {{ user }}

+

Publié le : {{ formatDate(date) }}

+

Par : {{ user }}

@@ -336,13 +336,15 @@ if (!props.markdown) { date.value = oneItems.value.date; title.value = oneItems.value.title; description.value = oneItems.value.descriptions; - let tempUser = await materialStore.getUserById(oneItems.value.owner) + let tempUser = await materialStore.getUserById(oneItems.value.owner); - // format for captital letters - user.value = - tempUser.profile.firstName.charAt(0).toUpperCase() + tempUser.profile.firstName.slice(1) - + ' ' - + tempUser.profile.lastName.charAt(0).toUpperCase() + tempUser.profile.lastName.slice(1) + // format for captital letters + user.value = + tempUser.profile.firstName.charAt(0).toUpperCase() + + tempUser.profile.firstName.slice(1) + + ' ' + + tempUser.profile.lastName.charAt(0).toUpperCase() + + tempUser.profile.lastName.slice(1); renderMarkdown(); }); @@ -363,7 +365,7 @@ const step = ref(0); const title = ref('Your title here'); const date = ref('The date it was uploaded'); const description = ref('Your description here'); -const user = ref('Vous') +const user = ref('Vous'); // visuals const open = ref(false); diff --git a/front-end/src/store/modules/article.store.ts b/front-end/src/store/modules/article.store.ts index b44d1716c..61f9e4351 100644 --- a/front-end/src/store/modules/article.store.ts +++ b/front-end/src/store/modules/article.store.ts @@ -92,9 +92,11 @@ export const useArticleStore = defineStore('article', { //update article in the database updateArticle: withErrorHandler(async function (id: string, article: Article) { - const response = await http.put(`/articles/update/${id}`, article); - const oneItems = response.data; - this.oneItems = oneItems; + await http.put(`/articles/update/${id}`, article); + + const index = this.items.findIndex((el) => el._id === id); + this.items[index] = article; + return true; }), From b847dba6c822cb4fa7d1ac700aa5762d466b318c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Landemaine?= <91159174+TheoLandemaine@users.noreply.github.com> Date: Thu, 15 Jun 2023 13:29:13 +0200 Subject: [PATCH 2/2] Change owner type --- back-end/src/base/articles/articles.service.ts | 2 +- front-end/src/components/blog/AddArticles.vue | 10 ++++++++-- front-end/src/components/blog/CardArticle.vue | 4 ++-- front-end/src/components/blog/EditArticle.vue | 8 +++++++- front-end/src/components/blog/MarkdownViewer.vue | 2 +- front-end/src/components/blog/ShowArticle.vue | 2 +- front-end/src/store/interfaces/article.interface.ts | 8 +++++++- front-end/src/store/modules/article.store.ts | 12 ++++++++++-- 8 files changed, 37 insertions(+), 11 deletions(-) diff --git a/back-end/src/base/articles/articles.service.ts b/back-end/src/base/articles/articles.service.ts index f398c76c3..000343a66 100644 --- a/back-end/src/base/articles/articles.service.ts +++ b/back-end/src/base/articles/articles.service.ts @@ -22,7 +22,7 @@ export class ArticlesService { // add new object id to id queryArticle._id = new ObjectId(); - queryArticle.owner = new ObjectId(queryArticle.owner); + queryArticle.owner._id = new ObjectId(queryArticle.owner._id); queryArticle.date = new Date(queryArticle.date); queryArticle.updatedAt = new Date(); diff --git a/front-end/src/components/blog/AddArticles.vue b/front-end/src/components/blog/AddArticles.vue index 71249179f..dde831913 100644 --- a/front-end/src/components/blog/AddArticles.vue +++ b/front-end/src/components/blog/AddArticles.vue @@ -266,10 +266,16 @@ const addArticle = async () => { return; } + const owner = { + _id: authStore?.user?._id, + firstName: authStore?.user?.profile?.firstName, + lastName: authStore?.user?.profile?.lastName, + }; + // Groups all data for sending to the API if (type.value == 'Infos') { let data = { - owner: authStore.user._id, + owner: owner, title: title.value, descriptions: description.value, content: content.value, @@ -286,7 +292,7 @@ const addArticle = async () => { await articleStore.addArticle(data); } else { let data = { - owner: authStore.user._id, + owner: owner, title: title.value, descriptions: description.value, content: content.value, diff --git a/front-end/src/components/blog/CardArticle.vue b/front-end/src/components/blog/CardArticle.vue index 90b0274f0..1cc1821b0 100644 --- a/front-end/src/components/blog/CardArticle.vue +++ b/front-end/src/components/blog/CardArticle.vue @@ -10,7 +10,7 @@ " alt="" /> -
+
-
+