Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: python-spain/web-pycones
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2020
Choose a base ref
...
head repository: python-vigo/PyDayGalicia-2017
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master-pyday
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Mar 18, 2017

  1. v0.0.1

    Ivan Nieto committed Mar 18, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    97fd6f1 View commit details
  2. Update README

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    7d8a48d View commit details
  3. Update gitignore

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    30b971c View commit details
  4. Remove lib

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    3790f08 View commit details
  5. Update README

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    df8b550 View commit details
  6. Update README

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    7e60d68 View commit details
  7. Update README

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    42c3c87 View commit details
  8. Change namespaces to pydaygal

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    6aa3fd3 View commit details
  9. Change README.rst to README.md

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    ff4a871 View commit details
  10. Uncomment gunicorn-local.sh

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    7b83d04 View commit details
  11. Comment travis db until production deployment

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    9a49382 View commit details
  12. Workshops fully working

    Ivan Nieto committed Mar 18, 2017
    Copy the full SHA
    967c2bf View commit details

Commits on Mar 22, 2017

  1. base

    Ivan Nieto committed Mar 22, 2017
    Copy the full SHA
    7afbbd0 View commit details
  2. Update README.md

    Ivan Nieto committed Mar 22, 2017
    Copy the full SHA
    5db32d2 View commit details

Commits on Mar 25, 2017

  1. Add random placeholder images for mocking up

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    9a0403b View commit details
  2. Rename virtual environment and cleanup

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    397d3e6 View commit details
  3. Update README.md

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    37eeb43 View commit details
  4. Remove hover.css dependency

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    fc3aafa View commit details
  5. Modify script to run in CentOS server

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    7c568c4 View commit details
  6. Fix development build stack

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    192b546 View commit details
  7. Format file

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    c9d8556 View commit details
  8. Add dummy logo placeholders

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    3aef106 View commit details
  9. Add material cards styles

    Ivan Nieto committed Mar 25, 2017
    Copy the full SHA
    39a83da View commit details

Commits on Mar 26, 2017

  1. Delete unused css files

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    d6d315f View commit details
  2. Format info page

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    7e6a78c View commit details
  3. Add cards.css

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    0324897 View commit details
  4. Add width 100% to img-responsive

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    6fa732a View commit details
  5. Format container

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    0c53c53 View commit details
  6. Format container

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    c5667f5 View commit details
  7. Add loop to get dummy speakers

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    fe705ef View commit details
  8. Add loop to get dummy workshops

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    08410db View commit details
  9. Remove unused import

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    d2f04eb View commit details
  10. Reformat speaker view

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    871a377 View commit details
  11. Reformat workshop view

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    00726d3 View commit details
  12. Add header style

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    af18385 View commit details
  13. Add dummy logo images

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    a36cae7 View commit details
  14. Add dummy logo images

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    0964e89 View commit details
  15. Beautify settings

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    643ad99 View commit details
  16. Format view

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    bed671b View commit details
  17. Fix navbar logo display on small devices

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    67d43a2 View commit details
  18. Format view

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    00b1c7e View commit details
  19. Uncomment for local development

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    9c0597d View commit details
  20. Add schedules and proposals urls

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    b14b57a View commit details
  21. Remove unused style

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    b226f53 View commit details
  22. Remove unused apps

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    19c9e8f View commit details
  23. Fix footer position

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    739b17d View commit details
  24. Fix migrations

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    88c9de3 View commit details
  25. Fix migrations

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    62d2425 View commit details
  26. Fix migrations

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    133501c View commit details
  27. Change attribute type

    Ivan Nieto committed Mar 26, 2017
    Copy the full SHA
    136b2e7 View commit details
Showing 357 changed files with 48,168 additions and 8,383 deletions.
15 changes: 12 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -43,6 +43,9 @@ htmlcov
# Pycharm
.idea

# VSCode
.vscode/

# Vim

*~
@@ -57,12 +60,18 @@ node_modules/

# virtual environments
.env
lib/
lib/python3.5/
venv/
.venv/

