From 4ce1f6efb0971890c0143f8b58c7c443fcea3402 Mon Sep 17 00:00:00 2001
From: Igor Santos <igr.exe@gmail.com>
Date: Thu, 24 Oct 2024 11:35:13 -0300
Subject: [PATCH] fix: add priority to catch traefik rules and pages to errors

---
 .../adp/map/templates/errors/404.html         | 21 +++++++++++++++++++
 .../adp/map/templates/errors/500.html         |  7 +++++++
 .../eleicao/templates/errors/404.html         | 21 +++++++++++++++++++
 .../eleicao/templates/errors/500.html         |  7 +++++++
 .../nossas/templates/errors/404.html          | 21 +++++++++++++++++++
 .../nossas/templates/errors/500.html          |  7 +++++++
 deploy/docker-compose.yml                     |  8 +++----
 7 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 app/org_amazonia_de_pe/adp/map/templates/errors/404.html
 create mode 100644 app/org_amazonia_de_pe/adp/map/templates/errors/500.html
 create mode 100644 app/org_eleicoes/eleicaodoano/eleicao/templates/errors/404.html
 create mode 100644 app/org_eleicoes/eleicaodoano/eleicao/templates/errors/500.html
 create mode 100644 app/org_nossas/nossas/templates/errors/404.html
 create mode 100644 app/org_nossas/nossas/templates/errors/500.html

