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

Jueun #2

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
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
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
*.pyc
__pycache__
*.local_settings*.pot
*.pvc
*.py[cod]
db.sqlite3
.DS_Store
/static
/media
venv
.Python
venv/
.venv
.idea
.vscode
local_settings.py
postgresql_15.exe
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.8.6
2 changes: 0 additions & 2 deletions chat/templates/chat/room_chat.html
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@

const { message } = props;
console.log("웹소켓으로 전송할 메세지 :", message);
{#this.append_message(message);#}

this.ws.send(JSON.stringify({
type : "chat.message",
message : message,
Expand Down
28 changes: 14 additions & 14 deletions ecopschat/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import dj_database_url
import django_heroku
from environ import Env
import os
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent

Expand Down Expand Up @@ -50,12 +51,13 @@
# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-ccpa_dgd-*m0a)#nd#u&bhrt&$#i5&u*eu&l4$au9+z-748(&0'
SECRET_KEY = os.environ.setdefault('DJANGO_SECRET_KEY', 'django-insecure-ccpa_dgd-*m0a)#nd#u&bhrt&$#i5&u*eu&l4$au9+z-748(&0')


# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
DEBUG = bool(os.environ.setdefault('DJANGO_DEBUG', "True"))

ALLOWED_HOSTS = ['127.0.0.1','.herokuapp.com']
ALLOWED_HOSTS = ['*']


# Application definition
Expand All @@ -73,6 +75,7 @@
"django_bootstrap5",
"chat",
"accounts",
'corsheaders',
]

MIDDLEWARE = [
Expand All @@ -84,6 +87,7 @@
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'whitenoise.middleware.WhiteNoiseMiddleware',
'corsheaders.middleware.CorsMiddleware',
]
django_heroku.settings(locals())
ROOT_URLCONF = 'ecopschat.urls'
Expand Down Expand Up @@ -117,12 +121,6 @@
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': BASE_DIR / 'db.sqlite3',
# 'ENGINE': 'django.db.backends.postgresql_psycopg2',
# 'NAME': 'ounce_db',
# 'USER': 'postgres',
# 'PASSWORD': 'ecops123',
# 'HOST': 'localhost',
# 'PORT': 5432,
}
}

Expand Down Expand Up @@ -159,12 +157,14 @@
USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.1/howto/static-files/

STATIC_URL = 'static/'

# Default primary key field type
# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.1/howto/static-files/

STATIC_URL = '/static/'
STATIC_ROOT=os.path.join(BASE_DIR, 'staticfiles')
16 changes: 8 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
asgiref==3.6.0
async-timeout==4.0.2
attrs==22.2.0
autobahn==23.1.1
autobahn==23.1.2
Automat==22.10.0
beautifulsoup4==4.11.2
certifi==2022.12.7
Expand All @@ -11,11 +11,12 @@ channels-redis==4.0.0
charset-normalizer==3.0.1
colorama==0.4.6
constantly==15.1.0
cryptography==39.0.0
cryptography==39.0.1
daphne==4.0.0
dj-database-url==1.2.0
Django==4.1.6
Django==4.1.7
django-bootstrap5==22.2
django-cors-headers==3.13.0
django-environ==0.9.0
django-heroku==0.3.1
exceptiongroup==1.1.0
Expand All @@ -28,25 +29,24 @@ msgpack==1.0.4
packaging==23.0
pluggy==1.0.0
psycopg2==2.9.5
psycopg2-binary==2.9.5
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.21
pyOpenSSL==23.0.0
pytest==7.2.1
pytest-asyncio==0.20.3
pytest-django==4.5.2
pytest-testdox==3.0.1
redis==4.4.2
redis==4.5.1
requests==2.28.2
service-identity==21.1.0
six==1.16.0
soupsieve==2.3.2.post1
soupsieve==2.4
sqlparse==0.4.3
tomli==2.0.1
Twisted==22.10.0
twisted-iocpsupport==1.0.2
txaio==23.1.1
typing_extensions==4.4.0
typing_extensions==4.5.0
tzdata==2022.7
urllib3==1.26.14
whitenoise==6.3.0
Expand Down
2 changes: 1 addition & 1 deletion runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.10.4
python-3.10.7