EGCETSII · Thiloparn · Nov 3, 2020 · Nov 4, 2020 · Nov 11, 2020 · Nov 11, 2020
diff --git a/.gitignore b/.gitignore
@@ -101,3 +101,4 @@ ENV/
 .mypy_cache/
 
 .vagrant
+.vscode/settings.json
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>decide</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.python.pydev.PyDevBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.python.pydev.pythonNature</nature>
+ </natures>
+</projectDescription>
diff --git a/.pydevproject b/.pydevproject
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+ <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+ <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+</pydev_project>
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,32 @@
 dist: xenial
-
 services:
- - postgresql
+- postgresql
 addons:
- postgresql: "9.4"
+ postgresql: '9.4'
 before_script:
- - psql -U postgres -c "create user decide password 'decide'"
- - psql -U postgres -c "create database test_decide owner decide"
- - psql -U postgres -c "ALTER USER decide CREATEDB"
+- psql -U postgres -c "create user decide password 'decide'"
+- psql -U postgres -c "create database decidedb owner decide"
+- psql -U postgres -c "ALTER USER decide CREATEDB"
 language: python
 python:
- - "3.6"
+- '3.6'
 install:
- - pip install -r requirements.txt
- - pip install codacy-coverage
+- pip install -r requirements.txt
+- pip install codacy-coverage
 script:
