Merge branch 'main' into feat/publi_artigos

peapescarte · Sep 9, 2024 · f7ce957 · f7ce957
2 parents 08a5753 + 5250837
commit f7ce957
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,5 +44,5 @@ jobs:
       - name: Docker Login
         run: echo "$DOCKERHUB_TOKEN" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin
       - name: Run build
-        run: earthly -P --ci --push --build-arg MIX_ENV=prod --build-arg GITHUB_REPO=${{ github.repository }} +docker
+        run: earthly -P --ci --push --build-arg GITHUB_REPO=${{ github.repository }} +docker
 
diff --git a/Earthfile b/Earthfile
@@ -19,7 +19,7 @@ deps:
   SAVE ARTIFACT /src/deps AS LOCAL deps
 
 ci:
-  FROM +deps
+  FROM +deps --MIX_ENV=dev
   COPY .credo.exs .
   COPY .formatter.exs .
   RUN mix clean
@@ -28,7 +28,7 @@ ci:
   RUN mix credo --strict
 
 test:
-  FROM +deps
+  FROM +deps --MIX_ENV=test
   RUN apk add postgresql-client
   COPY --dir config ./
   RUN MIX_ENV=test mix deps.compile
@@ -48,7 +48,7 @@ docker-prod:
   SAVE IMAGE --push ghcr.io/$GITHUB_REPO:prod
 
 docker-dev:
-  FROM +deps
+  FROM +deps --MIX_ENV=dev
   RUN apk update --no-cache
   RUN apk add --no-cache inotify-tools nodejs npm
   ENV MIX_ENV=dev

diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -177,6 +177,7 @@ footer {
 @import "./agenda.scss";
 @import "./contact.scss";
 @import "./article.scss";
+@import "./boletins.scss";
 
 // Com autenticação
 @import "./pages/app/researcher/profile.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/lib/pescarte_web/controllers/boletins_controller.ex b/lib/pescarte_web/controllers/boletins_controller.ex
@@ -0,0 +1,8 @@
+defmodule PescarteWeb.BoletinsController do
+  use PescarteWeb, :controller
+
+  def show(conn, _params) do
+    current_path = conn.request_path
+    render(conn, :show, current_path: current_path, error_message: nil)
+  end
+end
diff --git a/...rte_web/controllers/boletin_controller.ex → ...arte_web/controllers/livros_controller.ex b/...rte_web/controllers/boletin_controller.ex → ...arte_web/controllers/livros_controller.ex
@@ -1,4 +1,4 @@
-defmodule PescarteWeb.BoletinController do
+defmodule PescarteWeb.LivrosController 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,9 @@ defmodule PescarteWeb.Router do
     end
 
     scope "/publicacoes" do
-      get "/boletin", BoletinController, :show
       get "/artigos", ArticleController, :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/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" />
@@ -18,10 +18,7 @@
         </div>
         <div class="links-item">
           <img src="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/boletins/boletim%201/Boletim%20Pescarte%2001.pdf?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2JvbGV0aW5zL2JvbGV0aW0gMS9Cb2xldGltIFBlc2NhcnRlIDAxLnBkZiIsImlhdCI6MTcyNDQyMjE5MywiZXhwIjoyMDM5NzgyMTkzfQ._2dqfBlcNb_fkiK8UyMr6Rx54SdevkaOlEUMdFL9oeY&t=2024-08-23T14%3A09%3A53.831Z" />
-          <DesignSystem.link
-            href="https://drive.google.com/file/d/1yQ_MaeVhiSMeP1-GR9DR2D4PeqAUaJfV/view?usp=drive_link"
-            class="text-sm font-semibold"
-          >
+          <DesignSystem.link href={~p"/publicacoes/livros"} class="text-sm font-semibold">
             <.text size="h3" color="text-white-100">Livros</.text>
             <.button style="primary">
               Saiba mais <Lucideicons.arrow_right class="text-white-100" />

diff --git a/lib/pescarte_web/templates/livros_html.ex b/lib/pescarte_web/templates/livros_html.ex
@@ -0,0 +1,5 @@
+defmodule PescarteWeb.LivrosHTML do
+  use PescarteWeb, :html
+
+  embed_templates("livros_html/*")
+end
diff --git a/lib/pescarte_web/templates/livros_html/show.html.heex b/lib/pescarte_web/templates/livros_html/show.html.heex
@@ -0,0 +1,55 @@
+<main class="book-wrapper">
+  <div class="publications">
+    <div class="banner-container">
+      <img src={~p"/images/landing/bg_fill.png"} />
+      <h1 class="centered-text">Livros do PEA Pescarte</h1>
+    </div>
+    <section class="publications-text">
+      <!-- criando os cards dos livros -->
+      <div class="links-landing">
+        <div class="links-item" style="width: 16rem">
+          <img src="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/livros/livro1_capa.png?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2xpdnJvcy9saXZybzFfY2FwYS5wbmciLCJpYXQiOjE3MjUzODQ1NDIsImV4cCI6MjA0MDc0NDU0Mn0.Kq788YF3Rsd0TwBCZ8kxDZEV3eTZ8IQ7BlGmUgJ1rZk&t=2024-09-03T17%3A29%3A02.533Z" />
+          <DesignSystem.link
+            href="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/livros/Livro-1-eBook.pdf?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2xpdnJvcy9MaXZyby0xLWVCb29rLnBkZiIsImlhdCI6MTcyNTM4NDQ4MSwiZXhwIjoyMDQwNzQ0NDgxfQ.dKC0IaO9-WzjH8FTcLTqst0WsVybS2LHcVomDjsmguU&t=2024-09-03T17%3A28%3A02.492Z"
+            class="text-sm font-semibold"
+            target-blank
+          >
+            <.text size="h3" color="text-white-100">Livro Pescarte 1</.text>
+          </DesignSystem.link>
+        </div>
+        <div class="links-item" style="width: 16rem">
+          <img src="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/livros/livro2_capa.png?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2xpdnJvcy9saXZybzJfY2FwYS5wbmciLCJpYXQiOjE3MjUzODQ1NjEsImV4cCI6MjA0MDc0NDU2MX0.U6ClO169WPPLv9ZrrrwdUNTP6dGSW0IL5KQdbwzkfgM&t=2024-09-03T17%3A29%3A21.965Z" />
+          <DesignSystem.link
+            href="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/boletins/boletim%202/Boletim%20Pescarte%2002.pdf?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2JvbGV0aW5zL2JvbGV0aW0gMi9Cb2xldGltIFBlc2NhcnRlIDAyLnBkZiIsImlhdCI6MTcyNDQyMjM5NywiZXhwIjoyMDM5NzgyMzk3fQ.9D1fAdjMSm5eSf707SP8DjRCDi_nFmtoKzctpAyKZd8&t=2024-08-23T14%3A13%3A17.771Z"
+            class="text-sm font-semibold"
+            target-blank
+          >
+            <.text size="h3" color="text-white-100">Livro Pescarte 2</.text>
+          </DesignSystem.link>
+        </div>
+        <div class="links-item" style="width: 16rem">
+          <img src="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/livros/livro3_capa.png?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2xpdnJvcy9saXZybzNfY2FwYS5wbmciLCJpYXQiOjE3MjUzODQ1NzksImV4cCI6MjA0MDc0NDU3OX0.KQq3jvtCbA3FebhWspy1I9OG6khjLeGLNdadvSf7udM&t=2024-09-03T17%3A29%3A39.188Z" />
+          <DesignSystem.link
+            href="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/livros/Livro-3-eBook.pdf?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2xpdnJvcy9MaXZyby0zLWVCb29rLnBkZiIsImlhdCI6MTcyNTM4NDUyNCwiZXhwIjoyMDQwNzQ0NTI0fQ.K-y0xz8VHAqRSCdr62RKpGFYdeu5e5RSVbYJDhN20jE&t=2024-09-03T17%3A28%3A44.852Z"
+            class="text-sm font-semibold"
+            target-blank
+          >
+            <.text size="h3" color="text-white-100">Livro Pescarte 3</.text>
+          </DesignSystem.link>
+        </div>
+        <div class="links-item" style="width: 16rem">
+          <img src="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/livros/livro4_capa.png?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2xpdnJvcy9saXZybzRfY2FwYS5wbmciLCJpYXQiOjE3MjU3NTg2NjgsImV4cCI6MjA0MTExODY2OH0.a1IBvYpIUKWUjnyhPWRoaAyotcSHnHPn8XqHFqgRDjY&t=2024-09-08T01%3A24%3A28.346Z" />
+          <DesignSystem.link
+            href="https://rrosgcmviafnxjshljoq.supabase.co/storage/v1/object/sign/static/images/publicacoes/livros/Livro-4-eBook.pdf?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cmwiOiJzdGF0aWMvaW1hZ2VzL3B1YmxpY2Fjb2VzL2xpdnJvcy9MaXZyby00LWVCb29rLnBkZiIsImlhdCI6MTcyNTc2NDIzNCwiZXhwIjoyMDQxMTI0MjM0fQ.TNyd3J5ClL5NI9iUARwTllK_PevXU1GfJt_X2tD42iY&t=2024-09-08T02%3A57%3A14.612Z"
+            class="text-sm font-semibold"
+            target-blank
+          >
+            <.text size="h3" color="text-white-100">Livro Pescarte 4</.text>
+          </DesignSystem.link>
+        </div>
+      </div>
+    </section>
+  </div>
+  <!-- ONDE NOS ENCONTRAR -->
+  <PescarteWeb.DesignSystem.GetInTouch.render />
+</main>