Make the login buttons look nicer, update allauth

Ajapaik · Oct 2, 2023 · 268ddba · 268ddba
1 parent bd5291d
commit 268ddba
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/ajapaik/ajapaik/static/css/ajp-style.css b/ajapaik/ajapaik/static/css/ajp-style.css
@@ -636,22 +636,20 @@ a.fullscreen {
 
 .facebook-connect a {
     width: 169px;
-    height: 21px;
+    height: 28px;
     background: url(../images/connect-with-facebook.png) no-repeat;
 }
 
 .wikimedia-commons-connect a {
     width: 169px;
     height: 57px;
     background: url(../images/connect-with-wikimedia-commons.png) no-repeat;
-    margin-top: -5px;
 }
 
 .google-connect a {
     width: 169px;
-    height: 57px;
+    height: 30px;
     background: url(../images/connect-with-google.png) no-repeat;
-    margin-top: -5px;
 }
 
 .ir {

diff --git a/ajapaik/ajapaik/static/images/connect-with-facebook.png b/ajapaik/ajapaik/static/images/connect-with-facebook.png
diff --git a/ajapaik/ajapaik/static/images/connect-with-google.png b/ajapaik/ajapaik/static/images/connect-with-google.png
diff --git a/ajapaik/ajapaik/templates/authentication/_login.html b/ajapaik/ajapaik/templates/authentication/_login.html
@@ -28,8 +28,8 @@
 
 {% with 'facebook google wikimedia-commons' as provider_list %}
   {% for provider in provider_list.split %}
-    <div class="{{provider}}-connect my-1">
-        <a href="{% provider_login_url provider %}?next={% if next %}{{ next|urlencode }}{% else %}{{ request.get_full_path|urlencode }}{% endif %}" class="ir">{% blocktrans %}Connect with {{provider}}{% endblocktrans %}</a>
+    <div class="{{provider}}-connect my-2">
+        <a href="/?next={% if next %}{{ next|urlencode }}{% else %}{{ request.get_full_path|urlencode }}{% endif %}" class="ir">{% blocktrans %}Connect with {{provider}}{% endblocktrans %}</a>
     </div>
   {% endfor %}
 {% endwith %}

diff --git a/ajapaik/settings/default.py b/ajapaik/settings/default.py
@@ -114,6 +114,7 @@
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'allauth.account.middleware.AccountMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'ajapaik.ajapaik.user_middleware.UserMiddleware',
     'django_user_agents.middleware.UserAgentMiddleware',
@@ -163,7 +164,7 @@
 LOGIN_REDIRECT_URL = '/'
 REGISTRATION_FORM = 'ajapaik.ajapaik.forms.UserRegistrationForm'
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'admin_tools',
     'admin_tools.theming',
     'admin_tools.menu',
@@ -207,7 +208,7 @@
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     'ajapaik.ajapaik.socialaccount.providers.wikimedia_commons'
-)
+]
 
 # Note: Allauth login's next-parameter redirection doesn't understand wildcards in ALLOWED_HOSTS.
 ALLOWED_HOSTS = ['.ajapaik.ee', '127.0.0.1']

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -19,7 +19,7 @@ django-registration-redux==2.9
 django-bootstrap4==3.0.1
 django-leaflet==0.28.1
 django-user-agents==0.4.0
-django-allauth==0.45.0
+django-allauth==0.57.0
 django-cors-headers
 flickrapi==2.4.0
 geopy==2.2.0

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,7 @@ wheel==0.37.0
 cmake
 Django==3.2.20
 django-admin-tools==0.9.0
-django-allauth==0.45.0
+django-allauth==0.57.0
 django-autocomplete-light==3.8.2
 django-bootstrap4==3.0.1
 django-bulk-update==2.2.0