- - cd decide
- - coverage run --branch --source=. ./manage.py test --keepdb --with-xunit
- - coverage xml
- - python-codacy-coverage -r coverage.xml
+- wget https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz
+- tar -xzf geckodriver-v0.27.0-linux64.tar.gz
+- chmod +x geckodriver 
+- sudo cp geckodriver /usr/bin/
+- rm geckodriver-v0.27.0-linux64.tar.gz
+- cd decide
+- cp travis_local_settings.py local_settings.py
+- coverage run --branch --source=. ./manage.py test authentication visualizer voting --keepdb
+- coverage xml
+- python-codacy-coverage -r coverage.xml
+deploy:
+ provider: heroku
+ app: picaro-decide
+ strategy: git
+ api_key:
+ secure: SDt7FSvAfUp9J0aA0vhQGKN7ZUfHvbyX/GMr/gVQmlkobFNWu9Wk8f5O2jzxEcHJfP9DKRPwzK5CF2d422bd/toKXEJldIoZL57YQnomlKElqetaLBoETyydhn/oZkkF+aTv/zZF92m2dQGetTlG6Zp1sqFSW9BwXFKBrMIh9XjqFton6AFDZ5DPCy6Gn9303OAkxtWmqG4EGTEzJ2VV9ambCEMs30ZSeAGn4eVbWC92CvSaef32aOBvKcHKSKIrBkN5Y0olYGHRj00s+tr0iBlVfxKyVb1lI6vwuuh85+8w2UGVXp+NCAEy+Dm1RLz3lhDi3hpIyXK1V9JCqw6arbuNgvB0vHvRuldAj8cw3lmpD9kLlmDfstyw5MJd8UAf22rwsI1nUA6Ga/qycAD1kOIOgPwF6oWLW16M+MOGE/+loZIj4NmQTs3wiYAemqwVqEHc9enViEAaSD2M2zUWPI7L2m9gd2iOll6UleKosqz9f8hQFBLKcaTuaoH5qRHAIPeSVIAZA+GmJhbj9lM++yVhZW5aJ0SVzx+RhGAXcgweVNtUIH8F2DU1Es001zNML90k+G47MpnGqfIHuZcxSVtttLS6raoJIHEQSNUzfwXsy4mBjnUzZvy4YeOf/DId8kb/Wrk0+8P/MOoaDVUEePae7rz4jRcHfHj1UXMPpd0=
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "python.pythonPath": "C:\\Python3\\python.exe"
+}
diff --git a/Procfile b/Procfile
@@ -0,0 +1,4 @@
+% prepara el repositorio para su despliegue. 
+release: sh -c 'cd decide && python manage.py migrate'
+% especifica el comando para lanzar Decide
+web: sh -c 'cd decide && gunicorn decide.wsgi --log-file -'
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 [![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=wadobo/decide&amp;utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage)
-
 Plataforma voto electrónico educativa
 =====================================
 

diff --git a/decide/base/templates/base.html b/decide/base/templates/base.html
@@ -1,14 +1,87 @@
 <!DOCTYPE html>
+{% load i18n static %}
 <html>
  <head>
  <meta charset="utf-8" />
- <title>{% block title %}Decide!{% endblock %}</title>
+ <title>Decide Pícaro{% block title %}{% endblock %}</title>
+ <link rel="shortcut icon" type="image/png" href="../../static/favicon/picaro.png" />
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+ <link rel="stylesheet" href="../../static/css/mfb.css" >
  {% block extrahead %}{% endblock %}
  </head>
  <body>
  {% block content %}
  {% endblock %}
-
+ <!-- Floating action button to select language -->
+ <form action="{% url 'set_language' %}" method="post">
+ {% csrf_token %}
+ <input name="next" type="hidden" value="{{ redirect_to }}" />
+ <ul id="menu" class="mfb-component--br mfb-zoomin" data-mfb-toggle="hover">
+ <li class="mfb-component__wrap">
+ <a class="pmd-floating-action-btn btn pmd-btn-fab pmd-btn-raised pmd-ripple-effect btn-dark">
+ <i class="fa fa-language"></i>
+ </a>
+ <ul class="mfb-component__list">
+ {% get_available_languages as LANGUAGES %}
+ {% get_language_info_list for LANGUAGES as languages %}
+ {% for lang in languages %}
+ <li>
+ {% get_current_language as LANGUAGE_CODE %}
+ {% if LANGUAGE_CODE == "es" %}
+ <button class="pmd-floating-action-btn btn btn-sm pmd-btn-fab pmd-btn-raised pmd-ripple-effect btn-light"
+ type="submit" value="{{lang.code}}" name="language"
+ {% if lang.code == "es" %} data-mfb-label="Español" 
+ {% elif lang.code == "en"%} data-mfb-label="Inglés" 
+ {% elif lang.code == "de"%} data-mfb-label="Alemán"
+ {% else %} data-mfb-label="Francés" {% endif %}>
+ <img width="30" {% if lang.code == "es" %} src="../../static/images/spain.jpg" 
+ {% elif lang.code == "en" %} src="../../static/images/england.jpg" 
+ {% elif lang.code == "de" %} src="../../static/images/german.jpg"
+ {% else %} src="../../static/images/france.jpg"{% endif %}> 
+ </button>
+ {% elif LANGUAGE_CODE == "en"%}
+ <button class="pmd-floating-action-btn btn btn-sm pmd-btn-fab pmd-btn-raised pmd-ripple-effect btn-light"
+ type="submit" value="{{lang.code}}" name="language"
+ {% if lang.code == "es" %} data-mfb-label="Spanish" 
+ {% elif lang.code == "en"%} data-mfb-label="English" 
+ {% elif lang.code == "de"%} data-mfb-label="German"
+ {% else %} data-mfb-label="French" {% endif %}>
+ <img width="30" {% if lang.code == "es" %} src="../../static/images/spain.jpg" 
+ {% elif lang.code == "en" %} src="../../static/images/england.jpg" 
+ {% elif lang.code == "de" %} src="../../static/images/german.jpg"
+ {% else %} src="../../static/images/france.jpg"{% endif %}> 
+ </button>
+ {% elif LANGUAGE_CODE == "de"%}
+ <button class="pmd-floating-action-btn btn btn-sm pmd-btn-fab pmd-btn-raised pmd-ripple-effect btn-light"
+ type="submit" value="{{lang.code}}" name="language"
+ {% if lang.code == "es" %} data-mfb-label="Spanisch" 
+ {% elif lang.code == "en"%} data-mfb-label="Englisch" 
+ {% elif lang.code == "de"%} data-mfb-label="Deutsch"
+ {% else %} data-mfb-label="Französisch" {% endif %}>
+ <img width="30" {% if lang.code == "es" %} src="../../static/images/spain.jpg" 
+ {% elif lang.code == "en" %} src="../../static/images/england.jpg" 
+ {% elif lang.code == "de" %} src="../../static/images/german.jpg"
+ {% else %} src="../../static/images/france.jpg"{% endif %}> 
+ </button>
+ {% else %}
+ <button class="pmd-floating-action-btn btn btn-sm pmd-btn-fab pmd-btn-raised pmd-ripple-effect btn-light"
+ type="submit" value="{{lang.code}}" name="language"
+ {% if lang.code == "es" %} data-mfb-label="Espagnol" 
+ {% elif lang.code == "en"%} data-mfb-label="Anglais" 
+ {% elif lang.code == "de"%} data-mfb-label="Allemand"
+ {% else %} data-mfb-label="Français" {% endif %}>
+ <img width="30" {% if lang.code == "es" %} src="../../static/images/spain.jpg" 
+ {% elif lang.code == "en" %} src="../../static/images/england.jpg" 
+ {% elif lang.code == "de" %} src="../../static/images/german.jpg"
+ {% else %} src="../../static/images/france.jpg"{% endif %}> 
+ </button>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ </li>
+ </ul>
+ </form>
  {% block extrabody %}{% endblock %}
  </body>
 </html>
diff --git a/decide/base/urls.py b/decide/base/urls.py
@@ -1 +1,6 @@
-urlpatterns = []
+from django.conf.urls import url
+from django.urls import include
+
+urlpatterns = [
+ url('i18n/', include('django.conf.urls.i18n')),
+]
diff --git a/decide/booth/templates/booth/booth.html b/decide/booth/templates/booth/booth.html
@@ -16,7 +16,7 @@
  <b-navbar-brand tag="h1">Decide</b-navbar-brand>
  <b-navbar-nav class="ml-auto" v-if="!signup">
  <b-nav-item href="#" v-on:click="decideLogout">
- {% trans "logout" %}
+ {% trans "Logout" %}
  </b-nav-item>
  </b-navbar-nav>
  </b-navbar>

diff --git a/decide/decide/settings.py b/decide/decide/settings.py
@@ -27,6 +27,7 @@
 
 ALLOWED_HOSTS = []
 
+from django.utils.translation import ugettext_lazy as _
 
 # Application definition
 
@@ -70,11 +71,24 @@
  'voting',
 ]
 
