EGCETSII · josperdom1 · Oct 21, 2019 · Nov 14, 2019 · Nov 14, 2019 · Nov 14, 2019
diff --git a/.gitignore b/.gitignore
@@ -101,3 +101,9 @@ ENV/
 .mypy_cache/
 
 .vagrant
+
+# macOS
+.DS_Store
+
+#node_modules for angular app
+node_modules/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "decide-telegram-bot"]
+	path = decide-telegram-bot
+	url = https://github.com/javdc/decide-telegram-bot.git
diff --git a/.gitresource/commit_template b/.gitresource/commit_template
@@ -0,0 +1,15 @@
+#<type>(<module>): <subject>
+#
+#<body>
+#
+#<footer> -> #Refenrenced_Issue
+#
+#	Types:
+#
+#	-feat (new feature)
+#	-fix (bug fix)
+#	-docs (changes to documentation)
+#	-style (formatting, missing semi colons, etc; no code change)
+#	-refactor (refactoring production code)
+#	-test (adding missing tests, refactoring tests; no production -code change)
+#	-chore (updating grunt tasks etc; no production code change)
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,25 @@
 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 test_decide 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
 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
+- python ./manage.py test --keepdb
+- rm local_settings.py
+deploy:
+  provider: heroku
+  app: decide-articuno
+  strategy: git
+  api_key:
+    secure: i37CCiL2uqlVu0nzMO8REdQpimP8TcFNrGQPA5TuypVPZeQkWDVLmBkVEXSmenEUWU3GwpySAZEDckbVQqQqGwXk0m1XGOMAXQUaf9xI1a0GX5tKZaW6GSeeiHkgON48W29xTdy9ypA+CG3vlUug2nux/nKkPTcj9KJzTPPpXCh3VqNMd3rUsX7c7YG/ETQLUesMxYZUN7oin3WmJr9NxpBblLAkvfxvF8g+YhhHdolttp4Dvdbg/JaJMt5lCEtUefCcTwK4itzlhCtg3/lyFWgLcdDiT5nSSLa9B3ni5E6D1yxR9ptNaqxA9p75ixB+JVmU16UmsHOJVy4AR+L4EWrlluZVgjgnm6ese3S1HZD2XEMGKRHNIi1ocXgktU2z2TtvLDmkUU5ieSPgpGLvx8CY0qxueND/LagAH+12fNKTQ73jRbAwih3yrOgdCwJqlfYs972uGToJJwWbeHAr5GcuPHESuqMKWwgA8S96TxNuY1i/CaqNmoGyweUAiqgDZyxGdAqzc/h6nX5v/wVpHHO3kb4BsLbEFFDauox6ZRdEfkP12ewlhYPTr1bs5OfaC1uo6BAfK8PVkUYR5vA2+x1tmLS3zMFmDGzWDL/L4qzhRHMB/ZacgfQvDFbPaa4KX7x6IQSbYmBcclsHLgBEu4Pe5MsxAJT812k10AfS+nQ=
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 --graceful-timeout=900 --timeout 900 decide.wsgi --log-file -'
diff --git a/README.md b/README.md
@@ -12,6 +12,40 @@ votación, por lo que prima la simplicidad por encima de la eficiencia
 cuando sea posible. Por lo tanto se asumen algunas carencias para permitir
 que sea entendible y extensible.
 
+Formato de los Commits
+---------------------------------
+    <type>(<module>): <subject>
+
+    <body>
+
+    <footer>
+
+Posibles valores de type:
+- feat (new feature).
+- fix (bug fix).
+- docs (changes to documentation).
+- style (formatting, missing semi colons, etc; no code change).
+- refactor (refactoring production code).
+- test (adding missing tests, refactoring tests; no production -code change).
+- chore (updating grunt tasks etc; no production code change).
+
+En module se incluíran todos los modulos a los que afecte directamente el commit separados por comas.
+Posibles valores de module:
+- auth      -> Autenticación.
+- census    -> Censo.
+- voting    -> Votación.
+- booth     -> Cabina de votación.
+- store     -> Almacenamiento de votos (cifrados).
+- mixnet    -> Recuento / MixNet.
+- postproc  -> Post-procesado.
+- visual    -> Visualización de resultados.
+
+En body se inluirá una descipción breve con información útil.
+
+En footer se referirá a las issues creadas en los tableros de github (si procede).
+ Por ejemplo: Closes #234, ó Fix #321.
+
+Todos los commits deben estar escritos enteramente en inglés.
 
 Subsistemas, apps y proyecto base
 ---------------------------------

