delete more account related stuff

liqd · Sep 12, 2024 · b162644 · b162644
1 parent 1479b19
commit b162644
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 269 deletions.
diff --git a/euth/accounts/forms.py b/euth/accounts/forms.py
diff --git a/euth/accounts/templates/euth_accounts/base_account.html b/euth/accounts/templates/euth_accounts/base_account.html
@@ -36,11 +36,6 @@ <h2 class="dashboard-left-nav-header">{% trans 'Account Settings' %}</h2>
                     <i class="fa fa-envelope" aria-hidden="true"></i>
                     <span>{% trans 'E-mail Addresses' %}</span>
                 </a>
-                <a href="{% url 'socialaccount_connections' %}"
-                   class="list-group-item list-group-item-heading {% if url_name == 'socialaccount_connections' %}active{% endif %}">
-                    <i class="fa fa-users" aria-hidden="true"></i>
-                    <span>{% trans 'Account Connections' %}</span>
-                </a>
                 {% endwith %}
             </div>
         </div>

diff --git a/euth/accounts/templates/euth_accounts/profile_form.html b/euth/accounts/templates/euth_accounts/profile_form.html
diff --git a/euth/accounts/urls.py b/euth/accounts/urls.py
@@ -1,20 +1,7 @@
 from django.urls import include
 from django.urls import path
 
-from . import views
-
 urlpatterns = [
-    path(
-        '',
-        views.dashboard_default,
-        name='account'),
-    path(
-        'profile/',
-        views.AccountProfileView.as_view(),
-        name='account-profile'),
-    path(
-        'social/',
-        include('allauth.socialaccount.urls')),
     path(
         '',
         include('allauth.account.urls')),

diff --git a/euth/accounts/views.py b/euth/accounts/views.py
diff --git a/euth_wagtail/settings/base.py b/euth_wagtail/settings/base.py
@@ -61,7 +61,7 @@
     'rules.apps.AutodiscoverRulesConfig',
     'allauth',
     'allauth.account',
-    'allauth.socialaccount',
+    'micawber.contrib.mcdjango',
 
     'euth.users',
     'euth.accounts',

diff --git a/euth_wagtail/templates/account/login.html b/euth_wagtail/templates/account/login.html
@@ -2,7 +2,6 @@
 
 {% load account %}
 {% load i18n %}
-{% load socialaccount %}
 {% load widget_tweaks %}
 
 {% block title %}{% trans 'Login' %}{% endblock %}
@@ -61,17 +60,6 @@ <h1>{% trans "Login" %}</h1>
 
                         <button type="submit" value="Login" class="btn btn-ghost btn-wide">{% trans "login" %}</button>
                     </form>
-                    <div class="socialaccounts">
-                        {% get_providers as socialaccount_providers %}
-                        {% if socialaccount_providers %}
-                        <p class="h6 text-uppercase sans-serif">{% trans "Login with social account" %}</h6>
-                        <div class="socialaccount_ballot">
-                            <ul class="socialaccount_providers">
-                                {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-                            </ul>
-                        </div>
-                        {% endif %}
-                    </div>
                 </div>
             </div>
         {% else %}

diff --git a/euth_wagtail/templates/account/signup.html b/euth_wagtail/templates/account/signup.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 
-{% load static widget_tweaks socialaccount i18n %}
+{% load static widget_tweaks i18n %}
 
 {% block title %}{% trans 'Register an account' %}{% endblock %}
 
@@ -99,19 +99,6 @@ <h1>{% trans "Register" %}</h1>
                 <button type="submit" value="Register" class="btn btn-ghost btn-wide">{% trans "register" %}</button>
             </form>
 
-            {% block socialaccounts %}
-            <div class="socialaccounts">
-                {% get_providers as socialaccount_providers %}
-                {% if socialaccount_providers %}
-                <p class="h6 text-uppercase sans-serif">{% trans "Login with social account" %}</h6>
-                <div class="socialaccount_ballot">
-                    <ul class="socialaccount_providers">
-                        {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-                    </ul>
-                </div>
-                {% endif %}
-            </div>
-            {% endblock %}
         </div>
     </div>
     <div class="account__container--right">

diff --git a/euth_wagtail/templates/socialaccount/connections.html b/euth_wagtail/templates/socialaccount/connections.html
diff --git a/euth_wagtail/templates/socialaccount/signup.html b/euth_wagtail/templates/socialaccount/signup.html
diff --git a/euth_wagtail/templates/socialaccount/snippets/provider_list.html b/euth_wagtail/templates/socialaccount/snippets/provider_list.html
diff --git a/euth_wagtail/urls.py b/euth_wagtail/urls.py
@@ -16,8 +16,6 @@
 from euth.accounts import urls as accounts_urls
 from euth.contrib.sitemaps.static_sitemap import StaticSitemap
 
-from . import urls_accounts
-
 sitemaps = {
     'wagtail': WagtailSitemap,
     'static': StaticSitemap
@@ -42,10 +40,6 @@
     path('', include(wagtail_urls)),
 )
 
-urlpatterns += [
-    path('accounts/', include(urls_accounts)),
-]
-
 if settings.DEBUG:
     from django.conf.urls.static import static
     from django.contrib.staticfiles.urls import staticfiles_urlpatterns

diff --git a/euth_wagtail/urls_accounts.py b/euth_wagtail/urls_accounts.py