Skip to content

Commit ef928cc

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 5a709a1 + 39edf83 commit ef928cc

36 files changed

+271
-6
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

MediWebApp/MediCare/MediCare/settings.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
'django.contrib.sessions',
3838
'django.contrib.messages',
3939
'django.contrib.staticfiles',
40+
'django.contrib.sites',
4041
'MediCareApp',
4142
'rest_framework',
4243
'rest_framework.authtoken',
@@ -89,6 +90,11 @@
8990
}
9091
}
9192

93+
EMAIL_USE_TLS = True
94+
EMAIL_HOST = 'smtp.gmail.com'
95+
EMAIL_HOST_USER = '[email protected]'
96+
EMAIL_HOST_PASSWORD = 'Hallbookingmbcet'
97+
EMAIL_PORT = 587
9298

9399
# Password validation
94100
# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
@@ -126,7 +132,9 @@
126132
# Static files (CSS, JavaScript, Images)
127133
# https://docs.djangoproject.com/en/3.0/howto/static-files/
128134

135+
129136
STATIC_URL = '/static/'
137+
130138
MEDIA_URL = '/media/'
131139
MEDIA_ROOT = os.path.join(BASE_DIR, "media")
132140
STATICFILES_DIRS = [

MediWebApp/MediCare/MediCare/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88

99
urlpatterns = [
10+
path('', include('MediCareApp.urls')),
1011
path('admin/', admin.site.urls),
1112
path('users/', include('MediCareApp.urls')),
1213
path('api-token-auth/', rest_views.obtain_auth_token, name='api-token-auth'),
13-
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
14-
14+
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)