Rota2-001

.github/workflows/django.yml

@@ -6,14 +6,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-
     env:
       GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
       GOOGLE_SECRET: ${{ secrets.GOOGLE_SECRET }}
       EMAIL_USER: ${{ secrets.EMAIL_USER }}
       EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
 
-
     services:
       postgres:
         image: postgres:10.8

.gitignore

@@ -47,6 +47,7 @@ coverage.xml
 .hypothesis/
 
 # Translations
+*.mo
 *.pot
 
 # Django stuff:

README.md

@@ -2,7 +2,7 @@
 
 Plataforma voto electrónico educativa
 =====================================
-
+Funciona
 El objetivo de este proyecto es implementar una plataforma de voto
 electrónico seguro, que cumpla una serie de garantías básicas, como la
 anonimicidad y el secreto del voto.
@@ -289,5 +289,4 @@ A tener en cuenta:
 * En un servidor local, con un postgres que por defecto nos viene limitado a 100 usuarios
   concurrentes, cuando pongamos más de 100, lo normal es que empiecen a fallar muchas peticiones.
 * Si hacemos las pruebas en local, donde tenemos activado el modo debug de Django, lo normal es que
-  las peticiones tarden algo más y consigamos menos RPS (Peticiones por segundo)
-
+  las peticiones tarden algo más y consigamos menos RPS (Peticiones por segundo)..

decide/authentication/forms.py

@@ -3,29 +3,45 @@
 from django.forms import ModelForm
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError 
+from django.core.validators import RegexValidator
 from .models import Person
 from django.contrib.auth.forms import UserCreationForm
 from django_countries.fields import CountryField
 
-sexos=[("mujer","Mujer"),("hombre","Hombre"),("otro","Otro")]
-status=[("soltero","Soltero"),("conviviente","Conviviente"),("casado","Casado"),("divorciado","Divorciado"),("viudo","Viudo")]
-
-
+sex=[("woman","Woman"),("man","Man"),("other","Other")]
+status=[("single","Single"),("partner","Partner"),("married","Married"),("divorced","Divorced"),("widow","Widow")]
+discord_validator = RegexValidator('.+#\d{4}')
 
 class PersonForm(UserCreationForm):
-    sex = forms.ChoiceField(choices=sexos, required=True, label="Seleccione su sexo")
+    sex = forms.ChoiceField(choices=sex, required=True, label="Select your gender")
     age = forms.IntegerField(required=False)
     status = forms.ChoiceField(choices=status, required=True, label="Seleccione su estado civil")
+    discord_account = forms.CharField(required=False, help_text="Please use the following format: name#XXXX", validators=[discord_validator], max_length=30)
     country = CountryField().formfield()
+
+    def clean_age(self):
+        data = self.cleaned_data["age"]
+
+        if not data:
+          self.add_error("age", "Debes especificar una edad")
+
+        if data == 0:
+          self.add_error("age", "Introduce una edad valida")
+        return data
+
+
+
     class Meta:
           model=User
-          fields=["username","password1","password2","email","sex","age","status","country"]
+          fields=["username","password1","password2","email","sex","age","status","country","discord_account"]
+
 
 class CompleteForm(forms.Form):
-    sex = forms.ChoiceField(choices=sexos, required=True)
+    sex = forms.ChoiceField(choices=sex, required=True)
     age = forms.IntegerField(required=True)
-    status = forms.ChoiceField(choices=status, required=True, label="Seleccione su estado civil")
+    status = forms.ChoiceField(choices=status, required=True, label="Select your civil status")
     country = CountryField().formfield()
+    discord_account = forms.CharField(required=False, help_text="Please use the following format: name#XXXX", validators=[discord_validator], max_length=30)
 
 
 

decide/authentication/migrations/0007_person_discord_account.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0 on 2022-12-14 22:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0006_auto_20221202_0115'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='person',
+            name='discord_account',
+            field=models.CharField(blank=True, max_length=30),
+        ),
+    ]

decide/authentication/models.py

@@ -10,6 +10,8 @@ class Person(models.Model):
     sex = models.CharField(max_length=30, blank=False)
     age = models.PositiveIntegerField()
     status = models.CharField(max_length=30, blank=False)
+    discord_account = models.CharField(max_length=30, blank=True)
+
     country=CountryField()
 
     def __str__(self):

decide/authentication/serializers.py

@@ -1,9 +1,16 @@
 from rest_framework import serializers
 
 from django.contrib.auth.models import User
+from .models import Person
 
 
 class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = User
         fields = ('id', 'username', 'first_name', 'last_name', 'email', 'is_staff')
+
+class PersonSerializer(serializers.HyperlinkedModelSerializer):
+    user = UserSerializer()
+    class Meta:
+        model = Person
+        fields = ('id', 'user', 'sex', 'age', 'status', 'discord_account', 'country')