diff --git a/app/org_amazonia_de_pe/adp/map/templates/errors/404.html b/app/org_amazonia_de_pe/adp/map/templates/errors/404.html
new file mode 100644
index 00000000..97324201
--- /dev/null
+++ b/app/org_amazonia_de_pe/adp/map/templates/errors/404.html
@@ -0,0 +1,21 @@
+{% extends "votepeloclima/base.html" %}
+{% load static %}
+
+{% block content %}
+<section class="container grid">
+    <div class="bg-screenside d-none d-lg-flex g-col-4">
+        <div class="screenside" style="background-image:url({% static 'imgs/bg-steps.svg' %});">
+        </div>
+    </div>
+    <div class="d-flex align-items-center g-col-12 g-col-lg-8" style="padding: 115px 0;">
+        <div class="d-flex flex-column align-items-md-start gap-3">
+            {% block main %}
+            <i class="ds-icon-warning"></i>
+            <h3 class="text-uppercase fw-bold m-0">Página não <br/> encontrada</h3>
+            <p class="pb-1">Não conseguimos encontrar esta página. Confira se o link está correto. Se o erro persistir, entre em contato com a gente em  <a href="mailto:votepeloclima@nossas.org" target="_blank" rel="noopener noreferrer">votepeloclima@nossas.org</a></p>
+            <button class="btn btn-secondary text-uppercase" type="button" onclick="window.location.href='/'">Voltar ao início</button>
+            {% endblock %}
+        </div>
+    </div>
+</section>
+{% endblock %}
diff --git a/app/org_amazonia_de_pe/adp/map/templates/errors/500.html b/app/org_amazonia_de_pe/adp/map/templates/errors/500.html
new file mode 100644
index 00000000..754fbe66
--- /dev/null
+++ b/app/org_amazonia_de_pe/adp/map/templates/errors/500.html
@@ -0,0 +1,7 @@
+{% extends "errors/404.html" %}
+
+{% block main %}
+<h1 class="text-uppercase">Erro interno do Servidor</h1>
+<p class="pb-3">Houve algum problema no servidor, se o erro persistir entre em contato com suporte@votepeloclima.org</p>
+<button class="btn btn-secondary text-uppercase" type="button" onclick="window.location.href='/'">Voltar ao início</button>
+{% endblock %}
\ No newline at end of file
diff --git a/app/org_eleicoes/eleicaodoano/eleicao/templates/errors/404.html b/app/org_eleicoes/eleicaodoano/eleicao/templates/errors/404.html
new file mode 100644
index 00000000..97324201
--- /dev/null
+++ b/app/org_eleicoes/eleicaodoano/eleicao/templates/errors/404.html
@@ -0,0 +1,21 @@
+{% extends "votepeloclima/base.html" %}
+{% load static %}
+
+{% block content %}
+<section class="container grid">
+    <div class="bg-screenside d-none d-lg-flex g-col-4">
+        <div class="screenside" style="background-image:url({% static 'imgs/bg-steps.svg' %});">
+        </div>
+    </div>
+    <div class="d-flex align-items-center g-col-12 g-col-lg-8" style="padding: 115px 0;">
+        <div class="d-flex flex-column align-items-md-start gap-3">
+            {% block main %}
+            <i class="ds-icon-warning"></i>
+            <h3 class="text-uppercase fw-bold m-0">Página não <br/> encontrada</h3>
+            <p class="pb-1">Não conseguimos encontrar esta página. Confira se o link está correto. Se o erro persistir, entre em contato com a gente em  <a href="mailto:votepeloclima@nossas.org" target="_blank" rel="noopener noreferrer">votepeloclima@nossas.org</a></p>
+            <button class="btn btn-secondary text-uppercase" type="button" onclick="window.location.href='/'">Voltar ao início</button>
+            {% endblock %}
+        </div>
+    </div>
+</section>
+{% endblock %}
diff --git a/app/org_eleicoes/eleicaodoano/eleicao/templates/errors/500.html b/app/org_eleicoes/eleicaodoano/eleicao/templates/errors/500.html
new file mode 100644
index 00000000..754fbe66
--- /dev/null
+++ b/app/org_eleicoes/eleicaodoano/eleicao/templates/errors/500.html
@@ -0,0 +1,7 @@
+{% extends "errors/404.html" %}
+
+{% block main %}
+<h1 class="text-uppercase">Erro interno do Servidor</h1>
+<p class="pb-3">Houve algum problema no servidor, se o erro persistir entre em contato com suporte@votepeloclima.org</p>
+<button class="btn btn-secondary text-uppercase" type="button" onclick="window.location.href='/'">Voltar ao início</button>
+{% endblock %}
\ No newline at end of file
diff --git a/app/org_nossas/nossas/templates/errors/404.html b/app/org_nossas/nossas/templates/errors/404.html
new file mode 100644
index 00000000..97324201
--- /dev/null
+++ b/app/org_nossas/nossas/templates/errors/404.html
@@ -0,0 +1,21 @@
+{% extends "votepeloclima/base.html" %}
+{% load static %}
+
+{% block content %}
+<section class="container grid">
+    <div class="bg-screenside d-none d-lg-flex g-col-4">
+        <div class="screenside" style="background-image:url({% static 'imgs/bg-steps.svg' %});">
+        </div>
+    </div>
+    <div class="d-flex align-items-center g-col-12 g-col-lg-8" style="padding: 115px 0;">
+        <div class="d-flex flex-column align-items-md-start gap-3">
+            {% block main %}
+            <i class="ds-icon-warning"></i>
+            <h3 class="text-uppercase fw-bold m-0">Página não <br/> encontrada</h3>
+            <p class="pb-1">Não conseguimos encontrar esta página. Confira se o link está correto. Se o erro persistir, entre em contato com a gente em  <a href="mailto:votepeloclima@nossas.org" target="_blank" rel="noopener noreferrer">votepeloclima@nossas.org</a></p>
+            <button class="btn btn-secondary text-uppercase" type="button" onclick="window.location.href='/'">Voltar ao início</button>
+            {% endblock %}
+        </div>
+    </div>
+</section>
+{% endblock %}
diff --git a/app/org_nossas/nossas/templates/errors/500.html b/app/org_nossas/nossas/templates/errors/500.html
new file mode 100644
index 00000000..754fbe66
--- /dev/null
+++ b/app/org_nossas/nossas/templates/errors/500.html
@@ -0,0 +1,7 @@
+{% extends "errors/404.html" %}
+
+{% block main %}
+<h1 class="text-uppercase">Erro interno do Servidor</h1>
+<p class="pb-3">Houve algum problema no servidor, se o erro persistir entre em contato com suporte@votepeloclima.org</p>
+<button class="btn btn-secondary text-uppercase" type="button" onclick="window.location.href='/'">Voltar ao início</button>
+{% endblock %}
\ No newline at end of file
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 864cc005..bb78fe5c 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - ADMINS=${ADMINS:-"('Admin', 'admin@localhost'),"}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.eleicaodoano.priority=10
+      - traefik.http.routers.eleicaodoano.priority=999
       - traefik.http.services.eleicaodoano.loadbalancer.server.port=8000
       - traefik.http.routers.eleicaodoano.tls=true
       - traefik.http.routers.eleicaodoano.tls.certresolver=myresolver
@@ -82,7 +82,7 @@ services:
       - ADMINS=${ADMINS:-"('Admin', 'admin@localhost'),"}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.nossas.priority=10
+      - traefik.http.routers.nossas.priority=999
       - traefik.http.services.nossas.loadbalancer.server.port=8000
       - traefik.http.routers.nossas.tls=true
       - traefik.http.routers.nossas.tls.certresolver=myresolver
@@ -109,7 +109,7 @@ services:
       - ADMINS=${ADMINS:-"('Admin', 'admin@localhost'),"}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.observatorio.priority=10
+      - traefik.http.routers.observatorio.priority=999
       - traefik.http.services.observatorio.loadbalancer.server.port=8000
       - traefik.http.routers.observatorio.tls=true
       - traefik.http.routers.observatorio.tls.certresolver=myresolver
@@ -127,7 +127,7 @@ services:
       - MY_APP_URL_MVT=${ADP_MAPA_URL_MVT}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.observatorio-mapa.priority=10
+      - traefik.http.routers.observatorio-mapa.priority=999
       - traefik.http.services.observatorio-mapa.loadbalancer.server.port=80
       - traefik.http.routers.observatorio-mapa.tls=true
       - traefik.http.routers.observatorio-mapa.tls.certresolver=myresolver