EGCETSII · Martinagr32 · Nov 3, 2020 · Nov 4, 2020 · Nov 11, 2020 · Nov 11, 2020
diff --git a/.project b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>decide</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,27 @@
 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
+- cd decide
+- cp travis_local_settings.py local_settings.py
+- coverage run --branch --source=. ./manage.py test mixnet --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,7 @@
 [![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)
-
+Prueba:
+pabfrasan
+abrgarvil
 Plataforma voto electrónico educativa
 =====================================
 

diff --git a/decide/base/templates/base.html b/decide/base/templates/base.html
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
-<html>
+{% load i18n static %}
+<html lang>
     <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' %}" />
         {% block extrahead %}{% endblock %}
     </head>
     <body>

diff --git a/decide/decide/settings.py b/decide/decide/settings.py
@@ -70,7 +70,19 @@
     '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',
@@ -150,13 +162,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 +211,6 @@
 
 
 INSTALLED_APPS = INSTALLED_APPS + MODULES
+
+import django_heroku
+django_heroku.settings(locals())
diff --git a/decide/postproc/views.py b/decide/postproc/views.py
@@ -11,7 +11,7 @@ def identity(self, options):
             out.append({
                 **opt,
                 'postproc': opt['votes'],
-            });
+            })
 
         out.sort(key=lambda x: -x['postproc'])
         return Response(out)

diff --git a/decide/booth/static/booth/style.css → decide/static/booth/style.css b/decide/booth/static/booth/style.css → decide/static/booth/style.css
diff --git a/decide/booth/static/crypto/bigint.js → decide/static/crypto/bigint.js b/decide/booth/static/crypto/bigint.js → decide/static/crypto/bigint.js
diff --git a/decide/booth/static/crypto/elgamal.js → decide/static/crypto/elgamal.js b/decide/booth/static/crypto/elgamal.js → decide/static/crypto/elgamal.js
diff --git a/decide/booth/static/crypto/jsbn.js → decide/static/crypto/jsbn.js b/decide/booth/static/crypto/jsbn.js → decide/static/crypto/jsbn.js
diff --git a/decide/booth/static/crypto/jsbn2.js → decide/static/crypto/jsbn2.js b/decide/booth/static/crypto/jsbn2.js → decide/static/crypto/jsbn2.js
diff --git a/decide/booth/static/crypto/sjcl.js → decide/static/crypto/sjcl.js b/decide/booth/static/crypto/sjcl.js → decide/static/crypto/sjcl.js
diff --git a/decide/static/css/footer.css b/decide/static/css/footer.css
@@ -0,0 +1,9 @@
+
+.footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+
+    background-color: #f5f5f5;
+  }
+