Merge branch 'main' into feat/livros

peapescarte · Sep 9, 2024 · 0d27e75 · 0d27e75
2 parents a645c26 + 6f92986
commit 0d27e75
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -176,6 +176,7 @@ footer {
 
 @import "./agenda.scss";
 @import "./contact.scss";
+@import "./boletins.scss";
 
 // Com autenticação
 @import "./pages/app/researcher/profile.scss";
@@ -185,4 +186,4 @@ footer {
 @import "./pages/app/researcher/pesquisador";
 
 // Páginas de Erros
-@import "./errors/404.scss";
+@import "./errors/404.scss";
diff --git a/assets/css/boletins.scss b/assets/css/boletins.scss
@@ -0,0 +1,5 @@
+.boletim-wrapper {
+  .links-item {
+    width: 15.5rem;
+  }
+}
diff --git a/...rte_web/controllers/boletin_controller.ex → ...te_web/controllers/boletins_controller.ex b/...rte_web/controllers/boletin_controller.ex → ...te_web/controllers/boletins_controller.ex
@@ -1,4 +1,4 @@
-defmodule PescarteWeb.BoletinController do
+defmodule PescarteWeb.BoletinsController do
   use PescarteWeb, :controller
 
   def show(conn, _params) do

diff --git a/lib/pescarte_web/router.ex b/lib/pescarte_web/router.ex
@@ -57,8 +57,8 @@ defmodule PescarteWeb.Router do
     end
 
     scope "/publicacoes" do
-      get "/boletin", BoletinController, :show
       get "/livros", LivrosController, :show
+      get "/boletins", BoletinsController, :show
     end
 
     scope "/contato" do

diff --git a/lib/pescarte_web/templates/boletin_html.ex b/lib/pescarte_web/templates/boletin_html.ex
diff --git a/lib/pescarte_web/templates/boletins_html.ex b/lib/pescarte_web/templates/boletins_html.ex
@@ -0,0 +1,5 @@
+defmodule PescarteWeb.BoletinsHTML do
+  use PescarteWeb, :html
+
+  embed_templates("boletins_html/*")
+end
diff --git a/...web/templates/boletin_html/show.html.heex → ...eb/templates/boletins_html/show.html.heex b/...web/templates/boletin_html/show.html.heex → ...eb/templates/boletins_html/show.html.heex
@@ -1,4 +1,4 @@
-<main class="journal-wrapper">
+<main class="boletim-wrapper">
   <div class="publications">
     <div class="banner-container">
       <img src={~p"/images/landing/bg_fill.png"} />
@@ -99,8 +99,8 @@
           </DesignSystem.link>
         </div>
         <div class="links-item">
-          <img src={~p"/images/noticias/TECNOLOGIA_SOCIAL/capa_noti1.JPG"} />
-          <DesignSystem.link href={~p"/publicacoes/boletin"} class="text-sm font-semibold">
+          <img src="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/noticias/tecnologia social/capa.JPG?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL25vdGljaWFzL3RlY25vbG9naWEgc29jaWFsL2NhcGEuSlBHIiwiaWF0IjoxNzI0NDE4NDQzLCJleHAiOjIwMzk3Nzg0NDN9.i6DpnsFFdRpOuEy5Kqyu0h_S7ziJt1p1qtmD94YkB6k&t=2024-08-23T13%3A07%3A23.299Z" />
+          <DesignSystem.link href={~p"/publicacoes/boletins"} class="text-sm font-semibold">
             <.text size="h3" color="text-white-100">Boletim Pescarte 8</.text>
             <.text size="base" color="text-white-100">
               <b>Edição 8</b>: Julho a Dezembro de 2024

diff --git a/lib/pescarte_web/templates/equipes_html/show.html.heex b/lib/pescarte_web/templates/equipes_html/show.html.heex
@@ -533,10 +533,7 @@
               <div class="membros">
                 <div :for={colaborador <- linha_pesquisa["colaboradores"]} class="membro-equipe">
                   <div class="membro-circle">
-                    <img
-                      :if={colaborador["imagem"] != ""}
-                      src={colaborador["imagem"]}
-                    />
+                    <img :if={colaborador["imagem"] != ""} src={colaborador["imagem"]} />
                   </div>
                   <div class="membro-description">
                     <div class="membro-name">

diff --git a/lib/pescarte_web/templates/journal_html/show.html.heex b/lib/pescarte_web/templates/journal_html/show.html.heex
@@ -9,7 +9,7 @@
       <div class="links-landing">
         <div class="links-item">
           <img src={~p"/images/journal/boletin/DSC05126.JPG"} />
-          <DesignSystem.link href={~p"/publicacoes/boletin"} class="text-sm font-semibold">
+          <DesignSystem.link href={~p"/publicacoes/boletins"} class="text-sm font-semibold">
             <.text size="h3" color="text-white-100">Boletins Pescarte</.text>
             <.button style="primary">
               Saiba mais <Lucideicons.arrow_right class="text-white-100" />