Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

corrigido rota boletin para boletins, e ajuste no width da imagem das capas dos boletins #208

Merged
merged 10 commits into from
Sep 9, 2024
Merged

corrigido rota boletin para boletins, e ajuste no width da imagem das capas dos boletins #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f904c81
extract common tasks aliases
zoedsoupe Sep 6, 2024
d14f194
rota boletin para boletins, ajuste no width da imagem das capas dos b…
sahudy Sep 7, 2024
29491a4
tirando node_modules
sahudy Sep 8, 2024
972a1f2
Delete package.json
zoedsoupe Sep 8, 2024
ab482ce
Delete package-lock.json
zoedsoupe Sep 8, 2024
0a1f6d5
Merge branch 'main' into feat/boletins
zoedsoupe Sep 8, 2024
09c31f9
Merge branch 'main' into feat/boletins
zoedsoupe Sep 8, 2024
d526f94
correcoes no estilo dos boletins e errinhos
sahudy Sep 9, 2024
d80cc1e
Merge branch 'feat/boletins' of https://github.com/sahudy/pescarte-pl…
sahudy Sep 9, 2024
5ac647d
Merge branch 'main' into feat/boletins
zoedsoupe Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion assets/css/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ footer {

@import "./agenda.scss";
@import "./contact.scss";
@import "./boletins.scss";

// Com autenticação
@import "./pages/app/researcher/profile.scss";
Expand All @@ -185,4 +186,4 @@ footer {
@import "./pages/app/researcher/pesquisador";

// Páginas de Erros
@import "./errors/404.scss";
@import "./errors/404.scss";
5 changes: 5 additions & 0 deletions assets/css/boletins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.boletim-wrapper {
.links-item {
width: 15.5rem;
}
}
2 changes: 1 addition & 1 deletion ...rte_web/controllers/boletin_controller.ex → ...te_web/controllers/boletins_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule PescarteWeb.BoletinController do
defmodule PescarteWeb.BoletinsController do
use PescarteWeb, :controller

def show(conn, _params) do
Expand Down
2 changes: 1 addition & 1 deletion lib/pescarte_web/router.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ defmodule PescarteWeb.Router do
end

scope "/publicacoes" do
get "/boletin", BoletinController, :show
get "/boletins", BoletinsController, :show
end

scope "/contato" do
Expand Down
5 changes: 0 additions & 5 deletions lib/pescarte_web/templates/boletin_html.ex
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions lib/pescarte_web/templates/boletins_html.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
defmodule PescarteWeb.BoletinsHTML do
use PescarteWeb, :html

embed_templates("boletins_html/*")
end
6 changes: 3 additions & 3 deletions ...web/templates/boletin_html/show.html.heex → ...eb/templates/boletins_html/show.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<main class="journal-wrapper">
<main class="boletim-wrapper">
<div class="publications">
zoedsoupe marked this conversation as resolved.
Show resolved Hide resolved
<div class="banner-container">
<img src={~p"/images/landing/bg_fill.png"} />
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/pescarte_web/templates/journal_html/show.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading