From d1e73cdf0899143674fed10ca95e81b4f825b119 Mon Sep 17 00:00:00 2001 From: Sergio Delgado Quintero Date: Tue, 12 Oct 2021 18:02:20 +0000 Subject: [PATCH 1/5] Add model for allies --- apps/about/admin.py | 13 +++++++++++++ apps/about/migrations/0001_initial.py | 26 ++++++++++++++++++++++++++ apps/about/models.py | 12 ++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 apps/about/admin.py create mode 100644 apps/about/migrations/0001_initial.py create mode 100644 apps/about/models.py diff --git a/apps/about/admin.py b/apps/about/admin.py new file mode 100644 index 00000000..5dd496f4 --- /dev/null +++ b/apps/about/admin.py @@ -0,0 +1,13 @@ +from django.contrib import admin + +from . import models + + +@admin.register(models.Ally) +class AllyAdmin(admin.ModelAdmin): + list_display = ( + 'name', + 'url', + 'twitter', + 'email', + ) diff --git a/apps/about/migrations/0001_initial.py b/apps/about/migrations/0001_initial.py new file mode 100644 index 00000000..f9968f08 --- /dev/null +++ b/apps/about/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# Generated by Django 2.2.24 on 2021-10-12 17:37 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Ally', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=120, verbose_name='Nombre')), + ('description', models.CharField(max_length=220, verbose_name='Descripción')), + ('logo', models.ImageField(blank=True, upload_to='about/allies/')), + ('url', models.URLField(blank=True)), + ('twitter', models.URLField(blank=True)), + ('email', models.EmailField(blank=True, max_length=254)), + ], + ), + ] diff --git a/apps/about/models.py b/apps/about/models.py new file mode 100644 index 00000000..58b6aec6 --- /dev/null +++ b/apps/about/models.py @@ -0,0 +1,12 @@ +from django.db import models + + +class Ally(models.Model): + '''Organizaciones/Asociaciones aliadas''' + + name = models.CharField('Nombre', max_length=120) + description = models.CharField('Descripción', max_length=220) + logo = models.ImageField(upload_to='about/allies/', blank=True) + url = models.URLField(blank=True) + twitter = models.URLField(blank=True) + email = models.EmailField(blank=True) From ce70b3faf5655b2496fc64ad1c4c142c3a4d0cc3 Mon Sep 17 00:00:00 2001 From: Sergio Delgado Quintero Date: Tue, 12 Oct 2021 19:36:34 +0000 Subject: [PATCH 2/5] Render allies in template --- apps/about/models.py | 6 ++++ apps/about/static/about/css/allies.scss | 21 ++++++++++++++ apps/about/static/about/css/main.scss | 6 ++-- apps/about/templates/about/allies.html | 37 +++++++++++++++++++++++++ apps/about/urls.py | 1 + apps/about/views.py | 7 +++++ apps/commons/templates/header.html | 1 + 7 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 apps/about/static/about/css/allies.scss create mode 100644 apps/about/templates/about/allies.html diff --git a/apps/about/models.py b/apps/about/models.py index 58b6aec6..5f9ca1ee 100644 --- a/apps/about/models.py +++ b/apps/about/models.py @@ -10,3 +10,9 @@ class Ally(models.Model): url = models.URLField(blank=True) twitter = models.URLField(blank=True) email = models.EmailField(blank=True) + + def __str__(self): + return self.name + + class Meta: + ordering = ['name'] diff --git a/apps/about/static/about/css/allies.scss b/apps/about/static/about/css/allies.scss new file mode 100644 index 00000000..721edf4d --- /dev/null +++ b/apps/about/static/about/css/allies.scss @@ -0,0 +1,21 @@ +.ally-block { + margin-bottom: 2rem; + img { + width: 5rem; + vertical-align: middle; + } + p.description { + i.quote { + color: gray; + } + } + ul { + list-style-type: none; + margin-left: 1rem; + padding-left: 1rem; + border-left: 2px solid lightgray; + i { + width: 1.5rem; + } + } +} diff --git a/apps/about/static/about/css/main.scss b/apps/about/static/about/css/main.scss index 71c3dd65..68dd4eb2 100644 --- a/apps/about/static/about/css/main.scss +++ b/apps/about/static/about/css/main.scss @@ -1,9 +1,11 @@ @import 'apps/commons/static/commons/css/base'; +@import './allies'; + .about-index { p { - padding-top: .5rem; - padding-bottom: .5rem; + padding-top: 0.5rem; + padding-bottom: 0.5rem; } .message a.headerlink { diff --git a/apps/about/templates/about/allies.html b/apps/about/templates/about/allies.html new file mode 100644 index 00000000..82b3f945 --- /dev/null +++ b/apps/about/templates/about/allies.html @@ -0,0 +1,37 @@ +{% extends "about/base.html" %} +{% load utils %} +{% load static %} + +{% block title %}Aliados - {{ block.super }}{% endblock %} + +{% block content %} + +
+ +

