From e015b1260ff00e9b77d47ee9b9c1e11b784d6ddb Mon Sep 17 00:00:00 2001
From: Manas <imanaspaul@gmail.com>
Date: Sun, 26 Apr 2020 12:42:09 +0530
Subject: [PATCH 1/2] Github oauth added

---
 .gitignore                    |  3 ++-
 Pipfile                       |  2 +-
 Pipfile.lock                  | 12 ++++++++++--
 csqa_project/settings.py      | 30 +++++++++++++++---------------
 templates/account/signup.html | 32 ++++++++++++++++++++------------
 templates/base.html           |  1 +
 6 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba520cc..deb934f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-db.sqlite3
\ No newline at end of file
+db.sqlite3
+migrations
diff --git a/Pipfile b/Pipfile
index 508dff0..4b2a210 100644
--- a/Pipfile
+++ b/Pipfile
@@ -16,4 +16,4 @@ djangorestframework = "*"
 pylint = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3.6.5"
diff --git a/Pipfile.lock b/Pipfile.lock
index d001f25..f07ad95 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,11 +1,11 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "947485b99926d6ce74b8cd91121c5e8de408364688b2782f0a543c3f4332482a"
+            "sha256": "8659960929e3b964c12488225aecad385542160fb01d24825858bb7a5dbe46ee"
         },
         "pipfile-spec": 6,
         "requires": {
-            "python_version": "3.7"
+            "python_version": "3.6.5"
         },
         "sources": [
             {
@@ -175,6 +175,14 @@
             ],
             "version": "==2.3.3"
         },
