upgrade to 3.0.8

anitab-org · Jul 18, 2020 · 7b3ecc3 · 7b3ecc3
1 parent 82a7389
commit 7b3ecc3
Show file tree

Hide file tree

Showing 10 changed files with 399 additions and 321 deletions.
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -10,6 +10,6 @@ pytest-cov==2.5.1
 pytest-django==3.2.1
 pytest-pylint==0.9.0
 selenium==3.12.0
-djangorestframework==3.8.2
+djangorestframework==3.11.0
 geopy==1.15.0
-pinax-notifications==5.0.3
+pinax-notifications==6.0.0
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -1,10 +1,10 @@
-Django==2.2.14
+Django==3.0.8
 Pillow==7.2.0
 django-allauth==0.42.0
 django-braces==1.14.0
 django-cities-light==3.6.0
 django-ckeditor==5.9.0
-django-crispy-forms==1.7.0
+django-crispy-forms==1.9.2
 django-guardian==2.3.0
 django-imagekit==4.0.1
 psycopg2==2.7.3.2

diff --git a/systers_portal/templates/account/login.html b/systers_portal/templates/account/login.html
@@ -7,35 +7,34 @@
 {% load crispy_forms_tags %}
 {% block content %}
 {% load socialaccount %}
-{% load staticfiles %}
-  <div class="container">
-    <form class="login form-signin" role="form" method="POST" action="{% url 'account_login' %}">
-      <div>
-          <h3>Sign In Using<a href="{% provider_login_url 'github' %}"><img class="auth-img" src="{% static 'img/github.svg' %}"></a>
-            <a href="{% provider_login_url 'twitter' %}"><img class="auth-img" src="{% static 'img/twitter.png' %}"></a>
-            <a href="{% provider_login_url 'google' %}"><img class="auth-img" src="{% static 'img/google.jpg' %}"></a>
-            <a href="{% provider_login_url 'facebook' %}"><img class="auth-img" src="{% static 'img/facebook.png' %}"></a></h3>
-      </div>
-      <hr>
-      {% csrf_token %}
-      {{ form|crispy }}
-      {% if redirect_field_value %}
-        <input type="hidden" name="{{ redirect_field_name }}"
-               value="{{ redirect_field_value }}"/>
-      {% endif %}
-      <a class="button secondaryAction"
-         href="{% url 'account_reset_password' %}">Forgot Password?</a>
-      <button class="primaryAction btn btn-lg btn-primary btn-block"
-              type="submit" id="login_button">Sign In
-      </button>
-      <p class="or-delimiter">or</p>
-
-      <p>Sign in with one of your existing third party accounts.</p>
-    </form>
-    <div class="social-buttons form-signin">
-      {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+{% load static %}
+<div class="container">
+  <form class="login form-signin" role="form" method="POST" action="{% url 'account_login' %}">
+    <div>
+      <h3>Sign In Using<a href="{% provider_login_url 'github' %}"><img class="auth-img"
+            src="{% static 'img/github.svg' %}"></a>
+        <a href="{% provider_login_url 'twitter' %}"><img class="auth-img" src="{% static 'img/twitter.png' %}"></a>
+        <a href="{% provider_login_url 'google' %}"><img class="auth-img" src="{% static 'img/google.jpg' %}"></a>
+        <a href="{% provider_login_url 'facebook' %}"><img class="auth-img" src="{% static 'img/facebook.png' %}"></a>
+      </h3>
     </div>
+    <hr>
+    {% csrf_token %}
+    {{ form|crispy }}
+    {% if redirect_field_value %}
+    <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+    {% endif %}
+    <a class="button secondaryAction" href="{% url 'account_reset_password' %}">Forgot Password?</a>
+    <button class="primaryAction btn btn-lg btn-primary btn-block" type="submit" id="login_button">Sign In
+    </button>
+    <p class="or-delimiter">or</p>
+
+    <p>Sign in with one of your existing third party accounts.</p>
+  </form>
+  <div class="social-buttons form-signin">
+    {% include "socialaccount/snippets/provider_list.html" with process="login" %}
   </div>
+</div>
 
-  <div class="mt40"></div>
-{% endblock %}
+<div class="mt40"></div>
+{% endblock %}
diff --git a/systers_portal/templates/account/signup.html b/systers_portal/templates/account/signup.html
@@ -7,29 +7,29 @@
 {% load crispy_forms_tags %}
 {% block content %}
 {% load socialaccount %}
-{% load staticfiles %}
-  <div class="container">
-    <form class="login form-signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
-      <div>
-          <h3>Sign Up Using<a href="{% provider_login_url 'github' %}"><img class="auth-img" src="{% static 'img/github.svg' %}"></a>
-            <a href="{% provider_login_url 'twitter' %}"><img class="auth-img" src="{% static 'img/twitter.png' %}"></a>
-            <a href="{% provider_login_url 'google' %}"><img class="auth-img" src="{% static 'img/google.jpg' %}"></a>
-            <a href="{% provider_login_url 'facebook' %}"><img class="auth-img" src="{% static 'img/facebook.png' %}"></a></h3>
-      </div>
-      <hr>
-      {% csrf_token %}
-      {{ form|crispy }}
-      {% if redirect_field_value %}
-        <input type="hidden" name="{{ redirect_field_name }}"
-               value="{{ redirect_field_value }}"/>
-      {% endif %}
-      <button class="primaryAction btn btn-lg btn-primary btn-block"
-              type="submit" id="signup_button">Sign Up
-      </button>
-      <p>Already have an account? Then please
-        <a href="/accounts/login/">sign in</a>.</p>
-    </form>
-  </div>
+{% load static %}
+<div class="container">
+  <form class="login form-signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
+    <div>
+      <h3>Sign Up Using<a href="{% provider_login_url 'github' %}"><img class="auth-img"
+            src="{% static 'img/github.svg' %}"></a>
+        <a href="{% provider_login_url 'twitter' %}"><img class="auth-img" src="{% static 'img/twitter.png' %}"></a>
+        <a href="{% provider_login_url 'google' %}"><img class="auth-img" src="{% static 'img/google.jpg' %}"></a>
+        <a href="{% provider_login_url 'facebook' %}"><img class="auth-img" src="{% static 'img/facebook.png' %}"></a>
+      </h3>
+    </div>
+    <hr>
+    {% csrf_token %}
+    {{ form|crispy }}
+    {% if redirect_field_value %}
+    <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+    {% endif %}
+    <button class="primaryAction btn btn-lg btn-primary btn-block" type="submit" id="signup_button">Sign Up
+    </button>
+    <p>Already have an account? Then please
+      <a href="/accounts/login/">sign in</a>.</p>
+  </form>
+</div>
 
-  <div class="mt40"></div>
-{% endblock %}
+<div class="mt40"></div>
+{% endblock %}