Aliados

+ +

+Canarias es un territorio muy prolífico en el campo de las nuevas tecnologías. Las organizaciones y asociaciones de este sector constituyen un punto de entrada para muchos usuarios y usuarias. Aquello de que la unión hace la fuerza es un principio que seguimos desde Python Canarias. Si bien apostamos, como era de esperar, por nuestro lenguaje de programación favorito, somos una comunidad abierta y nos encanta construir sinergias con otros grupos. Aquí les dejamos un listado de nuestros aliados: +

+ +{% for ally in allies %} +
+

{{ ally.name }}

+

{{ ally.description }}

+ +
+{% endfor %} + +
+ +{% endblock content %} diff --git a/apps/about/urls.py b/apps/about/urls.py index 58ebebc2..d9c0caab 100644 --- a/apps/about/urls.py +++ b/apps/about/urls.py @@ -9,4 +9,5 @@ path('us/', views.us, name='us'), path('join/', views.join, name='join'), path('history/', views.history, name='history'), + path('allies/', views.allies, name='allies'), ] diff --git a/apps/about/views.py b/apps/about/views.py index 91eae738..e037d9e0 100644 --- a/apps/about/views.py +++ b/apps/about/views.py @@ -4,6 +4,8 @@ from apps.members.models import Position +from .models import Ally + logger = logging.getLogger(__name__) @@ -28,3 +30,8 @@ def join(request): def history(request): return render(request, 'about/history.html', {}) + + +def allies(request): + allies = Ally.objects.all() + return render(request, 'about/allies.html', {'allies': allies}) diff --git a/apps/commons/templates/header.html b/apps/commons/templates/header.html index c398fdbe..9f932706 100644 --- a/apps/commons/templates/header.html +++ b/apps/commons/templates/header.html @@ -24,6 +24,7 @@ Información Historia ¡Únete! + Aliados
From 285ba540203c93736b607ed6baea0182eadd82f9 Mon Sep 17 00:00:00 2001 From: Sergio Delgado Quintero Date: Wed, 13 Oct 2021 15:54:06 +0000 Subject: [PATCH 3/5] Add dynamic anchors --- apps/about/templates/about/allies.html | 7 +++++-- apps/commons/static/commons/css/base.scss | 3 ++- .../static/commons/css/dyn-anchors.scss | 15 +++++++++++++++ .../static/commons/js/general/dyn-anchors.js | 18 ++++++++++++++++++ .../commons/static/commons/js/general/index.js | 2 ++ 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 apps/commons/static/commons/css/dyn-anchors.scss create mode 100644 apps/commons/static/commons/js/general/dyn-anchors.js diff --git a/apps/about/templates/about/allies.html b/apps/about/templates/about/allies.html index 82b3f945..8f5f2dc8 100644 --- a/apps/about/templates/about/allies.html +++ b/apps/about/templates/about/allies.html @@ -15,8 +15,11 @@

Aliados

{% for ally in allies %} -
-

{{ ally.name }}

+
+

+ {{ ally.name }} + +

