Skip to content

Commit

Permalink
Merge pull request #42 from GIS-Info/revert-38-main
Browse files Browse the repository at this point in the history
Revert "added django-mailinglist"
  • Loading branch information
kian-zh authored Jan 8, 2024
2 parents 470321e + 0b0efb2 commit 44a04f3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 21 deletions.
19 changes: 1 addition & 18 deletions nextServer/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@
'apps.post',
'accounts',
'knox',
'django.contrib.sites',
'sorl.thumbnail',
'mailinglist',
]
if DEBUG:
INSTALLED_APPS += ['drf_yasg']
Expand All @@ -72,8 +69,6 @@

ROOT_URLCONF = 'nextServer.urls'

SITE_ID = 1# Adjust this ID based on your site's ID in the database

TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
Expand All @@ -91,13 +86,10 @@
]

WSGI_APPLICATION = 'nextServer.wsgi.application'
NEWSLETTER_THUMBNAIL = 'sorl-thumbnail'

# Database
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases

MAILINGLIST_BASE_URL = "https://www.gisphere.info" # NO TRAILING SLASH PLEASE
MAILINGLIST_DEFAULT_SENDER_EMAIL = "[email protected]"

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
Expand Down Expand Up @@ -164,15 +156,6 @@
],
}

# email SMTP setting
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'smtp-mail.outlook.com' # or your Outlook SMTP server address
EMAIL_PORT = 587 # Outlook SMTP port
EMAIL_USE_TLS = True # Use TLS encryption
EMAIL_HOST_USER = '[email protected]' # Your Outlook email address
EMAIL_HOST_PASSWORD = 'Tum54104' # Your Outlook email password or app password
DEFAULT_FROM_EMAIL = '[email protected]'

# LOGGING_DIR = BASE_DIR.joinpath("logs")
# debug_log_dir = LOGGING_DIR / "debug"
# info_log_dir = LOGGING_DIR / "info"
Expand Down
1 change: 0 additions & 1 deletion nextServer/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
path('api/', include("apps.post.urls")),
path('api/', include("apps.school.urls")),
path('', include('accounts.urls')),
path("mailinglist/", include("mailinglist.urls", namespace="mailinglist")),
]
if settings.DEBUG:
urlpatterns += [path('', include('app.apis.swagger.urls')),
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ PyMySQL==1.0.2
pytz==2022.1
sqlparse==0.4.2
django-rest-knox==4.2.0
drf_yasg==1.21.4
django-mailinglist==0.1.5
drf_yasg==1.21.4

0 comments on commit 44a04f3

Please sign in to comment.