Merge pull request #72 from ChicoState/revert-71-account_name

Revert "changed Account name, closes #70"

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',
 ]
 

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'),

ScheduleBuilder/profile/admin.py → 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
 
 
 

ScheduleBuilder/profile/apps.py → ScheduleBuilder/account/apps.py

@@ -3,4 +3,4 @@
 
 class AccountConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'profile'
+    name = 'account'

ScheduleBuilder/profile/forms.py → 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.')

ScheduleBuilder/profile/urls.py → 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'
 

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
 
 

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
-