-BASEURL = 'http://localhost:8000'
+BASEURL = 'https://picaro-decide.herokuapp.com'
+
+APIS = {
+ 'authentication': BASEURL ,
+ 'base': BASEURL ,
+ 'booth': BASEURL ,
+ 'census': BASEURL ,
+ 'mixnet': BASEURL ,
+ 'postproc': BASEURL ,
+ 'store': BASEURL ,
+ 'visualizer': BASEURL ,
+ 'voting': BASEURL ,
+ }
 
 MIDDLEWARE = [
  'django.middleware.security.SecurityMiddleware',
  'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.middleware.locale.LocaleMiddleware',
  'django.middleware.common.CommonMiddleware',
  'django.middleware.csrf.CsrfViewMiddleware',
  'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -140,7 +154,16 @@
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+#LANGUAGE_CODE = 'es'
+LANGUAGE_CODE = 'en'
+_ = lambda s: s
+
+LANGUAGES = [
+ ('en', _('English')),
+ ('es', _('Spanish')),
+ ('fr', _('French')),
+ ('de', _('German')),
+]
 
 TIME_ZONE = 'UTC'
 
@@ -150,13 +173,32 @@
 
 USE_TZ = True
 
+LOCALE_PATHS = [
+ os.path.join(BASE_DIR, 'locale')
+]
+
 
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 
 STATIC_URL = '/static/'
+STATIC_ROOT = ''
+STATIC_TMP = os.path.join(BASE_DIR, 'static')
+
+os.makedirs(STATIC_TMP, exist_ok=True)
+
+STATICFILES_DIRS = (
+ 'static',
+)
+
+MEDIA_URL = '/media/'
+MEDIA_ROOT = ''
+
+MEDIAFILES_DIRS = (
+ 'media',
+)
 
 # number of bits for the key, all auths should use the same number of bits
 KEYBITS = 256
@@ -180,3 +222,6 @@
 
 
 INSTALLED_APPS = INSTALLED_APPS + MODULES
+
+import django_heroku
+django_heroku.settings(locals())
diff --git a/decide/decide/urls.py b/decide/decide/urls.py
@@ -18,7 +18,6 @@
 from django.urls import path, include
 from rest_framework_swagger.views import get_swagger_view
 
-
 schema_view = get_swagger_view(title='Decide API')
 
 urlpatterns = [

diff --git a/decide/locale/de/LC_MESSAGES/django.mo b/decide/locale/de/LC_MESSAGES/django.mo