Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "changed Account name, closes #70" #72

Merged
merged 1 commit into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ScheduleBuilder/ScheduleBuilder/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -49,7 +49,7 @@
'django.contrib.staticfiles',
'core',
'google_calendar',
'profile',
'account',
'friend',
]

Expand Down
4 changes: 2 additions & 2 deletions ScheduleBuilder/ScheduleBuilder/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'),
Expand Down
Original file line number Diff line number Diff line change
@@ -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



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

class AccountConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'profile'
name = 'account'
Original file line number Diff line number Diff line change
@@ -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.')
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.urls import path
from profile.views import account_view
from account.views import account_view

app_name = 'account'

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion ScheduleBuilder/friend/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
1 change: 0 additions & 1 deletion ScheduleBuilder/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ icalendar==5.0.11
pytest==7.4.3
pytest-django==4.7.0
pytest-cov==4.1.0