diff --git a/decide-telegram-bot b/decide-telegram-bot
diff --git a/decide/.idea/.gitignore b/decide/.idea/.gitignore
diff --git a/decide/.idea/decide.iml b/decide/.idea/decide.iml
diff --git a/decide/.idea/inspectionProfiles/profiles_settings.xml b/decide/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/decide/.idea/misc.xml b/decide/.idea/misc.xml
diff --git a/decide/.idea/modules.xml b/decide/.idea/modules.xml
diff --git a/decide/.idea/vcs.xml b/decide/.idea/vcs.xml
diff --git a/decide/base/templates/base.html b/decide/base/templates/base.html
@@ -2,13 +2,61 @@
 <html>
     <head>
         <meta charset="utf-8" />
+        <!-- materialize.css -->
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.css">
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+
         <title>{% block title %}Decide!{% endblock %}</title>
         {% block extrahead %}{% endblock %}
     </head>
     <body>
+
+        <div class="navbar-fixed">
+
+            <!-- Navbar dropdown menu-->
+            <ul id="navbar-dropdown" class="dropdown-content">
+                <li><a href="/admin">Administrator dashboard</a></li>
+            </ul>
+
+            <nav>
+                <div class="nav-wrapper blue-grey darken-4">
+                    <a href="#" class="brand-logo center">Decide!</a>
+                        <ul id="nav-mobile" class="right active blue-grey darken-3">
+                            <li><a class="dropdown-trigger center " data-target="navbar-dropdown" style="width: 15em !important">Menu<i class="material-icons right">arrow_drop_down</i></a></li>
+                        </ul>
+                </div>
+            </nav>
+
+            <script>
+                    $(document).ready(function(){
+                        $('.modal').modal();
+                        $(".dropdown-trigger").dropdown({
+                            coverTrigger: false
+                        });
+                    });
+            </script>
+
+        </div>
+
+
         {% block content %}
         {% endblock %}
 
         {% block extrabody %}{% endblock %}
-    </body>
+
+
+        <div class="footer">
+            <footer class="page-footer blue-grey darken-4" style="position:fixed;bottom:0;left:0;width:100%;">
+                <div class="right-align footer-copyright blue-grey darken-4">
+                    <div class="container">
+                        <span><a class="grey-text text-lighten-4" target="_blank" href="https://github.com/egc-articuno/decide/">© 2019-2020 Decide-Articuno</a> - AGPLv3.0</span>
+                    </div>
+                </div>
+            </footer>
+        </div>
+
+        <!-- Materialize JavaScript. Keep at the end of body for optimized loading-->
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.js"></script>
+        </body>
 </html>
diff --git a/decide/base/templates/index.html b/decide/base/templates/index.html
@@ -0,0 +1 @@
+{% extends 'base.html' %}
diff --git a/decide/base/views.py b/decide/base/views.py
@@ -1,3 +1,9 @@
 from django.shortcuts import render
 
-# Create your views here.
+
+def base(request):
+    return render(request, 'base.html')
+
+
+def index(request):
+    return render(request, 'index.html')
diff --git a/decide/booth/angular/.editorconfig b/decide/booth/angular/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/decide/booth/angular/.gitignore b/decide/booth/angular/.gitignore
@@ -0,0 +1,46 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/decide/booth/angular/README.md b/decide/booth/angular/README.md
@@ -0,0 +1,27 @@
+# Angular
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.18.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).