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

Location test #19

Merged
merged 14 commits into from
May 14, 2024
Merged

Location test #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4fe31f5
Dev Init.
jassus May 13, 2024
7bd6160
delete logs
edux May 13, 2024
16e8631
wrangler
edux May 13, 2024
90733d3
wrangler
edux May 13, 2024
00fb1df
wrangler
edux May 13, 2024
5a03f83
this
edux May 13, 2024
6362c1c
Merge pull request #17 from sysarmy/dev
edux May 13, 2024
a6e9889
clean
edux May 13, 2024
fb57f36
Merge pull request #18 from sysarmy/stage
edux May 13, 2024
5d91a71
Minor changes
jassus May 13, 2024
398a038
location test
jassus May 14, 2024
985935b
fix: corrected translations for event dates
jassus May 14, 2024
b8906a1
update languages
edux May 14, 2024
023cf2e
remove uade_deep_racer
edux May 14, 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
13 changes: 0 additions & 13 deletions app/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,6 @@ def transcription(lang_code):
return render_template("transcription.html", title="Live transcription", lang_code=lang_code)


@app.route("/<lang_code>/uade_deep_racer/")
def uade_deep_racer(lang_code):
"""
Shows the uade deep racer page

Returns:
flask.Response: The rendered code of conduct HTML template.
"""
return render_template(
"uade_deep_racer.html", title="UADE Deep Racer Grand Prix", lang_code=lang_code
)


@app.route("/<lang_code>/agenda/")
def agenda(lang_code):
agenda = Datasets.read_json_file(AGENDA_FILE)
Expand Down
6 changes: 3 additions & 3 deletions app/static/img/logos/nerdearla-detailed-no-bg.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/static/js/countdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* The start of the event is in the deadlineDate
*/

