Skip to content

Commit

Permalink
Merge pull request #57 from Zncl2222/backend/style/settings
Browse files Browse the repository at this point in the history
style(settings): rename ZWeb_app to core
  • Loading branch information
Zncl2222 authored Aug 5, 2023
2 parents 20c7e7f + 6b96a81 commit c6f6af4
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 8 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion backend/ZWeb_app/asgi.py → backend/core/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

from django.core.asgi import get_asgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ZWeb_app.settings')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')

application = get_asgi_application()
4 changes: 2 additions & 2 deletions backend/ZWeb_app/settings.py → backend/core/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]

ROOT_URLCONF = 'ZWeb_app.urls'
ROOT_URLCONF = 'core.urls'

TEMPLATES = [
{
Expand All @@ -99,7 +99,7 @@
'django.contrib.auth.backends.ModelBackend',
]

WSGI_APPLICATION = 'ZWeb_app.wsgi.application'
WSGI_APPLICATION = 'core.wsgi.application'


# Database
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion backend/ZWeb_app/wsgi.py → backend/core/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
from django.core.wsgi import get_wsgi_application
from dj_static import Cling

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ZWeb_app.settings')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')

application = Cling(get_wsgi_application())
2 changes: 1 addition & 1 deletion backend/manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ZWeb_app.settings')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
Expand Down
2 changes: 1 addition & 1 deletion backend/pytest.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[pytest]
DJANGO_SETTINGS_MODULE = ZWeb_app.settings
DJANGO_SETTINGS_MODULE = core.settings
2 changes: 1 addition & 1 deletion backend/users/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.core.mail import send_mail
from django.shortcuts import redirect
from django.utils import timezone
from ZWeb_app import settings
from core import settings
from django.utils.crypto import get_random_string

from rest_framework import generics, permissions, status
Expand Down
2 changes: 1 addition & 1 deletion backend/uwsgi.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
http-socket = :$(PORT)
master = true
die-on-term = true
module = ZWeb_app.wsgi:application
module = core.wsgi:application
vacuum=True
max-requests=5000

0 comments on commit c6f6af4

Please sign in to comment.