{{ ally.description }}

    {% if ally.url %} diff --git a/apps/commons/static/commons/css/base.scss b/apps/commons/static/commons/css/base.scss index b7e35e55..3f84574b 100644 --- a/apps/commons/static/commons/css/base.scss +++ b/apps/commons/static/commons/css/base.scss @@ -1,6 +1,7 @@ @import './variables'; @import '~bulma/bulma.sass'; @import './override'; +@import './dyn-anchors'; html { // source: https://stackoverflow.com/q/46463338 @@ -122,4 +123,4 @@ body { border-radius: 22.5px; border-color: $header-bg; background-color: whitesmoke; -} \ No newline at end of file +} diff --git a/apps/commons/static/commons/css/dyn-anchors.scss b/apps/commons/static/commons/css/dyn-anchors.scss new file mode 100644 index 00000000..19ad1a05 --- /dev/null +++ b/apps/commons/static/commons/css/dyn-anchors.scss @@ -0,0 +1,15 @@ +.dyn-anchor-heading { + a.dyn-anchor-link { + font-size: 14pt; + color: skyblue; + margin-bottom: 5px; + vertical-align: middle; + opacity: 0; + &:hover { + color: darken(skyblue, 40%); + } + &.show-it { + opacity: 1; + } + } +} diff --git a/apps/commons/static/commons/js/general/dyn-anchors.js b/apps/commons/static/commons/js/general/dyn-anchors.js new file mode 100644 index 00000000..4a403613 --- /dev/null +++ b/apps/commons/static/commons/js/general/dyn-anchors.js @@ -0,0 +1,18 @@ +function init() { + document.querySelectorAll('.dyn-anchor-heading').forEach((item) => { + item.addEventListener('mouseenter', function(event) { + event.preventDefault() + let anchor = event.target.querySelector('.dyn-anchor-link') + anchor.classList.add('show-it') + }) + item.addEventListener('mouseleave', function(event) { + event.preventDefault() + let anchor = event.target.querySelector('.dyn-anchor-link') + anchor.classList.remove('show-it') + }) + }) +} + +export default { + init +} diff --git a/apps/commons/static/commons/js/general/index.js b/apps/commons/static/commons/js/general/index.js index 5431bfd6..f6574d51 100644 --- a/apps/commons/static/commons/js/general/index.js +++ b/apps/commons/static/commons/js/general/index.js @@ -2,6 +2,7 @@ import NavbarBurger from './navbar-burger' import Notifications from './notifications' import Collapsable from './collapsable' import ScrollUpButton from './scrollUpButton' +import DynAnchors from './dyn-anchors' export default { init: () => { @@ -9,5 +10,6 @@ export default { Notifications.init() Collapsable.init() ScrollUpButton.init() + DynAnchors.init() }, } From 2ff50128a166b018f7e317f3c73720fa4d1f3dd5 Mon Sep 17 00:00:00 2001 From: Sergio Delgado Quintero Date: Wed, 13 Oct 2021 18:08:24 +0000 Subject: [PATCH 4/5] Mention allies on introduction --- apps/about/templates/about/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/about/templates/about/index.html b/apps/about/templates/about/index.html index 660ddee9..47605f33 100644 --- a/apps/about/templates/about/index.html +++ b/apps/about/templates/about/index.html @@ -23,7 +23,7 @@
    {{ organization.name }} es una asociación sin ánimo de lucro cuyos objetivos, son, entre otros, promover el uso del lenguaje de programación Python, dar soporte a quienes deseen aprenderlo y promover la programación como una competencia educativa básica.

    -

    La asociación fue creada el {{ organization.registration_date|date:"d/m/Y" }} y desde entonces ha organizado diferentes eventos de difusión del lenguaje de programación Python colaborando en el incremento de la comunidad de usuarios de Python en Canarias.

    +

    La asociación fue creada el {{ organization.registration_date|date:"d/m/Y" }} y desde entonces ha organizado diferentes eventos de difusión del lenguaje de programación Python colaborando en el incremento de la comunidad de usuarios de Python en Canarias y sumando aliados por el camino.

    Te recomendamos que no dejes de repasar la historia de Python Canarias.

    From 9b37cff4a2efeda41e8050b3b9f1044048b3bd77 Mon Sep 17 00:00:00 2001 From: Sergio Delgado Quintero Date: Wed, 13 Oct 2021 18:11:34 +0000 Subject: [PATCH 5/5] Fix style for dynamic anchors --- apps/commons/static/commons/css/dyn-anchors.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/commons/static/commons/css/dyn-anchors.scss b/apps/commons/static/commons/css/dyn-anchors.scss index 19ad1a05..c8027f66 100644 --- a/apps/commons/static/commons/css/dyn-anchors.scss +++ b/apps/commons/static/commons/css/dyn-anchors.scss @@ -1,12 +1,12 @@ .dyn-anchor-heading { a.dyn-anchor-link { font-size: 14pt; - color: skyblue; + color: gray; margin-bottom: 5px; vertical-align: middle; opacity: 0; &:hover { - color: darken(skyblue, 40%); + color: darken(gray, 20%); } &.show-it { opacity: 1;