Skip to content

Commit 36b9fba

Browse files
euribateseuribates
committed
Merging with prod changes
2 parents 574bb10 + 53f2eba commit 36b9fba

File tree

26 files changed

+21751
-123
lines changed

26 files changed

+21751
-123
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ jobs:
1616
host: pythoncanarias.es
1717
username: ${{ secrets.PRODUCTION_SSH_USERNAME }}
1818
key: ${{ secrets.PRODUCTION_SSH_KEY }}
19-
script: source ~/.virtualenvs/web/bin/activate && cd ~/web && ./deploy.sh
19+
script: cd ~/web && ./deploy.sh
20+
passphrase: ${{ secrets.PASS_PHRASE }}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ develop-eggs/
4040
dist/
4141
downloads/
4242
eggs/
43+
exported/
4344
lib/
4445
lib64/
4546
parts/
@@ -102,3 +103,4 @@ certificates/media
102103
.parcel-cache/
103104
fixtures/*
104105
backup.zip
106+
exported.zip

‎__init__.py‎

Whitespace-only changes.

‎apps/about/migrations/0005_alter_ally_options.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Generated by Django 3.2.25 on 2025-02-17 08:43
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('about', '0004_auto_20220510_2236'),
10+
]
11+
12+
operations = [
13+
migrations.AlterModelOptions(
14+
name='ally',
15+
options={'ordering': ['name'], 'verbose_name': 'Aliado', 'verbose_name_plural': 'Aliados'},
16+
),
17+
]

‎apps/about/templates/about/base.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
{% load utils %}
44

5-
{% block style %}
5+
{% block styles %}
6+
{{ block.super }}
67
<link rel="stylesheet" href="{{ assets|get_asset_key:'about/custom.min.css' }}">
7-
{% endblock style %}
8+
{% endblock styles %}

‎apps/certificates/management/commands/create_certificate.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from django.core.management.base import BaseCommand
44

5-
from certificates.utils import create_certificate
6-
from tickets.models import Ticket
5+
from apps.certificates.utils import create_certificate
6+
from apps.tickets.models import Ticket
77

88

99
class Command(BaseCommand):

‎apps/commons/static/commons/css/bulma.css‎

Lines changed: 21551 additions & 0 deletions
Large diffs are not rendered by default.

‎apps/commons/static/commons/css/bulma.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/commons/static/commons/css/bulma.min.css‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/commons/templates/base.html‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
1-
{% load static %}
2-
{% load utils %}
3-
4-
<!doctype html>
1+
{% load static utils %}<!doctype html>
52
<html lang="es">
63
<head>
74
<meta charset="utf-8">
8-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
9-
<meta name="description" content="">
10-
<meta name="author" content="">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<meta name="description" content="Python Canarias">
7+
<meta name="author" content="Python Canarias">
118

12-
<link rel="icon" href="{{ assets|get_asset_key:'commons/img/favicon.ico' }}">
9+
<link rel="icon" href="{% static 'commons/img/favicon.ico' %}">
1310

1411
<title>{% block title %}{{ organization.name }}{% endblock title %}</title>
1512

1613
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,400i,700" rel="stylesheet">
1714

18-
<link rel="stylesheet" href="{{ assets|get_asset_key:'commons/vendor.min.css' }}">
19-
{% block style %}{% endblock %}
15+
{% block styles %}
16+
<link rel="stylesheet" href="{% static 'commons/css/bulma.min.css' %}">
17+
{% endblock styles %}
18+
2019
</head>
2120
<body class="{% block body_class %}{% endblock %} has-navbar-fixed-top">
22-
21+
.
2322
{% include "header.html" %}
2423

2524
{% block container %}
2625

27-
{% if messages %}
28-
<div class="messages">
29-
{% for message in messages %}
30-
<div class="notification {{ message.tags|msgtag_to_bulmaclass }}">
31-
<button class="delete"></button>
32-
{{ message }}
33-
</div>
34-
{% endfor %}
35-
</div>
36-
{% endif %}
26+
{% if messages %}
27+
<div class="messages">
28+
{% for message in messages %}
29+
<div class="notification {{ message.tags|msgtag_to_bulmaclass }}">
30+
<button class="delete"></button>
31+
{{ message }}
32+
</div>
33+
{% endfor %}
34+
</div>
35+
{% endif %}
3736

38-
<div class="{% block default_content_class %}container content-page{% endblock %} {% block content_class %}{% endblock %}
37+
<div class="{% block default_content_class %}container content-page{% endblock %} {% block content_class %}{% endblock %}
3938
{% if menu %}
4039
is-wide
4140
{% endif %}
@@ -57,7 +56,7 @@
5756

5857
{% include "footer.html" %}
5958

60-
<script src="{{ assets|get_asset_key:'commons/custom.min.js' }}"></script>
59+
<script src="{% static 'commons/custom.min.js' %}"></script>
6160
{% block js %}
6261
{% if current_date.month == 12 and current_date.day >= 21 and current_date.day <= 31 %}
6362
<script src="https://app.embed.im/snow.js" defer></script>

0 commit comments

Comments
 (0)