Merge pull request #13 from Decide-Part-Rota/Rota3-003

Arreglado conflictos con social applications en la base de datos, importante que no existe social applications previas en la base de datos(ver panel admin) y que el site conocido como example tenga id en la URL igual a 1(ver también panel admin)
Decide-Part-Rota · Nov 29, 2022 · e6f71b2 · e6f71b2
2 parents a629d0d + 7abe5bc
commit e6f71b2
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 10 deletions.
diff --git a/decide/authentication/forms.py b/decide/authentication/forms.py
@@ -19,6 +19,10 @@ class Meta:
           model=User
           fields=["username","password1","password2","email","sex","age"]
 
+class CompleteForm(forms.Form):
+    sex = forms.ChoiceField(choices=sexos, required=True)
+    age = forms.IntegerField(required=True)
+
 
 
 

diff --git a/decide/authentication/templates/complete.html b/decide/authentication/templates/complete.html
@@ -0,0 +1,28 @@
+<html>
+
+<head>
+
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <title>Complete</title>
+
+</head>
+
+<body>
+
+  <h2 class="d-flex justify-content-center" style="margin: 20;">Complete demographic information</h2>
+  <h2 class="d-flex justify-content-center" style="margin: 20;">before proceeding</h2>
+
+  <div class="d-flex justify-content-center">
+      <form method="POST" style="margin: 10;">
+            {%csrf_token%}
+            <table>
+                {{form.as_table}}
+            </table>
+            <br>
+            <button type="submit" class="btn btn-outline-dark">Submit</button>
+      </form>
+  </div>
+
+</body>
+
+</html>
diff --git a/decide/authentication/templates/register.html b/decide/authentication/templates/register.html
@@ -6,7 +6,7 @@
 <head>
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-    <link type="text/css" rel="stylesheet" href="{% static "registration/style.css" %}" />
+    <link type="text/css" rel="stylesheet" href="{% static 'registration/style.css' %}" />
     <title>Register</title>
 
 </head>
@@ -28,7 +28,7 @@ <h1 class="d-flex justify-content-center" style="margin: 20;">Register form</h1>
 
             <br><br>
 
-            <a href="{% provider_login_url 'google' %}">
+            <a href="{% provider_login_url 'google' next='/authentication/completeForm/' %}">
                 <button type="button" class="login-with-google-btn" >
                     Sign in with Google
                 </button>

diff --git a/decide/authentication/templates/registration/login.html b/decide/authentication/templates/registration/login.html
@@ -5,7 +5,7 @@
 
 <head>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-    <link type="text/css" rel="stylesheet" href="{% static "registration/style.css" %}" />
+    <link type="text/css" rel="stylesheet" href="{% static 'registration/style.css' %}" />
     <title>Login</title>
 </head>
 
@@ -35,7 +35,7 @@ <h1>Iniciar sesión</h1>
 
             <br><br>
 
-            <a href="{% provider_login_url 'google' %}">
+            <a href="{% provider_login_url 'google' next='/authentication/completeForm/' %}">
                 <button type="button" class="login-with-google-btn" >
                     Sign in with Google
                 </button>

diff --git a/decide/authentication/urls.py b/decide/authentication/urls.py
@@ -2,7 +2,7 @@
 from rest_framework.authtoken.views import obtain_auth_token
 
 
-from .views import GetUserView, LogoutView, RegisterView, loginForm, register, salir, loginForm
+from .views import GetUserView, LogoutView, RegisterView, loginForm, register, salir, loginForm, complete
 
 from django.contrib import admin
 from django.views.generic import TemplateView
@@ -17,6 +17,7 @@
     path('providers/', include('allauth.urls')),
     path('accounts/', include('django.contrib.auth.urls')),
     path('salir/', salir, name='salir'),
+    path('completeForm/', complete),
 
 
 ]
diff --git a/decide/authentication/views.py b/decide/authentication/views.py
@@ -16,7 +16,7 @@
 from django.contrib.auth import authenticate, login, logout
 
 from .serializers import UserSerializer
-from .forms import PersonForm, LoginForm
+from .forms import PersonForm, LoginForm, CompleteForm
 from .models import Person
 
 
@@ -135,4 +135,27 @@ def welcome(request):
 
 def salir(request):
     logout(request)
-    return redirect('/')
+    return redirect('/')
+
+
+def complete(request):
+    if request.user.is_authenticated and not Person.objects.filter(user = request.user.id).exists():
+        user = request.user
+        form=CompleteForm
+
+        if request.method=="POST":
+            form=CompleteForm(request.POST)
+
+            if form.is_valid():
+                sex = form.cleaned_data.get('sex')
+                age = form.cleaned_data.get('age')
+
+                person = Person(user = user, sex = sex, age = age)
+                person.save()
+
+                return redirect('/')
+
+        return render(request,'complete.html',{'form':form})
+    else:
+        return redirect('/')
+
diff --git a/decide/local_settings.py b/decide/local_settings.py
@@ -67,14 +67,18 @@
     'allauth.account.auth_backends.AuthenticationBackend'
 ]
 
-SITE_ID = 2
-LOGIN_REDIRECT_URL = '/'
+SITE_ID = 1
 LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = '/'
 SOCIALACCOUNT_LOGIN_ON_GET = True
-ACCOUNT_LOGOUT_ON_GET = True
 
 SOCIALACCOUNT_PROVIDERS = {
     'google': {
+        'APP': {
+            'client_id': '992476478153-6p58v7uvoa569ola5jogpm8nr64fpiop.apps.googleusercontent.com',
+            'secret': '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',
+            'key': ''
+        },
         'SCOPE': [
             'profile',
             'email',