decide/authentication/static/reactComponents/loginForm.js

@@ -0,0 +1,33 @@
+"use strict";
+
+const createLoginForm = React.createElement;
+
+class LoginForm extends React.Component {
+  render() {
+    return createLoginForm(
+        "body",
+        {},
+        createLoginForm("table",
+            {className:"table"},
+            createLoginForm(
+                "tr",{},
+                createLoginForm("th",{scope:"row"},"Username / Email"),
+                createLoginForm(
+                    "td",{},
+                    createLoginForm("input",{type:"text",name:"username"}),
+                )
+            ),
+            createLoginForm("tr",{},
+                createLoginForm("th",{scope:"row"},"Password"),
+                createLoginForm("td",{},
+                    createLoginForm("input",{type:"password",name:"password"}),
+                ),
+            ),
+        ),
+    );}
+
+}
+
+const domContainerLoginForm = document.querySelector("#loginForm");
+const rootLoginForm = ReactDOM.createRoot(domContainerLoginForm);
+rootLoginForm.render(createLoginForm(LoginForm));

decide/authentication/static/reactComponents/loginTitle.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const create = React.createElement;
+
+class Title extends React.Component {
+  render() {
+    return create(
+      "body",{},
+      create("h2",{className:"Title"},"Login"),
+    );
+  }
+
+}
+
+const domContainer = document.querySelector("#title");
+const root = ReactDOM.createRoot(domContainer);
+root.render(create(Title));

decide/authentication/static/reactComponents/registerTitle.js

@@ -0,0 +1,13 @@
+"use strict";
+
+const create = React.createElement;
+
+class Title extends React.Component {
+  render() {
+    return create("body",{}, create("h2",{className:"Title"},"Sign Up"));}
+
+}
+
+const domContainer = document.querySelector("#title");
+const root = ReactDOM.createRoot(domContainer);
+root.render(create(Title));

decide/authentication/static/reactComponents/welcome.js

@@ -0,0 +1,35 @@
+"use strict";
+
+const createWelcome = React.createElement;
+
+class Welcome extends React.Component {
+  render() {
+    return createWelcome(
+        "body",
+        {},
+        createWelcome(
+          "div",{className:"welcome"},
+          createWelcome("br"),
+          createWelcome(
+            "h2",{className:"h2Welcome"},"Welcome!"),
+          createWelcome(
+            "p",
+            {className:"pWelcome"},
+            "To enter admin mode, just click the button!"),
+          createWelcome(
+            "div",{className:"divWelcomeButton"},
+            createWelcome(
+              "a",{className:"aWelcome", href: "/admin/"},
+              createWelcome(
+                "button", {className:"buttonWelcome"} ,"Admin"),
+            )
+          ),
+          createWelcome("br")
+        )
+    );}
+
+}
+
+const domContainerWelcome = document.querySelector("#welcome");
+const rootWelcome = ReactDOM.createRoot(domContainerWelcome);
+rootWelcome.render(createWelcome(Welcome));

decide/authentication/static/registration/login.css

@@ -0,0 +1,31 @@
+.prueba {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin: auto;
+    height: auto;
+    width: 22vw;
+    background-color: white;
+    border-radius: 10px;
+    text-align: justify;
+}
+
+.buttons {
+    text-align: center;
+}
+
+header {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    padding: 30px 10%;
+    background-color: #0b0c10;
+}
+
+.bar{
+    color: #edf0f1;
+}
+
+.Title{
+    text-align: center;
+}

decide/authentication/static/registration/register.css

@@ -0,0 +1,36 @@
+.bar {
+  color: #edf0f1;
+}
+
+header {
+  display: flex;
+  align-items: center;
+  padding: 30px 10%;
+  background-color: #0b0c10;
+  justify-content: flex-end;
+}
+
+.registerForm {
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin: auto;
+  height: auto;
+  width: 47vw;
+  text-align: justify;
+  background-color: white;
+  border-radius: 10px;
+}
+
+.Title {
+  background-color: white;
+  text-align: center;
+}
+
+.buttons {
+  text-align: center;
+}
+
+td, th {
+  vertical-align: top; 
+}

decide/authentication/static/registration/welcome.css

@@ -0,0 +1,24 @@
+.h2Welcome {
+  text-align: center;
+}
+
+.welcome {
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: auto;
+  width: 20vw;
+  border-radius: 10px;
+  text-align: center;
+  background-color: white;
+  margin: auto;
+}
+
+.pWelcome, .h2Welcome {
+  color: black;
+}
+
+.pWelcome {
+  text-align: justify;
+  margin-left: 25px;
+}

decide/authentication/templates/anonymous.html

@@ -0,0 +1 @@
+Welcome Anonymous