From e3a7a9650aa2d6c8a9cc99e30b2675291df732a3 Mon Sep 17 00:00:00 2001 From: tesss24 <102249475+tesss24@users.noreply.github.com> Date: Sun, 10 Dec 2023 22:54:41 -0800 Subject: [PATCH] Revert "changed Account name, closes #70" --- ScheduleBuilder/ScheduleBuilder/settings.py | 4 ++-- ScheduleBuilder/ScheduleBuilder/urls.py | 4 ++-- ScheduleBuilder/{profile => account}/__init__.py | 0 ScheduleBuilder/{profile => account}/admin.py | 2 +- ScheduleBuilder/{profile => account}/apps.py | 2 +- ScheduleBuilder/{profile => account}/forms.py | 2 +- .../{profile => account}/migrations/0001_initial.py | 0 ScheduleBuilder/{profile => account}/migrations/__init__.py | 0 ScheduleBuilder/{profile => account}/models.py | 0 ScheduleBuilder/{profile => account}/urls.py | 2 +- ScheduleBuilder/{profile => account}/views.py | 0 ScheduleBuilder/friend/views.py | 2 +- ScheduleBuilder/requirements.txt | 1 - 13 files changed, 9 insertions(+), 10 deletions(-) rename ScheduleBuilder/{profile => account}/__init__.py (100%) rename ScheduleBuilder/{profile => account}/admin.py (91%) rename ScheduleBuilder/{profile => account}/apps.py (85%) rename ScheduleBuilder/{profile => account}/forms.py (89%) rename ScheduleBuilder/{profile => account}/migrations/0001_initial.py (100%) rename ScheduleBuilder/{profile => account}/migrations/__init__.py (100%) rename ScheduleBuilder/{profile => account}/models.py (100%) rename ScheduleBuilder/{profile => account}/urls.py (75%) rename ScheduleBuilder/{profile => account}/views.py (100%) diff --git a/ScheduleBuilder/ScheduleBuilder/settings.py b/ScheduleBuilder/ScheduleBuilder/settings.py index 491f22f..e2920f5 100644 --- a/ScheduleBuilder/ScheduleBuilder/settings.py +++ b/ScheduleBuilder/ScheduleBuilder/settings.py @@ -33,7 +33,7 @@ # debug thing, I'll probably get rid of this ALLOWED_HOSTS = ['*'] -AUTH_USER_MODEL = "profile.Account" +AUTH_USER_MODEL = "account.Account" DATE_INPUT_FORMATS = ['%Y-%m-%d','%m/%d/%Y','%m/%d/%y'] @@ -49,7 +49,7 @@ 'django.contrib.staticfiles', 'core', 'google_calendar', - 'profile', + 'account', 'friend', ] diff --git a/ScheduleBuilder/ScheduleBuilder/urls.py b/ScheduleBuilder/ScheduleBuilder/urls.py index e0e5305..be28bda 100644 --- a/ScheduleBuilder/ScheduleBuilder/urls.py +++ b/ScheduleBuilder/ScheduleBuilder/urls.py @@ -2,7 +2,7 @@ from django.urls import path, include from core import views as core_views from google_calendar import views as cal_views -from profile import views as acc_views +from account import views as acc_views from django.contrib.auth.views import LoginView from django.contrib.auth.views import LogoutView from django.conf.urls import include @@ -17,7 +17,7 @@ path('register/', acc_views.registration, name='register'), path('logout/', LogoutView.as_view(next_page='login'), name='logout'), path('parser/', core_views.parser, name='parser'), - path('account/', include('profile.urls', namespace='account')), + path('account/', include('account.urls', namespace='account')), path('search/', acc_views.account_search_view, name="search"), path('friend/', include('friend.urls', namespace='friend')), path('calendar/edit_assignment/', cal_views.edit_event, name='calender-edit'), diff --git a/ScheduleBuilder/profile/__init__.py b/ScheduleBuilder/account/__init__.py similarity index 100% rename from ScheduleBuilder/profile/__init__.py rename to ScheduleBuilder/account/__init__.py diff --git a/ScheduleBuilder/profile/admin.py b/ScheduleBuilder/account/admin.py similarity index 91% rename from ScheduleBuilder/profile/admin.py rename to ScheduleBuilder/account/admin.py index 3c4dc4e..a65f7d8 100644 --- a/ScheduleBuilder/profile/admin.py +++ b/ScheduleBuilder/account/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin -from profile.models import Account +from account.models import Account diff --git a/ScheduleBuilder/profile/apps.py b/ScheduleBuilder/account/apps.py similarity index 85% rename from ScheduleBuilder/profile/apps.py rename to ScheduleBuilder/account/apps.py index 69985b0..2b08f1a 100644 --- a/ScheduleBuilder/profile/apps.py +++ b/ScheduleBuilder/account/apps.py @@ -3,4 +3,4 @@ class AccountConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'profile' + name = 'account' diff --git a/ScheduleBuilder/profile/forms.py b/ScheduleBuilder/account/forms.py similarity index 89% rename from ScheduleBuilder/profile/forms.py rename to ScheduleBuilder/account/forms.py index 12381c3..5251e26 100644 --- a/ScheduleBuilder/profile/forms.py +++ b/ScheduleBuilder/account/forms.py @@ -1,6 +1,6 @@ from django import forms from django.contrib.auth.forms import UserCreationForm -from profile.models import Account +from account.models import Account class RegistrationForm(UserCreationForm): email = forms.EmailField(max_length=254, help_text='Required. Add a valid email address.') diff --git a/ScheduleBuilder/profile/migrations/0001_initial.py b/ScheduleBuilder/account/migrations/0001_initial.py similarity index 100% rename from ScheduleBuilder/profile/migrations/0001_initial.py rename to ScheduleBuilder/account/migrations/0001_initial.py diff --git a/ScheduleBuilder/profile/migrations/__init__.py b/ScheduleBuilder/account/migrations/__init__.py similarity index 100% rename from ScheduleBuilder/profile/migrations/__init__.py rename to ScheduleBuilder/account/migrations/__init__.py diff --git a/ScheduleBuilder/profile/models.py b/ScheduleBuilder/account/models.py similarity index 100% rename from ScheduleBuilder/profile/models.py rename to ScheduleBuilder/account/models.py diff --git a/ScheduleBuilder/profile/urls.py b/ScheduleBuilder/account/urls.py similarity index 75% rename from ScheduleBuilder/profile/urls.py rename to ScheduleBuilder/account/urls.py index 964e5e1..99478af 100644 --- a/ScheduleBuilder/profile/urls.py +++ b/ScheduleBuilder/account/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from profile.views import account_view +from account.views import account_view app_name = 'account' diff --git a/ScheduleBuilder/profile/views.py b/ScheduleBuilder/account/views.py similarity index 100% rename from ScheduleBuilder/profile/views.py rename to ScheduleBuilder/account/views.py diff --git a/ScheduleBuilder/friend/views.py b/ScheduleBuilder/friend/views.py index 3b1f842..eb11ad3 100644 --- a/ScheduleBuilder/friend/views.py +++ b/ScheduleBuilder/friend/views.py @@ -2,7 +2,7 @@ from django.http import HttpResponse import json -from profile.models import Account +from account.models import Account from friend.models import FriendRequest, FriendList diff --git a/ScheduleBuilder/requirements.txt b/ScheduleBuilder/requirements.txt index 61e4169..ead4009 100644 --- a/ScheduleBuilder/requirements.txt +++ b/ScheduleBuilder/requirements.txt @@ -34,4 +34,3 @@ icalendar==5.0.11 pytest==7.4.3 pytest-django==4.7.0 pytest-cov==4.1.0 -