const deadlineDate = "2024-04-11T09:00:00";
const deadlineDate = "2024-09-24T09:00:00";
/**
* This function gets the remaning time till the date parameter
* @param {string} date The date which you want to get the remaining time
Expand Down
4 changes: 2 additions & 2 deletions app/templates/agenda.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h3 class="text-white">
{{ _("Te traemos una selección de charlas, talleres y actividades de primer nivel.") }}
<br />
<ul>
<li>{{ _("Jueves 11 de abril: solo charlas virtuales") }}</li>
<li>{{ _("Viernes 12 y sábado 13 de abril: presencial en el GAM + streaming") }}</li>
<li>{{ _("Martes 24 y Miércoles 25 de septiembre: solo charlas virtuales") }}</li>
<li>{{ _("Jueves 26, Viernes 27 y sábado 28 de septiembre: presencial en el Konex + streaming") }}</li>
</ul>
{{ _("Todo el contenido va a estar disponible vía streaming en vivo, para que no te pierdas de nada.") }}
<br>
Expand Down
14 changes: 7 additions & 7 deletions app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,26 @@
{#
Jolo metatags
#}
<title>{{ _("Nerdearla Chile – 2da edición – 11 al 13 de abril") }}</title>
<title>{{ _("Nerdearla Argentina – 10ma edición – 24 al 28 de Septiembre") }}</title>
<meta name="description"
content='{{ _("Nerdearla 2024, tres días con más de 60 charlas y talleres de tecnología, divulgación científica y una gran variedad de temas.") }}' />
content='{{ _("Nerdearla 2024, cinco días con más de 200 charlas y talleres de tecnología, divulgación científica y una gran variedad de temas.") }}' />
<link rel="canonical" href="https://nerdear.la/" />
<meta property="og:locale" content="es_ES" />
<meta property="og:type" content="website" />
<meta property="og:title"
content='{{ _("Nerdearla Chile – 2da edición – 11 al 13 de abril") }}' />
content='{{ _("Nerdearla Argentina – 10ma edición – 24 al 28 de Septiembre") }}' />
<meta property="og:description"
content='{{ _("Nerdearla 2024, tres días con más de 60 charlas y talleres de tecnología, divulgación científica y una gran variedad de temas.") }}' />
content='{{ _("Nerdearla 2024, cinco días con más de 200 charlas y talleres de tecnología, divulgación científica y una gran variedad de temas.") }}' />
<meta property="og:url" content="https://nerdear.la/" />
<meta property="og:site_name" content="nerdear.la" />
<meta property="article:publisher" content="https://facebook.com/nerdearla" />
<meta property="og:image"
content="https://i.postimg.cc/8cQg1L78/nerdearla-2023-share.jpg" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title"
content='{{ _("Nerdearla Chile – 2da edición – 11 al 13 de abril") }}' />
content='{{ _("Nerdearla Argentina – 10ma edición – 24 al 28 de Septiembre") }}' />
<meta name="twitter:description"
content='{{ _("Nerdearla 2024, tres días con más de 60 charlas y talleres de tecnología, divulgación científica y una gran variedad de temas.") }}' />
content='{{ _("Nerdearla 2024, cinco días con más de 200 charlas y talleres de tecnología, divulgación científica y una gran variedad de temas.") }}' />
<meta name="twitter:image"
content="https://i.postimg.cc/8cQg1L78/nerdearla-2023-share.jpg" />
<meta name="twitter:site" content="@nerdearla" />
Expand All @@ -94,7 +94,7 @@
{# Block in which the templates that extend base.html will place their information. #}
{% block content %}
{% endblock content %}
<a href="https://reg.nerdear.la/?utm_source=bottom" class="custom_button_bottom">{{ _("¡Regístrate gratis!") }}</a>
{# <a href="https://reg.nerdear.la/?utm_source=bottom" class="custom_button_bottom">{{ _("¡Regístrate gratis!") }}</a> #}
{# Footer #}
{% include "components/footer.html" %}
{# Load Bootstrap JS#}
Expand Down
10 changes: 5 additions & 5 deletions app/templates/components/countdown.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ <h2>
<p class="border-round">{{ _("Presencial y en streaming") }}</p>
</div>
<div class="text-center text-white d-flex justify-content-between">
<div class="highlight-red">
<h3>{{ _("Santiago de Chile") }}</h3>
<p class="border-round">{{ _("11 al 13 de abril") }}</p>
</div>
<div class="highlight-green">
<h3>{{ _("Buenos Aires") }}</h3>
<p class="border-round">{{ _("24 al 28 de septiembre") }}</p>
</div>
<div class="highlight-red">
<h3>{{ _("Ciudad de México") }}</h3>
<p class="border-round">{{ _("7 al 9 de noviembre") }}</p>
</div>
</div>
</div>
</section>
<section class="bg-texture timer-wrapper bg-pattern">
<div class="container">
<h2 class="display-3 text-center text-white py-3">{{ _("¿Cuánto Falta para Nerdearla 🇨🇱 2024?") }}</h2>
<h2 class="display-3 text-center text-white py-3">{{ _("¿Cuánto Falta para Nerdearla 🇦🇷 2024?") }}</h2>
<div class="timer d-flex flex-column flex-sm-row align-items-center justify-content-center">
<div class="timer-item">
<div class="timer-number days bg-trama bg-trama-red-1 bg-trama-fit "></div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/hero.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<div class="darken-overlay"></div>
{# <a href="https://nerdear.la/qr" class="custom_button_qr">{{ _("Ingresá con QR") }}</a> #}
<div class="logo"></div>
<p class="blurb no-border text-center">{{ _("11 al 13 de abril, 2024 - Santiago de Chile") }}<br /><br />
<a href="https://nerdear.live" class="custom_button_vivo">{{ _("¡Mira en vivo!") }}</a>
<p class="blurb no-border text-center">{{ _("24 al 28 de septiembre, 2024 - Buenos Aires") }}<br /><br />
<a href="https://www.youtube.com/watch?v=IdOO3R_1F08&list=PLTTdzfRyGY1t7ptQDKXt9D4CaQvwGPI-n" class="custom_button_vivo">{{ _("¡Revive Chile 2024!") }}</a>
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/intro.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="container">
<div class="row d-flex flex-column flex-md-row align-items-center">
<div class="col-4 align-items-center">
<h1 class="display-4 fw-medium">{{ _("3 veces más grande que cualquier otra conferencia en Buenos Aires") }}</h1>
<h1 class="display-4 fw-medium">{{ _("3 veces más grande que cualquier otra conferencia en en Mundo") }}</h1>
<p>
{# TODO: Traducir esto #}
{{ _("Access cutting-edge Product Management industry trends and networking opportunities at ProductCon London, organized by Product School. Get the European perspective on Product during a time when the field is spreading throughout the continent") }}
Expand Down
12 changes: 6 additions & 6 deletions app/templates/components/location.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@
width:max-content;
margin-left:-6rem">{{ _("Evento presencial") }}</h2>
<p class="fs-4 mb-5 lh-sm">
<a href="https://gam.cl/"
<a href="https://www.cckonex.org/"
class="link-dark"
target="_blank"
rel="noopener noreferrer">{{ _("Centro Gabriela Mistral") }}</a>, {{ _("con streaming en vivo para todo el mundo.") }}
rel="noopener noreferrer">{{ _("Ciudad Cultural Konex") }}</a>, {{ _("con streaming en vivo para todo el mundo.") }}
<br>
{{ _("Av. Alameda Libertador Bernardo O'Higgins 227, Santiago, Región Metropolitana.") }}
{{ _("Sarmiento 3131, C1196 Ciudad Autónoma de Buenos Aires.") }}
</p>
{# Explanation for why the iframe is repeated https://stackoverflow.com/a/72136495/15965186 #}
{# Display me when more than sm #}
<div class="d-none d-sm-block ratio ratio-21x9">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3329.3786999960917!2d-70.64237502348146!3d-33.439438896949746!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x9662c59b6ee5a887%3A0x43a746bfa98d9592!2sCentre%20Gabriela%20Mistral!5e0!3m2!1sen!2scl!4v1697755793826!5m2!1sen!2scl"
<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d13135.619080571425!2d-58.4105342!3d-34.6065695!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x95bcb577e34f9e55%3A0x6dd823092cb367d9!2sCiudad%20Cultural%20Konex!5e0!3m2!1sen!2sar!4v1715471914395!5m2!1sen!2sar"
allowfullscreen=""
title="Ubicacion Nerdearla Chile 2024"
title="Ubicacion Nerdearla Buenos Aires 2024"
loading="lazy"
referrerpolicy="no-referrer-when-downgrade"
style="outline: 1px solid white;
outline-offset: 2rem"></iframe>
</div>
{# Display me when less than sm#}
<div class="d-block d-sm-none ratio ratio-1x1">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3329.3786999960917!2d-70.64237502348146!3d-33.439438896949746!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x9662c59b6ee5a887%3A0x43a746bfa98d9592!2sCentre%20Gabriela%20Mistral!5e0!3m2!1sen!2scl!4v1697755793826!5m2!1sen!2scl"
<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d13135.619080571425!2d-58.4105342!3d-34.6065695!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x95bcb577e34f9e55%3A0x6dd823092cb367d9!2sCiudad%20Cultural%20Konex!5e0!3m2!1sen!2sar!4v1715471914395!5m2!1sen!2sar"
allowfullscreen=""
loading="lazy"
referrerpolicy="no-referrer-when-downgrade"></iframe>
Expand Down
20 changes: 8 additions & 12 deletions app/templates/components/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,14 @@
<div class="navbar-nav me-auto justify-content-center align-items-center">
{# Put the items (apart of brand) of the navbar here #}
<a class="nav-link nav-item" href="{{ url_for('index', lang_code=lang_code) }}">{{ _("Home") }}</a>
<a class="nav-link nav-item"
href="https://reg.nerdear.la/?utm_source=navbar"><span style="color:#ffaf00">{{ _("Regístrate gratuitamente") }}</span></a>
<a class="nav-link nav-item" href="{{ url_for('agenda', lang_code=lang_code) }}">{{ _("Agenda") }}</a>
<a class="nav-link nav-item" href="https://reg.nerdear.la/qr">{{ _("Ingresa con QR") }}</a>
{#<a class="nav-link nav-item" href="https://reg.nerdear.la/?utm_source=navbar"><span style="color:#ffaf00">{{ _("Regístrate gratuitamente") }}</span></a>#}
{#<a class="nav-link nav-item" href="{{ url_for('agenda', lang_code=lang_code) }}">{{ _("Agenda") }}</a>#}
{#<a class="nav-link nav-item" href="https://reg.nerdear.la/qr">{{ _("Ingresa con QR") }}</a>#}
<a class="nav-link nav-item" href="{{ url_for('sponsors', lang_code=lang_code) }}">{{ _("Sponsors") }}</a>
{# <a href="{{ url_for('code_of_conduct', lang_code=lang_code) }}" class="nav-item nav-link px-2 text-white">{{ _("Código de Conducta") }}</a> #}
<a class="nav-link nav-item"
href="https://nerdear.live/sponsors">{{ _("Stands virtuales") }}</a>
{# <a class="nav-link nav-item"
href="https://nerdear.live/jobs">{{ _("Búsquedas laborales") }}</a>
{# <a class="nav-link nav-item"
href="https://nerdear.la/qr"><span style="color:#ffaf00">{{ _("Ingresá con QR") }}</span></a> #}
{# <a class="nav-link nav-item" href="https://nerdear.live/sponsors">{{ _("Stands virtuales") }}</a> #}
{# <a class="nav-link nav-item" href="https://nerdear.live/jobs">{{ _("Búsquedas laborales") }}</a>#}
{# <a class="nav-link nav-item" href="https://nerdear.la/qr"><span style="color:#ffaf00">{{ _("Ingresá con QR") }}</span></a> #}
</div>
{# Lang menu #}
<div class="lang-nav ms-auto">
Expand Down Expand Up @@ -76,11 +72,11 @@
<i class="fab fa-twitter text-white"></i>
</a>
</div>
<div class="navbar-nav d-flex justify-content-center align-items-center">
<!-- <div class="navbar-nav d-flex justify-content-center align-items-center">
{# Register button #}
<a href="https://nerdear.live"
class="custom_button">{{ _("¡Mira el evento en vivo!") }}</a>
</div>
</div> -->
</div>
</div>
</nav>
Expand Down
12 changes: 6 additions & 6 deletions app/templates/components/statistics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ <h2 class="mx-auto my-4 bg-black px-5 title-container">{{ _("Así fue nuestro ev
name="tabs-state"
id="tab-four">
<div class="tabs flex-tabs">
<label for="tab-one" id="tab-one-label" class="tab">800</label>
<label for="tab-two" id="tab-two-label" class="tab">5K</label>
<label for="tab-three" id="tab-three-label" class="tab">150</label>
<label for="tab-one" id="tab-one-label" class="tab">10000</label>
<label for="tab-two" id="tab-two-label" class="tab">25K</label>
<label for="tab-three" id="tab-three-label" class="tab">200</label>
<label for="tab-four" id="tab-four-label" class="tab">100%</label>
<div id="tab-one-panel" class="panel active">
<p>{{ _("Más de 800 participantes presenciales en Santiago de Chile.") }}</p>
<p>{{ _("Más de 10.000 participantes presenciales en Buenos Aires.") }}</p>
</div>
<div id="tab-two-panel" class="panel">
<p>{{ _("Más de 5.000 participantes online durante las conferencias.") }}</p>
<p>{{ _("Más de 25.000 participantes online durante las conferencias.") }}</p>
</div>
<div id="tab-three-panel" class="panel">
<p>{{ _("Más de 150 speakers de la región.") }}</p>
<p>{{ _("Más de 200 speakers provenientes de 15 países.") }}</p>
</div>
<div id="tab-four-panel" class="panel">
<p>{{ _("El evento es") }} 100% {{ _("gratuito, desde el día 0.") }}</p>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</div>
<div class="bg-nerd-yellow px-5 py-3">
{% if not sponsors_error %}
<h2 class="text-center fw-bold my-5">{{ _("Nerdearla 🇨🇱 2024 es posible gracias a") }}</h2>
<h2 class="text-center fw-bold my-5">{{ _("Nerdearla 🇦🇷 2024 es posible gracias a") }}</h2>
<div class="container bg-white py-1">
{% include "components/sponsors_generator.html" %}
<div class="d-flex flex-column align-items-center justify-content-center mb-5">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/sponsors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<div class="ms-md-4">
<h1 class="display-1 fw-bold text-white">{{ _("Nerdearla es posible gracias a nuestros maravillosos sponsors") }}</h1>
<h3 class="text-white">
{{ _("Desde 2014, nuestro objetivo ha sido organizar un evento de clase mundial para personas en América Latina, con entrada") }}
{{ _("Desde 2014, organizamos un evento de clase mundial para personas en América Latina, con entrada") }}
100%
{{ _("gratuita. Eso no sería posible sin nuestros patrocinadores y las organizaciones que nos apoyan.") }}
<br>
Expand Down
Loading
Loading