From 60836459c826140322c7bd234c1ffdba29d7006d Mon Sep 17 00:00:00 2001 From: Annabell Date: Mon, 9 Sep 2024 17:38:53 -0300 Subject: [PATCH 1/9] Feat/publi artigos (#211) * insercao da rota da agenda * troquei a ordem na navbar, inseri censo e redirecionei botao da landing * extract common tasks aliases * criando a pagina dos artigos em publicacoes * criando pagina de artigos publicados em publicacoes * terceira atualizacao da pagina de artigos em publicacoes * criando a responsividade na tela dos artigos: tabela-responsiva e arquivo article.scss * format --------- Co-authored-by: Zoey de Souza Pessanha --- assets/css/app.scss | 1 + assets/css/article.scss | 46 +++++ assets/css/get_in_touch.scss | 2 +- .../templates/article_html/show.html.heex | 163 +++++++++++++++++- 4 files changed, 205 insertions(+), 7 deletions(-) create mode 100644 assets/css/article.scss diff --git a/assets/css/app.scss b/assets/css/app.scss index a46181bf..1cf71721 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -176,6 +176,7 @@ footer { @import "./agenda.scss"; @import "./contact.scss"; +@import "./article.scss"; @import "./boletins.scss"; // Com autenticação diff --git a/assets/css/article.scss b/assets/css/article.scss new file mode 100644 index 00000000..c25b9c59 --- /dev/null +++ b/assets/css/article.scss @@ -0,0 +1,46 @@ +.article-wrapper { + max-width: 100vw !important; + div { + max-width: 100vw; + } +} +.lighter-banner{ + display: flex; + flex-direction: column; + text-align: center; + justify-content: center; + gap: 20px; + height: 260px; + margin-bottom: 20px; + background: #0064c8b0; + background-blend-mode: multiply; + + .banner-img { + z-index: -1; + position: absolute; + width: 100vw; + height: 260px; +} +} +.publications { + .publications-text { + display: flex; + flex-direction: column; + align-items: center; + } +} + +/* Estilo padrão para telas grandes */ +.tabela-responsiva { + width: 85vw; + margin: 0 auto; +} + +/* Estilo para telas pequenas (móveis) */ +@media (max-width: 768px) { + .tabela-responsiva { + width: 95vw; + display: flex; + flex-wrap: wrap; + } +} diff --git a/assets/css/get_in_touch.scss b/assets/css/get_in_touch.scss index 3d35f0fc..db6862b7 100644 --- a/assets/css/get_in_touch.scss +++ b/assets/css/get_in_touch.scss @@ -73,4 +73,4 @@ } } } -} \ No newline at end of file +} diff --git a/lib/pescarte_web/templates/article_html/show.html.heex b/lib/pescarte_web/templates/article_html/show.html.heex index f52161e8..e24decb0 100644 --- a/lib/pescarte_web/templates/article_html/show.html.heex +++ b/lib/pescarte_web/templates/article_html/show.html.heex @@ -1,11 +1,16 @@ -
+
+
+ + <.text size="h2" color="text-white-100"> + Artigos Publicados + +
-
<.text size="h3" color="text-blue-100">Categoria: Artigos em Revistas +
+ +
@@ -58,6 +63,41 @@ + + + + + + + + + + + + + + + + @@ -137,8 +177,13 @@ -->
Título
2024 + + Leia aqui + +
2024 + + Leia aqui + +
+ UM OLHAR ESTATÍSTICO SOBRE A PESCA: A EXPERIÊNCIA DE + APLICAÇÃO DE CENSO EM COMUNIDADES PESQUEIRAS DO LITORAL FLUMINENSE". + 2022 + + Leia aqui + +
Atafona: records of a world in ruins 2023
- +
+
+
+
<.text size="h3" color="text-blue-100">Categoria: Capítulo de Livros +
+
@@ -189,7 +234,113 @@
Título
+
+
+
+
+ <.text size="h3" color="text-blue-100">Categoria: Relatórios Técnicos
+
+ + + + + + + + + + + +
TítuloAnoLink
+ Capital Social e Associativismo dos Pescadores Artesanais de Municípios Limítrofes à Bacia de Campos: análise a partir dos dados do PEA Pescarte + 2019 + + Leia aqui + +
+
+
+
+
+ <.text size="h3" color="text-blue-100">Categoria: Tese Doutoral +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
TítuloAnoLink
+ SEGURIDADE SOCIAL: o acesso aos direitos sociais pelas mulheres na atividade pesqueira + 2023 + + Leia aqui + +
+ Memórias e vivências na pesca em Gargaú: + tecendo circuitos laborais e ecossociais entre pescadores e pescadoras artesanais. + 2023 + + Leia aqui + +
+ ESCOLA E ESCOLARIZAÇÃO DE PESCADORES E PESCADORAS EM GARGAÚ/SÃO + FRANCISCO DE ITABAPOANA/RJ: NAVEGANDO POR MARES E MEMÓRIAS + 2023 + + Leia aqui + +
+ A Emancipação, Trabalho e Solidariedade como elementos centrais da Educação + Ambiental Crítica com Pescadoras Artesanais + 2021 + + Leia aqui + +
+
From a74bbf168d9205eb0284d72e825fc93ea47d717e Mon Sep 17 00:00:00 2001 From: Zoey de Souza Pessanha Date: Mon, 9 Sep 2024 18:15:42 -0300 Subject: [PATCH 2/9] fix: simplify CI --- .github/workflows/ci.yml | 188 ++++++++++++++++++++++++++++++++++----- Dockerfile | 4 +- Earthfile | 69 -------------- docker-compose.ci.yml | 13 --- 4 files changed, 168 insertions(+), 106 deletions(-) delete mode 100644 Earthfile delete mode 100644 docker-compose.ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d4da889..ade40e3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,7 @@ name: ci env: - EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }} - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - FORCE_COLOR: 1 + REGISTRY: ghcr.io + IMAGE_NAME: peapescarte/pescarte-plataforma on: push: @@ -14,35 +12,183 @@ on: jobs: lint: runs-on: ubuntu-latest + env: + MIX_ENV: dev + strategy: + matrix: + otp: [26.2.5] + elixir: [1.16.2] steps: - - uses: earthly/actions-setup@v1 + - uses: actions/checkout@v4 + + - uses: erlef/setup-beam@v1 with: - version: v0.8.14 - - uses: actions/checkout@v2 - - name: Run build - run: earthly --ci --build-arg MIX_ENV=dev +ci + otp-version: ${{ matrix.otp }} + elixir-version: ${{ matrix.elixir }} + + - name: Cache Elixir deps + uses: actions/cache@v1 + id: deps-cache + with: + path: deps + key: ${{ runner.os }}-mix-${{ env.MIX_ENV }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} + + - name: Cache Elixir _build + uses: actions/cache@v1 + id: build-cache + with: + path: _build + key: ${{ runner.os }}-build-${{ env.MIX_ENV }}-${{ matrix.otp }}-${{ matrix.elixir }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} + + - name: Install deps + if: steps.deps-cache.outputs.cache-hit != 'true' + run: | + mix local.rebar --force + mix local.hex --force + mix deps.get --only ${{ env.MIX_ENV }} + + - name: Compile deps + if: steps.build-cache.outputs.cache-hit != 'true' + run: mix deps.compile --warnings-as-errors + + - name: Run compiler checks + run: mix clean && mix compile --force --warning-as-errors + + - name: Run formatter check + run: mix format --check-formatted + + - name: Run static analysis + run: mix credo --strict test: runs-on: ubuntu-latest + env: + SUPABASE_KEY: "super-ci-key" + SUPABASE_URL: "http://localhost:123" + DATABASE_USER: "peapescarte" + DATABASE_PASS: "peapescarte" + MIX_ENV: test + strategy: + matrix: + otp: [26.2.5] + elixir: [1.16.2] + services: + postgres: + image: postgres:15 + ports: + - 5432:5432 + env: + POSTGRES_USER: peapescarte + POSTGRES_PASSWORD: peapescarte + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + steps: + - uses: actions/checkout@v4 + + - uses: erlef/setup-beam@v1 + with: + otp-version: ${{ matrix.otp }} + elixir-version: ${{ matrix.elixir }} + + - name: Cache Elixir deps + uses: actions/cache@v1 + id: deps-cache + with: + path: deps + key: ${{ runner.os }}-mix-${{ env.MIX_ENV }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} + + - name: Cache Elixir _build + uses: actions/cache@v1 + id: build-cache + with: + path: _build + key: ${{ runner.os }}-build-${{ env.MIX_ENV }}-${{ matrix.otp }}-${{ matrix.elixir }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} + + - name: Install deps + if: steps.deps-cache.outputs.cache-hit != 'true' + run: | + mix local.rebar --force + mix local.hex --force + mix deps.get --only ${{ env.MIX_ENV }} + + - name: Compile deps + if: steps.build-cache.outputs.cache-hit != 'true' + run: mix deps.compile --warnings-as-errors + + - name: Run tests + run: mix test + + build-dev: + runs-on: ubuntu-latest + needs: test + if: success() && github.ref == 'refs/heads/main' + permissions: + contents: read + packages: write + attestations: write + id-token: write steps: - - uses: earthly/actions-setup@v1 + - uses: actions/checkout@v4 + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ secrets.GHCR_USERNAME }} + password: ${{ secrets.GHCR_TOKEN }} + + - name: Build and push Docker image (DEV) + id: push + uses: docker/build-push-action@v6 + with: + context: . + from: ./Dockerfile + push: true + tags: ${{ env.IMAGE_NAME }}:dev + build-args: MIX_ENV="dev" + target: builder + + - name: Generate artifact attestation + uses: actions/attest-build-provenance@v1 with: - version: v0.8.14 - - uses: actions/checkout@v2 - - name: Run build - run: earthly -P --ci --build-arg MIX_ENV=test +test + subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}} + subject-digest: ${{ steps.push.outputs.digest }} + push-to-registry: true build-prod: runs-on: ubuntu-latest needs: test if: success() && github.ref == 'refs/heads/main' + permissions: + contents: read + packages: write + attestations: write + id-token: write steps: - - uses: earthly/actions-setup@v1 + - uses: actions/checkout@v4 + + - name: Log in to the Container registry + uses: docker/login-action@v3 with: - version: v0.8.14 - - uses: actions/checkout@v2 - - name: Docker Login - run: echo "$DOCKERHUB_TOKEN" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin - - name: Run build - run: earthly -P --ci --push --build-arg GITHUB_REPO=${{ github.repository }} +docker + registry: ${{ env.REGISTRY }} + username: ${{ secrets.GHCR_USERNAME }} + password: ${{ secrets.GHCR_TOKEN }} + - name: Build and push Docker image (PROD) + id: push + uses: docker/build-push-action@v6 + with: + context: . + from: ./Dockerfile + push: true + tags: ${{ env.IMAGE_NAME }}:prod + + - name: Generate artifact attestation + uses: actions/attest-build-provenance@v1 + with: + subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}} + subject-digest: ${{ steps.push.outputs.digest }} + push-to-registry: true diff --git a/Dockerfile b/Dockerfile index d575fbc6..e3e273f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ ARG ELIXIR_VERSION=1.16.0 ARG OTP_VERSION=26.1.2 ARG ALPINE_VERSION=3.18.4 +ARG MIX_ENV=prod ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-alpine-${ALPINE_VERSION}" ARG RUNNER_IMAGE="alpine:${ALPINE_VERSION}" @@ -17,9 +18,6 @@ RUN apk add --no-cache build-base gcc curl git wget nodejs npm RUN mix local.hex --force && \ mix local.rebar --force -# set build ENV -ENV MIX_ENV="prod" - # install mix dependencies COPY mix.exs mix.lock ./ RUN mix deps.get --only $MIX_ENV diff --git a/Earthfile b/Earthfile deleted file mode 100644 index 2d28c529..00000000 --- a/Earthfile +++ /dev/null @@ -1,69 +0,0 @@ -VERSION 0.7 - -deps: - ARG ELIXIR=1.16.0 - ARG OTP=26.1.2 - ARG ALPINE_VERSION=3.18.4 - ARG MIX_ENV=test - FROM hexpm/elixir:${ELIXIR}-erlang-${OTP}-alpine-${ALPINE_VERSION} - RUN apk update --no-cache - RUN apk add --no-cache build-base gcc git curl - WORKDIR /src - COPY mix.exs mix.lock ./ - COPY --dir config . # check .earthlyignore - RUN mix local.rebar --force - RUN mix local.hex --force - RUN mix deps.get - RUN mix deps.compile - COPY --dir lib . - SAVE ARTIFACT /src/deps AS LOCAL deps - -ci: - FROM +deps --MIX_ENV=dev - COPY .credo.exs . - COPY .formatter.exs . - RUN mix clean - RUN mix compile --warning-as-errors - RUN mix format --check-formatted - RUN mix credo --strict - -test: - FROM +deps --MIX_ENV=test - RUN apk add postgresql-client - COPY --dir config ./ - RUN MIX_ENV=test mix deps.compile - COPY docker-compose.ci.yml ./docker-compose.yml - COPY mix.exs mix.lock ./ - COPY .env-sample ./ - COPY --dir lib priv test ./ - - WITH DOCKER --compose docker-compose.yml - RUN while ! pg_isready --host=localhost --port=5432 --quiet; do sleep 1; done; \ - SUPABASE_KEY="123" SUPABASE_URL="123" DATABASE_USER="peapescarte" DATABASE_PASS="peapescarte" mix test - END - -docker-prod: - FROM DOCKERFILE . - ARG GITHUB_REPO - SAVE IMAGE --push ghcr.io/$GITHUB_REPO:prod - -docker-dev: - FROM +deps --MIX_ENV=dev - RUN apk update --no-cache - RUN apk add --no-cache inotify-tools nodejs npm - ENV MIX_ENV=dev - COPY --dir config ./ - RUN mix deps.compile - COPY --dir assets ./ - COPY --dir priv ./ - RUN mix compile - CMD ["mix", "dev"] - ARG GITHUB_REPO=peapescarte/pescarte-plataforma - SAVE IMAGE --push ghcr.io/$GITHUB_REPO:dev - -docker-dev-arm: - BUILD --platform=linux/arm64/v8 +docker-dev - -docker: - BUILD +docker-dev - BUILD +docker-prod diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml deleted file mode 100644 index 1f43c860..00000000 --- a/docker-compose.ci.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: "3.8" - -services: - database: - image: postgres:14.6 - container_name: plataforma_pescarte_database - environment: - - POSTGRES_USER=peapescarte - - POSTGRES_PASSWORD=peapescarte - ports: - - 5432:5432 - volumes: - - .postgres:/var/lib/postgresql/data From e17ec73f8814156d70d52af25f8a4dfecd2e4c58 Mon Sep 17 00:00:00 2001 From: Zoey de Souza Pessanha Date: Mon, 9 Sep 2024 18:45:23 -0300 Subject: [PATCH 3/9] fix: re-state arg from env in Dockerfile --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3e273f3..37f391be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG MIX_ENV=prod ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-alpine-${ALPINE_VERSION}" ARG RUNNER_IMAGE="alpine:${ALPINE_VERSION}" -FROM ${BUILDER_IMAGE} as builder +FROM ${BUILDER_IMAGE} AS builder # prepare build dir WORKDIR /app @@ -14,6 +14,8 @@ WORKDIR /app RUN apk update --no-cache RUN apk add --no-cache build-base gcc curl git wget nodejs npm +ARG MIX_ENV + # install hex + rebar RUN mix local.hex --force && \ mix local.rebar --force @@ -52,12 +54,14 @@ RUN mix release # start a new build stage so that the final image will only contain # the compiled release and other runtime necessities -FROM ${RUNNER_IMAGE} +FROM ${RUNNER_IMAGE} AS runner RUN apk update --no-cache RUN apk add --no-cache tzdata openssl ncurses wget RUN apk add --no-cache chromium --repository=http://dl-cdn.alpinelinux.org/alpine/v3.18/community +ARG MIX_ENV + ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 @@ -69,7 +73,7 @@ RUN chown nobody /app ENV MIX_ENV="prod" # Only copy the final release from the build stage -COPY --from=builder --chown=nobody:root /app/_build/${MIX_ENV}/rel/pescarte ./ +COPY --from=builder --chown=nobody:root /app/_build/$MIX_ENV/rel/pescarte ./ USER nobody From d8f6ff4a9130d2faf903bf678b0f45d142b69ce8 Mon Sep 17 00:00:00 2001 From: Zoey de Souza Pessanha Date: Mon, 9 Sep 2024 19:17:44 -0300 Subject: [PATCH 4/9] fix: define project env on compile-time --- .github/workflows/ci.yml | 4 +--- lib/pescarte.ex | 4 +++- lib/pescarte/application.ex | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ade40e3a..dce3e47d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,10 +145,9 @@ jobs: uses: docker/build-push-action@v6 with: context: . - from: ./Dockerfile push: true tags: ${{ env.IMAGE_NAME }}:dev - build-args: MIX_ENV="dev" + build-args: MIX_ENV=dev target: builder - name: Generate artifact attestation @@ -182,7 +181,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - from: ./Dockerfile push: true tags: ${{ env.IMAGE_NAME }}:prod diff --git a/lib/pescarte.ex b/lib/pescarte.ex index 9645c217..94128fc5 100644 --- a/lib/pescarte.ex +++ b/lib/pescarte.ex @@ -1,6 +1,8 @@ defmodule Pescarte do + @environment Application.compile_env!(:pescarte, :env) + def env do - Application.get_env(:pescarte, :env) + @environment end def get_static_file_path(folder, file) do diff --git a/lib/pescarte/application.ex b/lib/pescarte/application.ex index a4081c88..8d3b37e2 100644 --- a/lib/pescarte/application.ex +++ b/lib/pescarte/application.ex @@ -33,10 +33,5 @@ defmodule Pescarte.Application do Pescarte.Supabase, {Finch, name: PescarteHTTPClient} ] - |> maybe_append_children(Pescarte.env()) end - - defp maybe_append_children(children, :test), do: children - # defp maybe_append_children(children, _), do: [ChromicPDF | children] - defp maybe_append_children(children, _), do: children end From 46f4e3e81b54038757fc0473937261de86ae26ab Mon Sep 17 00:00:00 2001 From: Zoey de Souza Pessanha Date: Mon, 9 Sep 2024 20:15:25 -0300 Subject: [PATCH 5/9] fix: ditch faker from dev env --- Dockerfile | 6 +++--- lib/mix/tasks/seed.ex | 1 - lib/pescarte/application.ex | 4 +--- lib/seeder/identidades/contato.ex | 20 +++++++++---------- lib/seeder/modulo_pesquisa/campus.ex | 4 ++-- lib/seeder/modulo_pesquisa/linha_pesquisa.ex | 17 ++++++++-------- lib/seeder/modulo_pesquisa/nucleo_pesquisa.ex | 17 ++++++++-------- mix.exs | 8 ++++++-- 8 files changed, 40 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index 37f391be..3ab6d464 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,9 +62,9 @@ RUN apk add --no-cache chromium --repository=http://dl-cdn.alpinelinux.org/alpin ARG MIX_ENV -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 +ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US:en +ENV LC_ALL=en_US.UTF-8 WORKDIR "/app" RUN chown nobody /app diff --git a/lib/mix/tasks/seed.ex b/lib/mix/tasks/seed.ex index f854a48e..fd6fec69 100644 --- a/lib/mix/tasks/seed.ex +++ b/lib/mix/tasks/seed.ex @@ -9,7 +9,6 @@ defmodule Mix.Tasks.Seed do @impl Mix.Task def run(_args) do Mix.Task.run("app.start", ["--preload-modules"]) - Faker.start() :ok = contato_seeds() :ok = usuario_seeds() diff --git a/lib/pescarte/application.ex b/lib/pescarte/application.ex index 8d3b37e2..4b69ea64 100644 --- a/lib/pescarte/application.ex +++ b/lib/pescarte/application.ex @@ -21,9 +21,7 @@ defmodule Pescarte.Application do :ok end - defp children do - if Pescarte.env() == :dev, do: Faker.start() - + def children do [ Pescarte.Database.Supervisor, PescarteWeb.Telemetry, diff --git a/lib/seeder/identidades/contato.ex b/lib/seeder/identidades/contato.ex index 9a3ecbe7..c3430460 100644 --- a/lib/seeder/identidades/contato.ex +++ b/lib/seeder/identidades/contato.ex @@ -7,28 +7,28 @@ defmodule Seeder.Identidades.Contato do [ %Contato{ email_principal: "dev.admin@pescarte.org.br", - endereco: Faker.Address.street_address(true), - celular_principal: Faker.Phone.PtBr.phone() + endereco: "943 Schuppe Row Suite 906", + celular_principal: "(63) 5906-7216" }, %Contato{ email_principal: "dev.user@pescarte.org.br", - endereco: Faker.Address.street_address(true), - celular_principal: Faker.Phone.PtBr.phone() + endereco: "99981 Nicolas Orchard Apt. 060", + celular_principal: "(62) 9 0254-9051" }, %Contato{ email_principal: "dev.user1@pescarte.org.br", - endereco: Faker.Address.street_address(true), - celular_principal: Faker.Phone.PtBr.phone() + endereco: "2 Shanny Shore Apt. 674", + celular_principal: "(71) 3570-5710" }, %Contato{ email_principal: "dev.user2@pescarte.org.br", - endereco: Faker.Address.street_address(true), - celular_principal: Faker.Phone.PtBr.phone() + endereco: "74132 Alessandra Place Apt. 299", + celular_principal: "(86) 9 4994-3367" }, %Contato{ email_principal: "dev.user3@pescarte.org.br", - endereco: Faker.Address.street_address(true), - celular_principal: Faker.Phone.PtBr.phone() + endereco: "6864 Suzanne Overpass Apt. 273", + celular_principal: "(92) 4225-7846" } ] end diff --git a/lib/seeder/modulo_pesquisa/campus.ex b/lib/seeder/modulo_pesquisa/campus.ex index eff10e0c..03dc1b85 100644 --- a/lib/seeder/modulo_pesquisa/campus.ex +++ b/lib/seeder/modulo_pesquisa/campus.ex @@ -9,13 +9,13 @@ defmodule Seeder.ModuloPesquisa.Campus do acronimo: "UENF", nome: "Campos dos Goytacazes", nome_universidade: "Universidade Estadual do Norte Fluminense Darcy Ribeiro", - endereco: Faker.Address.street_address(true) + endereco: "57 Georgette Hill Apt. 898" }, %Campus{ acronimo: "UFSCar", nome: "Sorocaba", nome_universidade: "Universidade Federal de São Carlos", - endereco: Faker.Address.street_address(true) + endereco: "8 Morris Inlet Suite 355" } ] end diff --git a/lib/seeder/modulo_pesquisa/linha_pesquisa.ex b/lib/seeder/modulo_pesquisa/linha_pesquisa.ex index 0433e8ff..176cea96 100644 --- a/lib/seeder/modulo_pesquisa/linha_pesquisa.ex +++ b/lib/seeder/modulo_pesquisa/linha_pesquisa.ex @@ -14,26 +14,27 @@ defmodule Seeder.ModuloPesquisa.LinhaPesquisa do [ %LinhaPesquisa{ numero: 1, - desc: Faker.Lorem.sentence(1..25), - desc_curta: Faker.Lorem.sentence(1..10), + desc: + "Praesentium architecto est fugit modi repudiandae amet architecto dolorem corrupti voluptas consequatur eveniet?", + desc_curta: "Velit qui repellat sunt harum.", nucleo_pesquisa: nucleo_pesquisa_by(letra: "A") }, %LinhaPesquisa{ numero: 2, - desc: Faker.Lorem.sentence(1..25), - desc_curta: Faker.Lorem.sentence(1..10), + desc: "Debitis culpa ex accusamus sequi?", + desc_curta: "Aliquam dolores.", nucleo_pesquisa: nucleo_pesquisa_by(letra: "B") }, %LinhaPesquisa{ numero: 3, - desc: Faker.Lorem.sentence(1..25), - desc_curta: Faker.Lorem.sentence(1..10), + desc: "Aspernatur repudiandae rerum.", + desc_curta: "Natus commodi provident sint et recusandae!", nucleo_pesquisa: nucleo_pesquisa_by(letra: "C") }, %LinhaPesquisa{ numero: 4, - desc: Faker.Lorem.sentence(1..25), - desc_curta: Faker.Lorem.sentence(1..10), + desc: "Voluptatem est rerum sit quia aut autem vero esse odit est quam optio quo dolor?", + desc_curta: "Minus.", nucleo_pesquisa: nucleo_pesquisa_by(letra: "D") } ] diff --git a/lib/seeder/modulo_pesquisa/nucleo_pesquisa.ex b/lib/seeder/modulo_pesquisa/nucleo_pesquisa.ex index a34af06c..88279e4f 100644 --- a/lib/seeder/modulo_pesquisa/nucleo_pesquisa.ex +++ b/lib/seeder/modulo_pesquisa/nucleo_pesquisa.ex @@ -7,23 +7,24 @@ defmodule Seeder.ModuloPesquisa.NucleoPesquisa do def entries do [ %NucleoPesquisa{ - nome: Faker.Lorem.sentence(1..8), - desc: Faker.Lorem.sentence(1..25), + nome: "Voluptatem eaque aliquam error.", + desc: "Provident libero aliquid impedit explicabo voluptatibus ea fugit atque!", letra: "A" }, %NucleoPesquisa{ - nome: Faker.Lorem.sentence(1..8), - desc: Faker.Lorem.sentence(1..25), + nome: "In tempore?", + desc: "Culpa vero est perferendis natus aut.", letra: "B" }, %NucleoPesquisa{ - nome: Faker.Lorem.sentence(1..8), - desc: Faker.Lorem.sentence(1..25), + nome: "Voluptatem nobis molestias.", + desc: "Cumque commodi odio illum distinctio consequatur?", letra: "C" }, %NucleoPesquisa{ - nome: Faker.Lorem.sentence(1..8), - desc: Faker.Lorem.sentence(1..25), + nome: "Sit qui nesciunt sint?", + desc: + "Non veritatis similique exercitationem similique expedita et eos corporis architecto.", letra: "D" } ] diff --git a/mix.exs b/mix.exs index 13c6a53b..7a8b7042 100644 --- a/mix.exs +++ b/mix.exs @@ -22,11 +22,15 @@ defmodule Pescarte.MixProject do ] end + def cli do + [preferred_envs: [seed: :test]] + end + def application do [mod: {Pescarte.Application, []}, extra_applications: [:logger]] end - defp elixirc_paths(e) when e in [:dev, :test], do: ["lib", "test/support"] + defp elixirc_paths(:test), do: ["lib", "test/support"] defp elixirc_paths(_), do: ["lib"] defp deps do @@ -74,7 +78,7 @@ defmodule Pescarte.MixProject do {:phoenix_html_helpers, "~> 1.0"}, {:nimble_csv, "~> 1.1"}, {:sentry, "~> 10.2.0"}, - {:faker, "~> 0.18", only: [:dev, :test]}, + {:faker, "~> 0.18", only: :test}, {:dialyxir, "~> 1.3", only: [:dev], runtime: false}, {:credo, "~> 1.5", only: [:dev, :test], runtime: false}, # {:ex_doc, "> 0.0.0", only: [:dev, :test], runtime: false}, From 1cf8ded035406f3ac9d48043742b8026c99cfef4 Mon Sep 17 00:00:00 2001 From: Zoey de Souza Pessanha Date: Mon, 9 Sep 2024 20:28:33 -0300 Subject: [PATCH 6/9] fix: please DOCKER SAVE ME FROM THIS CRUEL LIFE --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dce3e47d..0111a68f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,7 @@ name: ci env: REGISTRY: ghcr.io IMAGE_NAME: peapescarte/pescarte-plataforma + TAG: ghcr.io/peapescarte/pescarte-plataforma on: push: @@ -146,7 +147,7 @@ jobs: with: context: . push: true - tags: ${{ env.IMAGE_NAME }}:dev + tags: ${{ env.TAG }}:dev build-args: MIX_ENV=dev target: builder @@ -182,7 +183,7 @@ jobs: with: context: . push: true - tags: ${{ env.IMAGE_NAME }}:prod + tags: ${{ env.TAG }}:prod - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 From 63713b979bfe270d0fbdcf32c769323f14c9b2b7 Mon Sep 17 00:00:00 2001 From: Juan Cristo <99986112+juanzeen@users.noreply.github.com> Date: Fri, 13 Sep 2024 11:41:57 -0300 Subject: [PATCH 7/9] Feat/responsivity publications (#212) * extract common tasks aliases * feat: responsivity for item-cards * fix: mix format * bug: testing git hooks --------- Co-authored-by: Zoey de Souza Pessanha --- assets/css/boletins.scss | 27 +++++ assets/css/landing.scss | 114 ++++++++++++++++++ .../templates/livros_html/show.html.heex | 8 +- 3 files changed, 145 insertions(+), 4 deletions(-) diff --git a/assets/css/boletins.scss b/assets/css/boletins.scss index a8ce45d8..edb8eb9e 100644 --- a/assets/css/boletins.scss +++ b/assets/css/boletins.scss @@ -3,3 +3,30 @@ width: 15.5rem; } } + +@media (min-width: 530px) and (max-width: 770px){ + + .boletim-wrapper { + .links-item { + @apply flex flex-col justify-start items-start m-8; + width: 60%; + height: 16rem; + border-radius: 8px; + box-sizing: border-box; + background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); + } + } +} +@media (min-width: 350px) and (max-width: 529px){ + + .boletim-wrapper { + .links-item { + @apply flex flex-col justify-start items-start m-8; + width: 70%; + height: 13rem; + border-radius: 8px; + box-sizing: border-box; + background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); + } + } +} diff --git a/assets/css/landing.scss b/assets/css/landing.scss index 35d5f1f0..b4bdb2ab 100644 --- a/assets/css/landing.scss +++ b/assets/css/landing.scss @@ -34,7 +34,10 @@ img { width: 100%; height: 100%; + max-width: 1100px; + max-height: 600px; background-size: cover; + margin: 0 auto; } } @@ -141,6 +144,7 @@ display: flex; flex-direction: column; align-items: center; + width: 100%; .publications-main-text { margin: 5rem 30rem; @@ -493,3 +497,113 @@ width: 1360px; } } + +@media (min-width: 530px) and (max-width: 770px){ + .links-landing { + @apply flex flex-col justify-center items-center ; + width: 100%; + + .links-item { + @apply flex flex-col justify-start items-start m-8; + width: 60%; + height: 16rem; + border-radius: 8px; + box-sizing: border-box; + background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); + + a { + @apply flex flex-col mt-auto; + } + + img { + border-radius: 8px; + width: inherit; + height: inherit; + @apply absolute; + z-index: -10; + } + + h3 { + padding-left: 1rem; + } + + p { + text-wrap: wrap; + margin-top: 0.5rem; + padding: 0 1rem 1.5rem 1rem; + } + + button { + width: 100%; + padding: 0 1rem 1.5rem 0; + background-color: transparent; + + p { + display: inline-flex; + width: inherit; + + &:hover { + text-decoration: underline; + } + } + } + } + } + +} + +@media (min-width: 350px) and (max-width: 529px){ + + + + .links-landing { + @apply flex flex-col justify-center items-center; + width: 100%; + + .links-item { + @apply flex flex-col justify-start items-start m-8; + width: 70%; + height: 13rem; + border-radius: 8px; + box-sizing: border-box; + background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); + + a { + @apply flex flex-col mt-auto; + } + + img { + border-radius: 8px; + width: inherit; + height: inherit; + @apply absolute; + z-index: -10; + } + + h3 { + padding-left: 1rem; + } + + p { + text-wrap: wrap; + margin-top: 0.5rem; + padding: 0 1rem 1.5rem 1rem; + } + + button { + width: 100%; + padding: 0 1rem 1.5rem 0; + background-color: transparent; + + p { + display: inline-flex; + width: inherit; + + &:hover { + text-decoration: underline; + } + } + } + } + } +} diff --git a/lib/pescarte_web/templates/livros_html/show.html.heex b/lib/pescarte_web/templates/livros_html/show.html.heex index 5db0f2b2..b8257554 100644 --- a/lib/pescarte_web/templates/livros_html/show.html.heex +++ b/lib/pescarte_web/templates/livros_html/show.html.heex @@ -7,7 +7,7 @@
-
+
Livro Pescarte 1
-
+
Livro Pescarte 2
-
+
Livro Pescarte 3
-
+
Date: Fri, 13 Sep 2024 11:42:28 -0300 Subject: [PATCH 8/9] Feat/quemsomostextos (#213) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * extract common tasks aliases * alteracao dos textos de licenciamento e ibama * alteracao dos textos de licenciamento e ibama e Sobre-> Sobre Nós --------- Co-authored-by: Zoey de Souza Pessanha --- .../templates/aboutus_html/show.html.heex | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/pescarte_web/templates/aboutus_html/show.html.heex b/lib/pescarte_web/templates/aboutus_html/show.html.heex index 74c64964..31e43e44 100644 --- a/lib/pescarte_web/templates/aboutus_html/show.html.heex +++ b/lib/pescarte_web/templates/aboutus_html/show.html.heex @@ -2,7 +2,7 @@
<.text size="h2" color="text-white-100"> - Sobre + Sobre Nós
@@ -30,7 +30,11 @@ Licenciamento Ambiental Federal <.text size="lg" color="text-black-80"> - O Licenciamento Ambiental Federal é um processo administrativo realizado pelo Instituto Brasileiro do Meio Ambiente e dos Recursos Naturais Renováveis (Ibama). Este processo visa assegurar que atividades e empreendimentos potencialmente poluidores atendam às normas ambientais, minimizando impactos ao meio ambiente. + O licenciamento ambiental federal no Brasil é um processo administrativo que tem o objetivo de garantir que atividades ou empreendimentos que possam causar impacto ao meio ambiente sejam realizados de maneira sustentável, de acordo com a legislação vigente. Uma de suas principais características é a participação social na tomada de decisão, por meio da realização de audiências públicas como parte do processo. + + Essa obrigação é compartilhada pelos Órgãos Estaduais de Meio Ambiente e pelo Ibama, como partes integrantes do SISNAMA (Sistema Nacional de Meio Ambiente). O Ibama atua, principalmente, no licenciamento de grandes projetos de infraestrutura que envolvam impactos em mais de um estado e nas atividades do setor de petróleo e gás na plataforma continental. + + As principais diretrizes para a execução do licenciamento ambiental estão expressas na Lei 6.938/81 e nas Resoluções CONAMA nº 001/86 e nº 237/97 e na Lei Complementar nº 140/2011, que discorre sobre a competência estadual e federal para o licenciamento, tendo como fundamento a localização do empreendimento.
@@ -46,7 +50,9 @@ IBAMA <.text size="lg" color="text-black-80"> - O Ibama é responsável pela execução, supervisção e controle do Licenciamento Ambiental Federal. Sua função é garantir que empreendimentos e atividades sejam conduzidos de acordo com a legislação ambiental, protegendo os recursos naturais e promovendo o desenvolvimento sustentável. + O Instituto Brasileiro do Meio Ambiente e dos Recursos Naturais Renováveis (IBAMA) desempenha um papel central no licenciamento ambiental no Brasil, especialmente em empreendimentos ou atividades que tenham impacto ambiental significativo em âmbito nacional. Seu papel inclui a análise e emissão de licenças, fiscalização, avaliação de impacto ambiental, coordenação com outros órgãos e consultas públicas. + + O IBAMA tem como função garantir que o desenvolvimento econômico ocorra de maneira sustentável, minimizando os impactos ambientais e preservando os recursos naturais do país.
From d116e7f83fb727474bb005f2d3666a23dbc2cc05 Mon Sep 17 00:00:00 2001 From: Douglas Tofoli Date: Wed, 18 Sep 2024 09:54:08 -0300 Subject: [PATCH 9/9] Feat/responsive landing/cooperativas (#196) * add hamburger menu * add hamburger menu * fix: revert phoenix version * refactor landing page with responsive layout * fix: position in a row when is small screen * fix: padding between components * fix: gallery responsive * cooperativas page responsive * refactor navbar component * resolve conflicts * add responsive code * fix hamburger menu * fix height of menu * run mix format * add pass package * fix width image carousel --- assets/css/aboutus.scss | 16 +- assets/css/app.scss | 1 + assets/css/cooperativas.scss | 87 +++ assets/css/get_in_touch.scss | 64 +- assets/css/landing.scss | 630 ++++++++++-------- assets/css/navbar.scss | 44 +- assets/js/app.js | 4 +- assets/js/glide.js | 22 +- assets/package-lock.json | 22 +- assets/package.json | 2 +- flake.nix | 2 +- lib/pescarte_web/design_system/navbar.ex | 78 ++- lib/pescarte_web/router.ex | 2 +- .../cooperativas_html/show.html.heex | 103 +-- .../templates/landing_html/show.html.heex | 117 ++-- .../images/landing/cooperativas/banner.webp | Bin 0 -> 8152 bytes 16 files changed, 747 insertions(+), 447 deletions(-) create mode 100644 assets/css/cooperativas.scss create mode 100644 priv/static/images/landing/cooperativas/banner.webp diff --git a/assets/css/aboutus.scss b/assets/css/aboutus.scss index 9783bc22..2c1a6237 100644 --- a/assets/css/aboutus.scss +++ b/assets/css/aboutus.scss @@ -6,7 +6,7 @@ } } -.lighter-banner{ +.lighter-banner { display: flex; flex-direction: column; text-align: center; @@ -18,10 +18,10 @@ background-blend-mode: multiply; .banner-img { - z-index: -1; - position: absolute; - width: 100vw; - height: 260px; + z-index: -1; + position: absolute; + width: 100vw; + height: 260px; } } @@ -64,7 +64,7 @@ } .know-content { - width: 100vw; + width: 100vw; padding: 0px 20px; margin-top: 40px; } @@ -221,7 +221,7 @@ } img { - order: 2; + order: 2; width: 100%; } @@ -251,4 +251,4 @@ height: 100%; z-index: -1; } -} \ No newline at end of file +} diff --git a/assets/css/app.scss b/assets/css/app.scss index 1cf71721..5fc3167e 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -173,6 +173,7 @@ footer { // Sem autenticação @import "./pages/login.scss"; @import "./aboutus.scss"; +@import "./cooperativas.scss"; @import "./agenda.scss"; @import "./contact.scss"; diff --git a/assets/css/cooperativas.scss b/assets/css/cooperativas.scss new file mode 100644 index 00000000..5ac07e4c --- /dev/null +++ b/assets/css/cooperativas.scss @@ -0,0 +1,87 @@ +.cooperativas-wrapper { + @apply flex flex-col; + + .cooperativas-container { + @apply flex flex-col; + gap: 5rem; + margin-bottom: 5rem; + + .header { + @apply relative; + + .header-content { + img { + width: 100%; + height: auto; + } + + h2 { + @apply absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + text-align: center; + } + } + } + + .block { + @apply flex flex-row; + gap: 3.5rem; + margin: 0 2.5rem 0 2.5rem; + + .block-content { + @apply flex flex-col; + gap: 2.5rem; + width: 50%; + } + + img { + width: 50%; + } + } + } +} + +@media (max-width: 768px) { + .cooperativas-wrapper { + .cooperativas-container { + @apply flex flex-wrap; + gap: 4rem; + + .header { + height: 16.25rem; + + .header-content { + img { + height: 16.25rem; + object-fit: none; + } + } + } + + .block { + @apply flex-wrap; + gap: 4rem; + margin: 0 1rem 0 1rem; + + .block-content { + width: 100%; + + h1 { + font-size: 2rem; + } + } + + img { + width: 100%; + border-radius: 0.5rem; + } + + &:nth-child(3) { + @apply flex flex-col-reverse; + } + } + } + } +} diff --git a/assets/css/get_in_touch.scss b/assets/css/get_in_touch.scss index db6862b7..88c7e3bd 100644 --- a/assets/css/get_in_touch.scss +++ b/assets/css/get_in_touch.scss @@ -1,19 +1,25 @@ .onde-nos-encontrar-wrapper { @apply flex bg-orange-100; + grid-area: onde-nos-encontrar; flex-direction: column; justify-content: center; align-items: center; + text-align: center; gap: 5rem; - padding: 5rem; + padding: 5rem 0 5rem 0; + width: 100vw; .redes-sociais-wrapper { @apply flex; flex-direction: column; justify-content: center; align-items: center; + text-align: center; .redes-sociais-links-wrapper { - @apply flex; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + gap: 2rem; padding-top: 2.5rem; .redes-sociais-link { @@ -50,6 +56,7 @@ flex-direction: column; justify-content: center; align-items: center; + text-align: center; gap: 2.5rem; .contact-btn { @@ -74,3 +81,56 @@ } } } + +@media (max-width: 767px) { + .onde-nos-encontrar-wrapper { + .redes-sociais-wrapper { + margin: 1rem; + + .redes-sociais-links-wrapper { + @apply flex; + + .redes-sociais-link { + padding: 0; + + .redes-sociais-icon { + width: 60px; + height: 60px; + } + } + } + } + } +} + +@media (min-width: 768px) { + .onde-nos-encontrar-wrapper { + .redes-sociais-wrapper { + .redes-sociais-links-wrapper { + /* 2 colunas em telas médias */ + @apply grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: auto; + column-gap: 80px; + min-height: auto; + margin-top: 2.5rem; + } + } + } +} + +@media (min-width: 1024px) { + .onde-nos-encontrar-wrapper { + .redes-sociais-wrapper { + .redes-sociais-links-wrapper { + /* 3 colunas em telas grandes */ + @apply grid; + grid-template-columns: repeat(3, 1fr); + grid-template-rows: auto; + column-gap: 80px; + min-height: auto; + margin-top: 2.5rem; + } + } + } +} \ No newline at end of file diff --git a/assets/css/landing.scss b/assets/css/landing.scss index b4bdb2ab..f62dff1e 100644 --- a/assets/css/landing.scss +++ b/assets/css/landing.scss @@ -1,121 +1,394 @@ .landing-grid { - overflow: scroll; - overflow-x: hidden; display: grid; + /* Ajuste automático das colunas */ + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); grid-template-areas: - "top-banner" - "glide" - "links" - "about" + "landing-carousel" + "landing-links" + "project" "news" - "bottom-banner"; -} - -.top-banner { - @apply w-full; + "gallery-carousel" + "onde-nos-encontrar"; width: 100%; - min-height: 25rem; - grid-area: top-banner; -} + gap: 5rem; + overflow: scroll; + overflow-x: hidden; -.land-carousel { - margin-bottom: 70px; + .landing-carousel { + grid-area: landing-carousel; + grid-column: 1 / -1; - .glide1 { - max-width: 100vw; - max-height: 600px; - } + .glide__slide { + max-width: 100%; + height: 100%; - .glide__slide { - max-width: 100%; - height: 100%; + img { + width: 100%; + height: 100%; + background-size: cover; + } + } - img { - width: 100%; - height: 100%; - max-width: 1100px; - max-height: 600px; - background-size: cover; - margin: 0 auto; + .glide__bullets { + display: flex; + justify-content: center; + margin-top: 40px; + margin-bottom: 40px; + } + + .glide__bullet { + @apply bg-black-10; + height: 10px; + width: 10px; + border-radius: 50%; + margin: 0 5px; + } + + .glide__bullet.active { + @apply bg-blue-80; } } - .glide__bullets { - display: flex; - justify-content: center; - margin-top: 40px; + .landing-links { + @apply flex flex-wrap justify-center; + grid-area: landing-links; + width: 100%; + gap: 1rem; + + .links-item { + @apply flex flex-col justify-start items-start bg-blue-100; + width: 13.333rem; + height: 6.5rem; + padding: 1.5rem; + border-radius: 0.5rem; + + a { + @apply flex flex-col; + gap: 1rem; + } + + img { + @apply hidden; + } + + h3 { + font-size: 1.5rem; + font-style: normal; + font-weight: 700; + line-height: 1.75rem; + } + + button { + @apply flex; + margin: 0; + padding: 0; + gap: 0.5rem; + background-color: transparent; + + p { + @apply text-white-100; + font-size: 1rem; + font-style: normal; + font-weight: 500; + line-height: 1.125rem; + } + } + } + + @media (max-width: 768px) { + padding: 1rem 1rem; + + .links-item { + position: relative; + width: 100%; + box-sizing: border-box; + background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); + + img { + @apply block absolute; + width: inherit; + height: inherit; + border-radius: 0.5rem; + object-fit: cover; + + top: 0; + left: 0; + right: 0; + bottom: 0; + + z-index: -10; + } + } + } } - .glide__bullet { - @apply bg-black-10; - height: 10px; - width: 10px; - border-radius: 50%; - margin: 0 5px; + .project { + @apply flex justify-between; + grid-area: project; + /* width: 100%; */ + padding: 0 2.5rem; + + .project-content { + @apply flex flex-col; + gap: 0.94rem; + width: 50%; + + p { + font-size: 0.75rem; + font-style: normal; + font-weight: 700; + line-height: 1.125rem; + color: #9f9f9f; + } + + .project-body { + @apply flex flex-col; + gap: 2.5rem; + width: 90%; + + a button { + @apply flex; + height: 3rem; + padding: 1rem 1.5rem; + justify-content: center; + align-items: center; + gap: 0.5rem; + + p { + @apply text-white-100; + font-size: 1rem; + font-weight: 500; + } + } + } + } + + img { + width: 50%; + border-radius: 0.5rem; + } + + @media (max-width: 768px) { + @apply flex flex-col-reverse; + padding: 0 1rem; + + .project-content { + width: 100%; + + .project-body { + width: 100%; + + a button { + width: 100%; + } + } + } + + img { + width: 100%; + margin-bottom: 2.5rem; + } + } } - .glide__bullet.active { - @apply bg-blue-80; + .news { + grid-area: news; + + h2 { + display: flex; + justify-content: center; + margin-top: 40px; + margin-bottom: 5rem; + } + + .news-cards { + @apply flex flex-wrap justify-center md:mt-10; + + .news-item { + @apply flex flex-col max-w-sm; + border-radius: 0.5rem; + border: 1px solid #66a2de; + margin: 0 2.5rem 2.5rem 2.5rem; + width: 20.125rem; + + img { + border-radius: 0.5rem 0.5rem 0 0; + width: 100%; + min-height: 242px; + max-height: 242px; + } + + h2 { + display: flex; + justify-content: center; + } + } + } } -} -.bottom-banner { - @apply w-full; + .gallery-carousel { + grid-area: gallery-carousel; + grid-column: 1 / -1; - height: 30rem; - grid-area: bottom-banner; -} + h2 { + display: flex; + justify-content: center; + margin-bottom: 2.5rem; + } -.links-landing { - @apply flex flex-wrap justify-center; + .glide__slides { + @apply flex justify-center items-center; + margin: 0; + padding: 0; + list-style: none; - .links-item { - @apply flex flex-col justify-start items-start m-8; - width: 20.125rem; - height: 20.875rem; - border-radius: 8px; - box-sizing: border-box; - background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); + .glide__slide { + @apply flex justify-center items-center; + max-width: 41.75rem; + height: auto; + transition: transform 0.25s ease-out; - a { - @apply flex flex-col mt-auto; + &:not(.glide__slide--active) { + max-width: 33.125rem; + } + + img { + width: 100%; + height: auto; + border-radius: 8px; + object-fit: cover; + max-width: 100%; + max-height: 100%; + } + } } - img { - @apply absolute; - z-index: -10; - height: inherit; - width: inherit; + .glide__progress { + max-width: 660px; + margin: 56px auto 0; + height: 4px; + background-color: #ddd; + border-radius: 2px; } - h3 { - padding-left: 1rem; + .glide__progress-bar { + @apply bg-blue-80; + height: 4px; + width: 0; + border-radius: 2px; } + } +} + - p { - text-wrap: wrap; - margin-top: 0.5rem; - padding: 0 1rem 1.5rem 1rem; +@media (max-width: 768px) { + .landing-grid { + .news { + .news-cards { + @apply flex-nowrap; + overflow-x: auto; + scroll-snap-type: x mandatory; + + .news-item { + margin: 0 1.5rem 0 0; + scroll-snap-align: start; + } + } } - button { - width: 100%; - padding: 0 1rem 1.5rem 0; - background-color: transparent; + .gallery-carousel { + .glide__slide { + max-width: 100%; + width: 80%; + height: auto; - p { - display: inline-flex; - width: inherit; + transition: transform 0.3s ease, width 0.3s ease; + transform: scale(0.8); + border-radius: 8px; + overflow: hidden; - &:hover { - text-decoration: underline; + img { + width: 100%; + height: 100%; + background-size: cover; + border-radius: 8px; } } + + .glide__slide--active { + width: 100%; + transform: scale(1.2); + z-index: 2; + border-radius: 16px; + } + + .glide__bullets { + display: flex; + justify-content: center; + margin-top: 40px; + margin-bottom: 40px; + } + + .glide__bullet { + @apply bg-black-10; + height: 10px; + width: 10px; + border-radius: 50%; + margin: 0 5px; + } + + .glide__bullet.active { + @apply bg-blue-80; + } } } } +@media (min-width: 768px) { + .landing-grid { + /* 2 colunas em telas médias */ + grid-template-columns: repeat(2, 1fr); + grid-template-areas: + "landing-carousel landing-carousel" + "landing-links landing-links" + "project project" + "news news" + "gallery-carousel gallery-carousel" + "onde-nos-encontrar onde-nos-encontrar"; + } +} + +@media (min-width: 1024px) { + .landing-grid { + /* 3 colunas em telas grandes */ + grid-template-columns: repeat(3, 1fr); + grid-template-areas: + "landing-carousel landing-carousel landing-carousel" + "landing-links landing-links landing-links" + "project project project" + "news news news" + "gallery-carousel gallery-carousel gallery-carousel" + "onde-nos-encontrar onde-nos-encontrar onde-nos-encontrar"; + } +} + +.top-banner { + @apply w-full; + + width: 100%; + min-height: 25rem; + grid-area: top-banner; +} + + +.bottom-banner { + @apply w-full; + + height: 30rem; + grid-area: bottom-banner; +} + .about { @apply flex justify-center; padding: 2rem; @@ -144,7 +417,6 @@ display: flex; flex-direction: column; align-items: center; - width: 100%; .publications-main-text { margin: 5rem 30rem; @@ -179,42 +451,6 @@ } } -.news { - h2 { - display: flex; - justify-content: center; - margin-bottom: 5rem; - } - - .news-cards { - @apply flex flex-wrap justify-center md:mt-10; - - .news-item { - @apply max-w-sm; - border-radius: 0.5rem; - border: 1px solid #66a2de; - margin: 0 2.5rem 2.5rem 2.5rem; - width: 20.125rem; - - img { - border-radius: 0.5rem 0.5rem 0 0; - width: 100%; - min-height: 242px; - max-height: 242px; - } - - h2 { - display: flex; - justify-content: center; - } - - button { - margin-top: 1rem; - } - } - } -} - .input-space { display: flex; @@ -225,56 +461,6 @@ } } -.gallery-carousel { - padding: 56px 0; - - h2 { - display: flex; - justify-content: center; - margin-bottom: 2.5rem; - } - - .glide2 { - max-width: 100vw; - max-height: 500px; - } - - .glide__slides { - margin: 0; - padding: 0; - list-style: none; - } - - .glide__slide { - @apply flex justify-center items-center; - width: 670px !important; - height: 380px; - transition: transform 0.25s ease-out; - } - - .glide__slide img { - height: 100%; - width: 100%; - border-radius: 8px; - object-fit: cover; - } - - .glide__progress { - max-width: 660px; - margin: 56px auto 0; - height: 4px; - background-color: #ddd; - border-radius: 2px; - } - - .glide__progress-bar { - @apply bg-blue-80; - height: 4px; - width: 0; - border-radius: 2px; - } -} - .equipes-wrapper { @apply flex; flex-direction: column; @@ -496,114 +682,4 @@ .nossas-equipes-container { width: 1360px; } -} - -@media (min-width: 530px) and (max-width: 770px){ - .links-landing { - @apply flex flex-col justify-center items-center ; - width: 100%; - - .links-item { - @apply flex flex-col justify-start items-start m-8; - width: 60%; - height: 16rem; - border-radius: 8px; - box-sizing: border-box; - background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); - - a { - @apply flex flex-col mt-auto; - } - - img { - border-radius: 8px; - width: inherit; - height: inherit; - @apply absolute; - z-index: -10; - } - - h3 { - padding-left: 1rem; - } - - p { - text-wrap: wrap; - margin-top: 0.5rem; - padding: 0 1rem 1.5rem 1rem; - } - - button { - width: 100%; - padding: 0 1rem 1.5rem 0; - background-color: transparent; - - p { - display: inline-flex; - width: inherit; - - &:hover { - text-decoration: underline; - } - } - } - } - } - -} - -@media (min-width: 350px) and (max-width: 529px){ - - - - .links-landing { - @apply flex flex-col justify-center items-center; - width: 100%; - - .links-item { - @apply flex flex-col justify-start items-start m-8; - width: 70%; - height: 13rem; - border-radius: 8px; - box-sizing: border-box; - background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%); - - a { - @apply flex flex-col mt-auto; - } - - img { - border-radius: 8px; - width: inherit; - height: inherit; - @apply absolute; - z-index: -10; - } - - h3 { - padding-left: 1rem; - } - - p { - text-wrap: wrap; - margin-top: 0.5rem; - padding: 0 1rem 1.5rem 1rem; - } - - button { - width: 100%; - padding: 0 1rem 1.5rem 0; - background-color: transparent; - - p { - display: inline-flex; - width: inherit; - - &:hover { - text-decoration: underline; - } - } - } - } - } -} +} \ No newline at end of file diff --git a/assets/css/navbar.scss b/assets/css/navbar.scss index e7c52a40..6cb12eb3 100644 --- a/assets/css/navbar.scss +++ b/assets/css/navbar.scss @@ -4,7 +4,11 @@ height: 98px; .logo { - margin: 24px 0px 24px 100px; + margin: 1.5rem 0 1.5rem 6.25rem; + + @media screen and (max-width: 768px) { + margin: 1.5rem 1.5rem; + } } .login-button { @@ -13,7 +17,7 @@ } .nav-menu { - @apply flex justify-between items-center; + @apply justify-between items-center; gap: 3rem; margin: 21px 0; @@ -37,6 +41,40 @@ } } } + + .hamburger-button { + @apply md:hidden; + margin: 1.5rem; + } +} + +#navbar { + @apply relative; + z-index: 20; + + .hamburger-container { + @apply absolute bg-white-100; + margin-top: 8px; + padding: 24px 24px; + top: calc(100% + 8px); + left: 0; + width: 100%; + z-index: 10; + box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1); + + transform: translateY(-20px); + transition: opacity 0.3s ease, transform 0.3s ease; + + .nav-menu { + @apply flex; + flex-direction: column; + gap: 32px; + } + + a button { + margin-top: 16px; + } + } } .arrow-open, @@ -166,4 +204,4 @@ width: 12.25rem; height: 3.8rem; } -} +} \ No newline at end of file diff --git a/assets/js/app.js b/assets/js/app.js index ce48ec1e..1a368306 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -35,9 +35,9 @@ document.querySelectorAll(`[data-component="navbar-dropdown"]`).forEach(el => { dropdown.addEventListener("mouseleave", e => hide()); }); -window.addEventListener("phx:js-exec", ({detail}) => { +window.addEventListener("phx:js-exec", ({ detail }) => { document.querySelectorAll(detail.to).forEach(el => { - liveSocket.execJS(el, el.getAttribute(detail.attr)) + liveSocket.execJS(el, el.getAttribute(detail.attr)) }) }) diff --git a/assets/js/glide.js b/assets/js/glide.js index 54760430..c24796ab 100644 --- a/assets/js/glide.js +++ b/assets/js/glide.js @@ -3,15 +3,15 @@ import Glide from "@glidejs/glide/dist/glide.esm"; const glide1 = new Glide('.glide1', { type: 'slider', gap: 20, - perview: 1, - autoplay: 35 * 10 * 10, + perView: 1, + autoplay: 3500, hoverpause: true, - animationDuration: 15 * 100, + animationDuration: 1500, direction: 'ltr' }); -glide1.on('run', function () { - const bullets = document.querySelectorAll('.glide__bullet'); +glide1.on('run', function() { + const bullets = document.querySelectorAll('.glide1 .glide__bullet'); bullets.forEach((bullet, index) => { if (index === glide1.index) { bullet.classList.add('active'); @@ -21,7 +21,6 @@ glide1.on('run', function () { }); }); - const glide2 = new Glide('.glide2', { type: 'carousel', autoplay: 5000, @@ -31,6 +30,17 @@ const glide2 = new Glide('.glide2', { peek: 107 }); +glide2.on('run', function() { + const bullets = document.querySelectorAll('.glide2 .glide__bullet'); + bullets.forEach((bullet, index) => { + if (index === glide2.index) { + bullet.classList.add('active'); + } else { + bullet.classList.remove('active'); + } + }); +}); + if (window.location.pathname === '/') { glide1.mount(); glide2.mount(); diff --git a/assets/package-lock.json b/assets/package-lock.json index c12b5e66..b187a0d3 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -22,7 +22,7 @@ "phoenix_live_view": "file:../deps/phoenix_live_view", "postcss": "^8.4.38", "tailwindcss": "^3.4.3", - "topbar": "^1.0.1" + "topbar": "^3.0.0" } }, "../deps/phoenix": { @@ -644,19 +644,6 @@ "url": "https://github.com/sponsors/rawify" } }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -879,7 +866,6 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -1710,9 +1696,9 @@ } }, "node_modules/topbar": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/topbar/-/topbar-1.0.1.tgz", - "integrity": "sha512-HZqQSMBiG29vcjOrqKCM9iGY/h69G5gQH7ae83ZCPz5uPmbQKwK0sMEqzVDBiu64tWHJ+kk9NApECrF+FAAvRA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/topbar/-/topbar-3.0.0.tgz", + "integrity": "sha512-mhczD7KfYi1anfoMPKRdl0wPSWiYc0YOK4KyycYs3EaNT15pVVNDG5CtfgZcEBWIPJEdfR7r8K4hTXDD2ECBVQ==" }, "node_modules/ts-interface-checker": { "version": "0.1.13", diff --git a/assets/package.json b/assets/package.json index b24ea46e..4717719b 100644 --- a/assets/package.json +++ b/assets/package.json @@ -20,6 +20,6 @@ "phoenix_live_view": "file:../deps/phoenix_live_view", "postcss": "^8.4.38", "tailwindcss": "^3.4.3", - "topbar": "^1.0.1" + "topbar": "^3.0.0" } } diff --git a/flake.nix b/flake.nix index 1de4fa79..b38d28de 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ mkShell { name = "peapescarte"; packages = with pkgs; - [beam.elixir_1_16 nodejs supabase-cli ghostscript zlib postgresql flyctl] + [beam.elixir_1_16 nodejs supabase-cli ghostscript zlib postgresql flyctl pass] ++ lib.optional stdenv.isLinux [inotify-tools chromium] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/lib/pescarte_web/design_system/navbar.ex b/lib/pescarte_web/design_system/navbar.ex index ce088631..5de8b23d 100644 --- a/lib/pescarte_web/design_system/navbar.ex +++ b/lib/pescarte_web/design_system/navbar.ex @@ -13,24 +13,76 @@ defmodule PescarteWeb.DesignSystem.Navbar do -
    - <.navlink label="Sobre" navigate={~p"/sobre"} current_path={@current_path} /> - <.navlink label="Equipes" navigate={~p"/equipes"} current_path={@current_path} /> - <.navlink label="Sedes" navigate={~p"/sedes"} current_path={@current_path} /> - <.navlink label="Cooperativas" navigate={~p"/cooperativas"} current_path={@current_path} /> - <.navlink label="Contato" navigate={~p"/contato"} current_path={@current_path} /> -
- - <.button style="primary" class="login-button"> - - <.text size="base" color="text-white-100">Acessar - - + + <.menu /> + + <.hamburger_button /> + <.hamburger_menu /> """ end + defp hamburger_button(assigns) do + ~H""" +
+ <.button + style="link" + click={JS.toggle(to: "#hamburger-container", in: "fade-in-scale", out: "fade-out-scale")} + > + <.icon name={:menu} class="text-blue-100" /> + +
+ """ + end + + attr(:current_path, :string, default: "/") + + defp menu(assigns) do + ~H""" + + + + """ + end + + attr(:current_path, :string, default: "/") + + defp hamburger_menu(assigns) do + ~H""" + + """ + end + + attr(:current_path, :string, default: "/") + + defp links(assigns) do + ~H""" + <.navlink label="Sobre" navigate={~p"/sobre"} current_path={@current_path} /> + <.navlink label="Equipes" navigate={~p"/equipes"} current_path={@current_path} /> + <.navlink label="Sedes" navigate={~p"/sedes"} current_path={@current_path} /> + <.navlink label="Cooperativas" navigate={~p"/cooperativas"} current_path={@current_path} /> + <.navlink label="Contato" navigate={~p"/contato"} current_path={@current_path} /> + """ + end + attr(:label, :string, required: true) attr(:navigate, :string, default: "/") attr(:current_path, :string, default: "/") diff --git a/lib/pescarte_web/router.ex b/lib/pescarte_web/router.ex index e926d28b..1cefe2b2 100644 --- a/lib/pescarte_web/router.ex +++ b/lib/pescarte_web/router.ex @@ -39,7 +39,7 @@ defmodule PescarteWeb.Router do get "/censo", CensoController, :show get "/confirmar", TokenController, :confirm get "/noticias", NoticiasController, :show - get "/pgtrs", PGTRController, :show + get "/pgtr", PGTRController, :show get "/sedes", SedesController, :show get "/aplicativos", AplicativosController, :show diff --git a/lib/pescarte_web/templates/cooperativas_html/show.html.heex b/lib/pescarte_web/templates/cooperativas_html/show.html.heex index c8b5166b..a02a72ec 100644 --- a/lib/pescarte_web/templates/cooperativas_html/show.html.heex +++ b/lib/pescarte_web/templates/cooperativas_html/show.html.heex @@ -1,58 +1,67 @@ -
+
<.flash :if={@error_message} id="login-error" kind={:error}> <%= @error_message %> -
-
- - <.text size="h1" color="text-blue-100"> - O Laço Entre Cooperativas e Pescarte +
+
+
+ + <.text size="h2" color="text-white-100">Cooperativas +
+
+ +
+
+ + <.text size="h1" color="text-blue-100"> + O Laço Entre Cooperativas e Pescarte + + + <.text size="lg" color="text-black-80"> + Junto às comunidades de pesca artesanal, o PEA Pescarte promove ações colaborativas e democráticas pautadas na economia solidária e no cooperativismo, para a construção de Projetos de Geração de Trabalho e Renda (PGTR’s), que são empreendimentos socioeconômicos, ambientalmente responsáveis para a atuação de pessoas pescadoras e suas famílias em 10 municípios da Bacia de Campos. +
+
+ Os Projetos de Geração de Trabalho e Renda (PGTR's) foram iniciados na segunda fase do projeto Pescarte e resultam na materialização para os Estudos de Viabilidade Técnica, Econômica, Ambiental e Social (EVTEAS) de seis tipos de empreendimentos, previstos para serem implantados de acordo com o Plano de Trabalho do projeto e a particularidade de cada comunidade de pesca. - - <.text size="lg" color="text-black-80"> - Junto às comunidades de pesca artesanal, o PEA Pescarte promove ações colaborativas e democráticas pautadas na economia solidária e no cooperativismo, para a construção de Projetos de Geração de Trabalho e Renda (PGTR’s), que são empreendimentos socioeconômicos, ambientalmente responsáveis para a atuação de pessoas pescadoras e suas famílias em 10 municípios da Bacia de Campos. -
-
- Os Projetos de Geração de Trabalho e Renda (PGTR's) foram iniciados na segunda fase do projeto Pescarte e resultam na materialização para os Estudos de Viabilidade Técnica, Econômica, Ambiental e Social (EVTEAS) de seis tipos de empreendimentos, previstos para serem implantados de acordo com o Plano de Trabalho do projeto e a particularidade de cada comunidade de pesca. - - <.text size="lg" color="text-blue-100"> - - Visite também Organização das Cooperativas do Brasil (OCB) - - -
- -
+ <.text size="lg" color="text-blue-100"> + + Visite também Organização das Cooperativas do Brasil (OCB) + + +
+ +
-
- -
- - <.text size="h1" color="text-blue-100"> - Estudo de Viabilidade Técnica, Econômica, Ambiental e Social +
+ +
+ + <.text size="h1" color="text-blue-100"> + Estudo de Viabilidade Técnica, Econômica, Ambiental e Social + + + <.text size="lg" color="text-black-80"> + O EVTEAS busca identificar as vantagens e desvantagens dos PGTR’s que serão implantados pelo Pescarte. Cada foco do estudo busca investigar aspectos específicos: +
    +
  • Técnico: se o projeto tem suporte técnico para existir;
    • +
  • + Econômico: + como o projeto pode render o suficiente para pagar seus custos e gerar lucro para dividir entre as pessoas trabalhadoras. +
    • +
  • + Ambiental: + possibilidades e alternativas para criar um empreendimento que gere nenhuma poluição ou dano ao meio ambiente. +
    • +
  • + Social: + se os projetos têm um número suficiente de pessoas interessadas em criar e manter um PGTR. Assim, a junção de todos estes termos avalia se o empreendimento pode ou não ser implantando. +
    • +
- - <.text size="lg" color="text-black-80"> - O EVTEAS busca identificar as vantagens e desvantagens dos PGTR’s que serão implantados pelo Pescarte. Cada foco do estudo busca investigar aspectos específicos: -
    -
  • Técnico: se o projeto tem suporte técnico para existir;
    • -
  • - Econômico: - como o projeto pode render o suficiente para pagar seus custos e gerar lucro para dividir entre as pessoas trabalhadoras. -
    • -
  • - Ambiental: - possibilidades e alternativas para criar um empreendimento que gere nenhuma poluição ou dano ao meio ambiente. -
    • -
  • - Social: - se os projetos têm um número suficiente de pessoas interessadas em criar e manter um PGTR. Assim, a junção de todos estes termos avalia se o empreendimento pode ou não ser implantando. -
    • -
- -
+
+
diff --git a/lib/pescarte_web/templates/landing_html/show.html.heex b/lib/pescarte_web/templates/landing_html/show.html.heex index 1f6e0ce8..84d7558d 100644 --- a/lib/pescarte_web/templates/landing_html/show.html.heex +++ b/lib/pescarte_web/templates/landing_html/show.html.heex @@ -2,8 +2,8 @@ <.flash :if={@error_message} id="login-error" kind={:error}> <%= @error_message %> - -
+ +
    @@ -24,117 +24,95 @@
-
+ +
- -
+ +
- - <.text size="h3" color="text-white-100">Notícias - <.text size="base" color="text-white-100"> - Notícias do Projeto - - <.button style="primary"> + <.text size="h3" color="text-white-100">Notícias + + <.button style="link"> Saiba mais
-
+ <.text size="h3" color="text-white-100">Publicações - <.text size="h3" color="text-white-100">Publicações - <.text size="base" color="text-white-100"> - Publicações do PEA. - - <.button style="primary"> + <.button style="link"> Saiba mais
-
+ <.text size="h3" color="text-white-100">Agenda - <.text size="h3" color="text-white-100">Relatórios Públicos - <.text size="base" color="text-white-100"> - Agenda mensal - - <.button style="primary"> + <.button style="link"> Saiba mais
- - <.text size="h3" color="text-white-100">CENSO - <.text size="base" color="text-white-100"> - Dados do Censo - - <.button style="primary"> + <.text size="h3" color="text-white-100">Censo + + <.button style="link"> Saiba mais
- - <.text size="h3" color="text-white-100">PGTR's - <.text size="base" color="text-white-100"> - Empreendimentos por Munícipios. - - <.button style="primary"> + <.text size="h3" color="text-white-100">PGTR + + <.button style="link"> Saiba mais
-
+ <.text size="h3" color="text-white-100">Aplicações - <.text size="h3" color="text-white-100">Aplicações - <.text size="base" color="text-white-100"> - Aplicações do projeto - - <.button style="primary"> + <.button style="link"> Saiba mais
-
-
- - <.text size="sm" color="text-black-40">O PROJETO - <.text size="h1" color="text-blue-100"> - O que o Pescarte oferece para a comunidade? + +
+
+ <.text size="sm" color="text-black-40">O PROJETO +
+ <.text size="h2" color="text-blue-100">O que o Pescarte oferece para a comunidade? + <.text size="h4" color="text-blue-100"> + O Projeto PESCARTE tem como sua principal finalidade a criação de uma rede social regional + integrada por pescadores artesanais e por seus familiares, buscando, por meio de processos educativos, + promover, fortalecer e aperfeiçoar a sua organização comunitária e a sua qualificação profissional, + bem como o seu envolvimento na construção participativa e na implementação de projetos de geração de + trabalho e renda. - - <.text size="lg" color="text-black-80"> - O Projeto PESCARTE tem como sua principal finalidade a criação de uma - rede social regional integrada por pescadores artesanais e por seus - familiares, buscando, por meio de processos educativos, promover, - fortalecer e aperfeiçoar a sua organização comunitária e a sua - qualificação profissional, bem como o seu envolvimento na construção - participativa e na implementação de projetos de geração de trabalho e - renda. - - - <.button style="primary" click="hello"> - <.text size="base" color="text-white-100">Ver mais - - -
- + + <.button style="primary"> + Ver mais + + +
+
+
+
<.text size="h2" color="text-blue-100">Notícias
@@ -286,10 +264,9 @@
- +
<.text size="h2" color="text-blue-100">Galeria Pescarte -
    @@ -304,10 +281,14 @@
- -
+ +
+ + + +
diff --git a/priv/static/images/landing/cooperativas/banner.webp b/priv/static/images/landing/cooperativas/banner.webp new file mode 100644 index 0000000000000000000000000000000000000000..02ae7f5d415683733c3447a7b03c547a14984c3e GIT binary patch literal 8152 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 literal 0 HcmV?d00001