Merge pull request #48 from ICEI-PUC-Minas-PPLCC-TI/develop

Adicionando quebra de linha nos conteúdos (posts e projetos)
ICEI-PUC-Minas-PPLCC-TI · Dec 2, 2023 · 9943a8a · 9943a8a
2 parents 377738e + c0ecd86
commit 9943a8a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/src/forum/assets/js/index.js b/src/forum/assets/js/index.js
@@ -44,7 +44,9 @@ async function showPosts() {
   try {
     await loadPosts();
 
-    const textoHTML = postsList.map(generateHTML).join('');
+    orderPostsList = orderList();
+
+    const textoHTML = orderPostsList.map(generateHTML).join('');
 
     document.querySelector("#posts").innerHTML = textoHTML;
 
@@ -186,20 +188,18 @@ async function deletePost() {
 
 
 // ORDER POSTS
-document.querySelector('.order').addEventListener('input', order, false);
+document.querySelector('.order').addEventListener('input', showPosts, false);
 
-function order() {
+function orderList()
+{
   const orderType = document.querySelector('#order').value;
-  console.log(orderType);
 
   const sortFunctions = {
     'date': (a, b) => new Date(b.dataPostagem) - new Date(a.dataPostagem),
     'likes': (a, b) => b.curtidas - a.curtidas
   };
 
   if (sortFunctions[orderType]) {
-    const sortedPosts = postsList.sort(sortFunctions[orderType]);
-    const textoHTML = sortedPosts.map(generateHTML).join('');
-    document.querySelector("#posts").innerHTML = textoHTML;
+    return postsList.sort(sortFunctions[orderType]);
   }
 }
diff --git a/src/forum/assets/js/posts.js b/src/forum/assets/js/posts.js
@@ -42,7 +42,7 @@ async function showPost() {
 		document.querySelector('.autor').innerHTML = post.autor;
 
 
-		document.querySelector('.conteudo').innerHTML = `<p>${post.conteudo}</p>`;
+		document.querySelector('.conteudo').innerHTML = `<p>${post.conteudo.replaceAll('\n', '<br>')}</p>`;
 
 		document.querySelector('.comentarios').innerHTML = `${comentariosHTML}`;
 

diff --git a/src/projetos/assets/css/projetos.css b/src/projetos/assets/css/projetos.css
@@ -50,3 +50,17 @@
 .itens-list article p.hard {
   background-color: var(--light-red);
 }
+
+
+p.categoria {
+  display: inline-block;
+	padding: .3em .6em;
+	background-color: var(--grey);
+	color: var(--white);
+	font-weight: bold;
+	border-radius: .5vmax;
+}
+
+.conteudo {
+  margin: 2em 1em 0;
+}
diff --git a/src/projetos/assets/js/projeto.js b/src/projetos/assets/js/projeto.js
@@ -17,7 +17,7 @@ async function showProject() {
 		document.querySelector('.autor').innerHTML = project.autor;
 
 
-		document.querySelector('.conteudo').innerHTML = `<p>${project.conteudo}</p>`;
+		document.querySelector('.conteudo').innerHTML = `<p>${project.conteudo.replaceAll('\n', '<br>')}</p>`;
   } catch (error) {
     console.error('Falha ao carregar e exibir os posts:', error);
   }