# Build files
pycones/static/css/*.css
pycones/static/js/bin/*.js
pydaygal/static/css/*.css
pydaygal/static/js/bin/*.js
pydaygal/static/images/dummy-pics
pydaygal/static/images/dummy-logos
public/


# Media files
pycones/media/
pydaygal/media/
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ services:
addons:
postgresql: "9.5"

env:
- DATABASE_URL=postgres://postgres@localhost:5432/pycones2017
#env:
# - DATABASE_URL=postgres://postgres@172.19.0.2:5432/pydaygal2017

before_script:
- psql -c 'create database pycones2017;' -U postgres
- psql -c 'create database pydaygal2017;' -U postgres

before_install:
- pip install --quiet coveralls
35 changes: 23 additions & 12 deletions README.rst → README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
================
PyConES 2017 Web
================

Web page made for PyConES 2017, made with Django with :heart:.
# PyDay Galicia 2017 Website

Web page made for PyDay Galicia 2017, developed with Django with :heart:.

<!-- .. image:: https://travis-ci.org/python-spain/PyConES-2017.svg?branch=master
.. :target: https://travis-ci.org/python-spain/PyConES-2017 -->

Development
----------------------------

For development run this on your terminal into the project root folder:

```bash
$ python3 -m venv .venv && \
source .venv/bin/activate \
bash ./run-local.sh
```

This will install all required dependencies and will start to serve on localhost:8000.

.. image:: https://travis-ci.org/python-spain/PyConES-2017.svg?branch=master
:target: https://travis-ci.org/python-spain/PyConES-2017

Deploy with Docker
------------------

To deploy using docker, first we've to create a ``.env`` file with the
credentials of the database, secret key, etc.

.. code-block:: bash
```bash
$ cp env.example .env
```
The available environment variables are:

- ``POSTGRES_PASSWORD`` Postgres database password
@@ -33,7 +45,6 @@ The available environment variables are:
The default values are ready to run the containers in a development machine using **production
configuration**. Then, we've have to use Docker Compose to bring it up.

.. code-block:: bash
```bash
$ docker-compose up -d
```
6 changes: 4 additions & 2 deletions compose/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM nginx:latest

# Nginx config
ADD ./compose/nginx/nginx.conf /etc/nginx/nginx.conf
RUN mkdir /usr/share/nginx/html/.well-known
RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
RUN apt-get update
RUN apt-get install -y software-properties-common curl vim
23 changes: 22 additions & 1 deletion compose/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

user nginx;
worker_processes 1;

@@ -27,8 +28,21 @@ http {
}

server {
listen 5002;
listen 80;
return 301 https://$host$request_uri;
}

server {
listen 443;
server_name pyday2017.python-vigo.es;
charset utf-8;
ssl_certificate /etc/letsencrypt/live/pyday2017.python-vigo.es/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/pyday2017.python-vigo.es/privkey.pem;
ssl on;
ssl_session_cache builtin:1000 shared:SSL:10m;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
ssl_prefer_server_ciphers on;

location /favicon.ico {
alias /public/favicon.ico;
@@ -42,6 +56,10 @@ http {
alias /media/;
}

location /.well-known {
alias /usr/share/nginx/html/.well-known;
}

location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
@@ -52,3 +70,6 @@ http {
}

}

# 7 - Reiniciar Nginx
# service nginx reload
1 change: 1 addition & 0 deletions compose/webapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y \
build-essential \
git \
libpq-dev \
vim \
python3 \
python3-dev \
python3-pip \
69 changes: 39 additions & 30 deletions config/settings/common.py
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
ROOT_DIR = environ.Path(__file__) - 3

# environ.Path value to the project directory:
APPS_DIR = ROOT_DIR.path('pycones')
APPS_DIR = ROOT_DIR.path('pydaygal')

# Absolute filesystem path to the config directory:
CONFIG_ROOT = str(APPS_DIR.path("config"))
@@ -50,7 +50,7 @@
# ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#admins
ADMINS = (
("Marcos Gabarda", 'hey@marcosgabarda.com'),
("Ivan Nieto", 'ivan.n.s@tuta.io'),
)

# See: https://docs.djangoproject.com/en/dev/ref/settings/#managers
@@ -62,14 +62,15 @@
TIME_ZONE = 'UTC'

# https://docs.djangoproject.com/en/dev/ref/settings/#language-code
LANGUAGE_CODE = 'es'
ugettext = lambda s: s
LANGUAGE_CODE = 'gl'


def ugettext(s): return s


LANGUAGES = (
('gl', ugettext(u'Galego')),
('es', ugettext(u'Español')),
('ca', ugettext(u'Catalán')),
('gl', ugettext(u'Gallego')),
('eu', ugettext(u'Euskera')),
('en', ugettext(u'English')),
)
LOCALE_PATHS = (
str(APPS_DIR.path('locale')),
@@ -89,7 +90,8 @@

# FIXTURE CONFIGURATION
# ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FIXTURE_DIRS
# See:
# https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FIXTURE_DIRS
FIXTURE_DIRS = (
str(APPS_DIR.path('fixtures')),
)
@@ -112,8 +114,10 @@
# EMAIL
# ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
DEFAULT_FROM_EMAIL = env('DJANGO_DEFAULT_FROM_EMAIL', default='{} <noreply@{}>'.format(PROJECT_NAME, PROJECT_DOMAIN))
EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX', default='[{}] '.format(PROJECT_NAME))
DEFAULT_FROM_EMAIL = env('DJANGO_DEFAULT_FROM_EMAIL',
default='{} <noreply@{}>'.format(PROJECT_NAME, PROJECT_DOMAIN))
EMAIL_SUBJECT_PREFIX = env(
'DJANGO_EMAIL_SUBJECT_PREFIX', default='[{}] '.format(PROJECT_NAME))
SERVER_EMAIL = env('DJANGO_SERVER_EMAIL', default=DEFAULT_FROM_EMAIL)

# TEMPLATE CONFIGURATION
@@ -135,8 +139,8 @@
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'django.template.context_processors.request',
'pycones.utils.context_processors.project_settings',
'pycones.configurations.context_processors.options',
'pydaygal.utils.context_processors.project_settings',
'pydaygal.configurations.context_processors.options',
],
'loaders': [
'django.template.loaders.filesystem.Loader',
@@ -170,14 +174,15 @@

# Apps specific for this project go here.
LOCAL_APPS = (
'pycones.utils',
'pycones.users',
'pycones.configurations',
'pycones.blog',
'pycones.sponsorships',
'pycones.proposals',
'pycones.reviewers',
'pycones.speakers',
'pydaygal.utils',
'pydaygal.users',
'pydaygal.configurations',
'pydaygal.schedule',
'pydaygal.sponsorships',
'pydaygal.speakers',
'pydaygal.workshops',
'pydaygal.multimedia',
'pydaygal.registration'
)

# See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
@@ -200,12 +205,14 @@
# See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
STATIC_URL = '/static/'

# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
# See:
# https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
STATICFILES_DIRS = (
str(APPS_DIR.path('static')),
)

# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders
# See:
# https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
@@ -235,7 +242,8 @@

# PASSWORD VALIDATION
# ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
# See:
# https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
{
@@ -287,9 +295,10 @@
# PROJECT CUSTOM SETTINGS
# ------------------------------------------------------------------------------
# This values may vary during the life of the conference.
LANDING_GLOBAL_REDIRECT = env.bool('PYCONES_LANDING_GLOBAL_REDIRECT', default=False)
CONFERENCE_TITLE = "PyConES 2017"
CONTACT_EMAIL = "contact2017@es.pycon.org"
SPONSORS_EMAIL = "sponsors2017@es.pycon.org"
CFP_EMAIL = "cfp2017@es.pycon.org"
PRESS_EMAIL = "press2017@es.pycon.org"
LANDING_GLOBAL_REDIRECT = env.bool(
'PYDAYGAL_LANDING_GLOBAL_REDIRECT', default=False)
CONFERENCE_TITLE = "PyDay Galicia 2017"
CONTACT_EMAIL = "pydaygalicia@python-vigo.es"
SPONSORS_EMAIL = "pydaygalicia@python-vigo.es"
CFP_EMAIL = "pydaygalicia@python-vigo.es"
PRESS_EMAIL = "pydaygalicia@python-vigo.es"
31 changes: 21 additions & 10 deletions config/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, print_function, division, absolute_import

from django.conf import settings
@@ -9,15 +8,22 @@
from django.utils.translation import ugettext_lazy as _
from django.views import defaults as default_views
from django.views.generic import TemplateView
from pydaygal.registration.views import RegistrationRedirectView

# URLs with with i18n
urlpatterns = i18n_patterns(
url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name="home"),
url(r'^code-of-conduct/$', TemplateView.as_view(template_name='pages/code_of_conduct.html'), name="code-of-conduct"),
url(r'^reg/', TemplateView.as_view(template_name='pages/registration.html'), name='reg'),
url(r'^registration/$', RegistrationRedirectView.as_view(), name="registration"),
url(r'^schedule/', include('pydaygal.schedule.urls', namespace="schedule")),
url(r'^code-of-conduct/$', TemplateView.as_view(
template_name='pages/code_of_conduct.html'), name="code-of-conduct"),
url(r'^info/$', TemplateView.as_view(template_name='pages/info.html'), name="info"),
url(r'^blog/', include('pycones.blog.urls', namespace="blog")),
url(r'^users/', include('pycones.users.urls', namespace="users")),

url(r'^cfp/', TemplateView.as_view(template_name='pages/cfp.html'), name="cfp"),
url(r'^speakers/', include('pydaygal.speakers.urls', namespace="speakers")),
url(r'^users/', include('pydaygal.users.urls', namespace="users")),
url(r'^workshops/', include('pydaygal.workshops.urls', namespace="workshops")),
url(r'^multimedia/', include('pydaygal.multimedia.urls', namespace="multimedia")),
)

# URLs without i18n
@@ -29,7 +35,8 @@
# Override all links if the landing page is set
if settings.LANDING_GLOBAL_REDIRECT:
urlpatterns = [
url(r'^$', TemplateView.as_view(template_name='pages/landing.html'), name="landing"),
url(r'^$', TemplateView.as_view(
template_name='pages/landing.html'), name="landing"),
]

# Django Admin, use {% url 'admin:index' %}
@@ -43,9 +50,12 @@
# This allows the error pages to be debugged during development, just visit
# these url in browser to see how these error pages look like.
urlpatterns += [
url(r'^400/$', default_views.bad_request, kwargs={'exception': Exception('Bad Request!')}),
url(r'^403/$', default_views.permission_denied, kwargs={'exception': Exception('Permission Denied')}),
url(r'^404/$', default_views.page_not_found, kwargs={'exception': Exception('Page not Found')}),
url(r'^400/$', default_views.bad_request,
kwargs={'exception': Exception('Bad Request!')}),
url(r'^403/$', default_views.permission_denied,
kwargs={'exception': Exception('Permission Denied')}),
url(r'^404/$', default_views.page_not_found,
kwargs={'exception': Exception('Page not Found')}),
url(r'^500/$', default_views.server_error),
]

@@ -58,4 +68,5 @@
]

# Only access directly to MEDIA when DEBUG is True
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += static(settings.MEDIA_URL,
document_root=settings.MEDIA_ROOT)
4 changes: 2 additions & 2 deletions dev.yml
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@ services:

db:
image: postgres:9.6
container_name: pycones-db
container_name: pydaygal-db
volumes:
- db-data:/var/lib/postgresql
ports:
- "5432:5432"
environment:
POSTGRES_PASSWORD: potato
POSTGRES_DB: pycones2017
POSTGRES_DB: pydaygal2017
Loading