+        "colorama": {
+            "hashes": [
+                "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff",
+                "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"
+            ],
+            "markers": "sys_platform == 'win32'",
+            "version": "==0.4.3"
+        },
         "isort": {
             "hashes": [
                 "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1",
diff --git a/csqa_project/settings.py b/csqa_project/settings.py
index bbfdd6c..9fc1083 100644
--- a/csqa_project/settings.py
+++ b/csqa_project/settings.py
@@ -1,15 +1,3 @@
-"""
-Django settings for csqa_project project.
-
-Generated by 'django-admin startproject' using Django 3.0.5.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/3.0/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/3.0/ref/settings/
-"""
-
 import sys
 import dj_database_url
 import os
@@ -51,6 +39,7 @@
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
+     'allauth.socialaccount.providers.github', # for github authentication ( to avoid spam register )
 ]
 
 MIDDLEWARE = [
@@ -141,7 +130,15 @@
 
 USE_TZ = True
 
-
+SOCIALACCOUNT_PROVIDERS = {
+    'github': {
+        'SCOPE': [
+            'user',
+            'repo',
+            'read:org',
+        ],
+    }
+}
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
@@ -160,8 +157,11 @@
     "allauth.account.auth_backends.AuthenticationBackend",
 )
 
-SITE_ID = 1
+SITE_ID = 2
 
 LOGIN_REDIRECT_URL = '/'
 
-AUTH_USER_MODEL = 'users.User'
\ No newline at end of file
+AUTH_USER_MODEL = 'users.User'
+
+
+
diff --git a/templates/account/signup.html b/templates/account/signup.html
index d74c918..c96dda9 100644
--- a/templates/account/signup.html
+++ b/templates/account/signup.html
@@ -1,17 +1,25 @@
 {% extends "account/base.html" %}
-
+{% load account socialaccount %}
 {% block content %}
-<h3>Sign Up</h3>
+<div class="col-md-12">
+  <h3 class="text-center">Sign Up</h3>
+
+  <div class="col-md-12 py-3">
+      <form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
+      {% csrf_token %}
+      {{ form.as_p }}
+      {% if redirect_field_value %}
+      <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+      {% endif %}
+      <button type="submit" class="btn btn-primary">Sign Up</button>
+    </form>
+  </div>
+  <hr>
+  <a href="http://127.0.0.1:8000/accounts/github/login/?process=login" class="btn btn-secondary form-control my-3"><i class="fab fa-github"></i> Sign up with Github</a>
+  <p class="text-secondary text-center">Already have an account? Then please <a href="{{ login_url }}">sign in</a>.</p>
+</div>
+{% endblock %}
 
-<p class="text-secondary">Already have an account? Then please <a href="{{ login_url }}">sign in</a>.</p>
 
-<form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
-  {% csrf_token %}
-  {{ form.as_p }}
-  {% if redirect_field_value %}
-  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
-  {% endif %}
-  <button type="submit" class="btn btn-primary">Sign Up</button>
-</form>
+<!-- http://127.0.0.1:8000/accounts/github/login/?process=login
 
-{% endblock %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 1b4fcf6..83ce05d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,6 +3,7 @@
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css">
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
         <link rel="stylesheet" href="{% static 'style.css' %}">
         <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>

From 4c6f0f08ce0fe401846b88c78136b22f325ce0ae Mon Sep 17 00:00:00 2001
From: Manas <imanaspaul@gmail.com>
Date: Sun, 26 Apr 2020 13:04:15 +0530
Subject: [PATCH 2/2] Made the sign and login form much better

---
 Pipfile                       |  1 +
 Pipfile.lock                  | 10 +++++++++-
 csqa_project/settings.py      |  6 +++++-
 templates/account/login.html  | 36 ++++++++++++++++++-----------------
 templates/account/logout.html |  2 ++
 templates/account/signup.html | 11 ++++++-----
 6 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/Pipfile b/Pipfile
index 4b2a210..7652ade 100644
--- a/Pipfile
+++ b/Pipfile
@@ -11,6 +11,7 @@ whitenoise = "*"
 "psycopg2" = "*"
 dj-database-url = "*"
 djangorestframework = "*"
+django-crispy-forms = "*"
 
 [dev-packages]
 pylint = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index f07ad95..ef6615d 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "8659960929e3b964c12488225aecad385542160fb01d24825858bb7a5dbe46ee"
+            "sha256": "c9d78bc78ab43940fec6f60906474b10399d8afb3b8c330f845d3898dd8804ac"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -67,6 +67,14 @@
             "index": "pypi",
             "version": "==0.41.0"
         },
+        "django-crispy-forms": {
+            "hashes": [
+                "sha256:50032184708ce351e3c9f0008ac35d659d9d5973fa2db218066f2e0a76eb41d9",
+                "sha256:67e73ac863d3159500029fbbcdcb788f287a3fd357becebc1a0b51f73896dce3"
+            ],
+            "index": "pypi",
+            "version": "==1.9.0"
+        },
         "djangorestframework": {
             "hashes": [
                 "sha256:05809fc66e1c997fd9a32ea5730d9f4ba28b109b9da71fccfa5ff241201fd0a4",
diff --git a/csqa_project/settings.py b/csqa_project/settings.py
index 9fc1083..4044156 100644
--- a/csqa_project/settings.py
+++ b/csqa_project/settings.py
@@ -39,7 +39,9 @@
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
-     'allauth.socialaccount.providers.github', # for github authentication ( to avoid spam register )
+    'allauth.socialaccount.providers.github', # for github authentication ( to avoid spam register )
+    
+    'crispy_forms',
 ]
 
 MIDDLEWARE = [
@@ -75,6 +77,8 @@
     },
 ]
 
+CRISPY_TEMPLATE_PACK = 'bootstrap4'
+
 WSGI_APPLICATION = 'csqa_project.wsgi.application'
 
 
diff --git a/templates/account/login.html b/templates/account/login.html
index 11493ea..589ffcd 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -1,24 +1,26 @@
 {% extends "base.html" %}
-
+{% load crispy_forms_tags %}
 {% load account socialaccount %}
 
 {% block content %}
 
-<h3>Sign In</h3>
-
-{% include "socialaccount/snippets/login_extra.html" %}
-
-<p class="text-secondary">If you have not created an account yet, then please
-<a href="{{ signup_url }}">sign up</a> first.</p>
-
-<form class="login" method="POST" action="{% url 'account_login' %}">
-  {% csrf_token %}
-  {{ form.as_p }}
-  {% if redirect_field_value %}
-  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
-  {% endif %}
-  <button class="btn btn-primary primaryAction" type="submit">Sign In</button>
-  <div class="mt-3"><a class="button secondaryAction" href="{% url 'account_reset_password' %}">Forgot Password?</a></div>
-</form>
+<div class="col-md-12">
+  <h3 class="text-center">Sign In</h3>
+  <div class="col-md-12">
+    <form class="login" method="POST" action="{% url 'account_login' %}">
+    {% csrf_token %}
+    {{ form | crispy }}
+    {% if redirect_field_value %}
+    <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+    {% endif %}
+    <button class="btn btn-primary primaryAction form-control" type="submit">Sign In</button>
+    <div class="mt-3"><a class="button secondaryAction" href="{% url 'account_reset_password' %}">Forgot Password?</a></div>
+  </form>
+  <hr>
+  <a href="http://127.0.0.1:8000/accounts/github/login/?process=login" class="btn btn-secondary form-control my-3"><i class="fab fa-github"></i> Login with Github</a>
+  <p class="text-secondary text-center">If you have not created an account yet, then please
+  <a href="{{ signup_url }}">sign up</a> first.</p>
+  </div>
 
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/account/logout.html b/templates/account/logout.html
index 5fb3daa..d6bde9e 100644
--- a/templates/account/logout.html
+++ b/templates/account/logout.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
+<div class="col-md-12 text-center">
 <h3>Sign Out</h3>
 
 <p style="margin-top:10; margin-bottom:14">Are you sure you want to sign out?</p>
@@ -12,6 +13,7 @@ <h3>Sign Out</h3>
   {% endif %}
   <button type="submit" class="btn btn-sm btn-primary">Confirm</button>
 </form>
+</div>
 
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/account/signup.html b/templates/account/signup.html
index c96dda9..ba6be2e 100644
--- a/templates/account/signup.html
+++ b/templates/account/signup.html
@@ -1,4 +1,5 @@
 {% extends "account/base.html" %}
+{% load crispy_forms_tags %}
 {% load account socialaccount %}
 {% block content %}
 <div class="col-md-12">
@@ -7,16 +8,16 @@ <h3 class="text-center">Sign Up</h3>
   <div class="col-md-12 py-3">
       <form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
       {% csrf_token %}
-      {{ form.as_p }}
+      {{ form | crispy }}
       {% if redirect_field_value %}
       <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
       {% endif %}
-      <button type="submit" class="btn btn-primary">Sign Up</button>
+      <button type="submit" class="btn btn-primary form-control">Sign Up</button>
     </form>
+    <hr>
+    <a href="http://127.0.0.1:8000/accounts/github/login/?process=login" class="btn btn-secondary form-control my-3"><i class="fab fa-github"></i> Sign up with Github</a>
+    <p class="text-secondary text-center">Already have an account? Then please <a href="{{ login_url }}">sign in</a>.</p>
   </div>
-  <hr>
-  <a href="http://127.0.0.1:8000/accounts/github/login/?process=login" class="btn btn-secondary form-control my-3"><i class="fab fa-github"></i> Sign up with Github</a>
-  <p class="text-secondary text-center">Already have an account? Then please <a href="{{ login_url }}">sign in</a>.</p>
 </div>
 {% endblock %}