diff --git a/backend/api/api/__pycache__/asgi.cpython-310.pyc b/backend/api/api/__pycache__/asgi.cpython-310.pyc index 3f2c180c..236b7a5e 100644 Binary files a/backend/api/api/__pycache__/asgi.cpython-310.pyc and b/backend/api/api/__pycache__/asgi.cpython-310.pyc differ diff --git a/backend/api/api/__pycache__/settings.cpython-310.pyc b/backend/api/api/__pycache__/settings.cpython-310.pyc index 253607b3..f8d68288 100644 Binary files a/backend/api/api/__pycache__/settings.cpython-310.pyc and b/backend/api/api/__pycache__/settings.cpython-310.pyc differ diff --git a/backend/api/api/settings.py b/backend/api/api/settings.py index bb89aca0..08fb5431 100644 --- a/backend/api/api/settings.py +++ b/backend/api/api/settings.py @@ -232,7 +232,7 @@ REST_FRAMEWORK = { -LOGGING = { +"""LOGGING = { 'version': 1, 'disable_existing_loggers': False, 'handlers': { @@ -251,7 +251,7 @@ LOGGING = { 'propagate': False, }, }, -} +}""" diff --git a/backend/api/db.sqlite3 b/backend/api/db.sqlite3 index ace2d4ea..620f2ed1 100644 Binary files a/backend/api/db.sqlite3 and b/backend/api/db.sqlite3 differ diff --git a/backend/api/exercices/__pycache__/views.cpython-310.pyc b/backend/api/exercices/__pycache__/views.cpython-310.pyc index e689167f..37f087ed 100644 Binary files a/backend/api/exercices/__pycache__/views.cpython-310.pyc and b/backend/api/exercices/__pycache__/views.cpython-310.pyc differ diff --git a/backend/api/exercices/views.py b/backend/api/exercices/views.py index 68083ddf..4edcd0d4 100644 --- a/backend/api/exercices/views.py +++ b/backend/api/exercices/views.py @@ -432,7 +432,7 @@ def pdfGen(request): check=True, cwd=direct) except TexError: - raise TexError(log=log, source=latex, + raise TexError(log="./logs.txt", source=latex, template_name='test.tex') try: subprocess.run(command, shell=True, @@ -441,7 +441,7 @@ def pdfGen(request): check=True, cwd=direct) except TexError: - raise TexError(log=log, source=latex, + raise TexError(log='./logs.txt', source=latex, template_name='test.tex') with open(os.path.join(direct, 'tmp.pdf'), 'rb') as out: diff --git a/backend/api/room/__pycache__/consumers.cpython-310.pyc b/backend/api/room/__pycache__/consumers.cpython-310.pyc index b7c5172d..b77f23ac 100644 Binary files a/backend/api/room/__pycache__/consumers.cpython-310.pyc and b/backend/api/room/__pycache__/consumers.cpython-310.pyc differ diff --git a/backend/api/room/consumers.py b/backend/api/room/consumers.py index f17fbab2..0151cbf6 100644 --- a/backend/api/room/consumers.py +++ b/backend/api/room/consumers.py @@ -22,9 +22,8 @@ class RoomConsumer(AsyncWebsocketConsumer): await self.accept() await self.send(json.dumps({'type': 'connect', "clientId": self.clientId})) - except: - + print('test') await self.close() async def receive(self, text_data): diff --git a/frontend/.env.production b/frontend/.env.production index 42932a18..56d231f4 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -1,9 +1,3 @@ -<<<<<<< HEAD NEXT_PUBLIC_HOSTNAME=141.136.42.178 -PORT=80 -NEXT_PUBLIC_HOST=http://$NEXT_PUBLIC_HOSTNAME:$PORT -======= -NEXT_PUBLIC_HOSTNAME=192.168.1.18 NEXT_PUBLIC_PORT=80 NEXT_PUBLIC_HOST=http://$NEXT_PUBLIC_HOSTNAME:$NEXT_PUBLIC_PORT ->>>>>>> 14ab2403983411dea6475cad781ddef9a1c89b7c diff --git a/frontend/context/websocket.context.js b/frontend/context/websocket.context.js index b3c2e64c..021f15ca 100644 --- a/frontend/context/websocket.context.js +++ b/frontend/context/websocket.context.js @@ -18,7 +18,7 @@ export const WebsocketProvider = ({ children }) => { var url = url.startsWith('/')? url: '/' + url ws.current = new ReconnectingWebSocket( - `ws://${process.env.NEXT_PUBLIC_HOST}:${process.env.NEXT_PUBLIC_PORT}${url}` + `ws://${process.env.NEXT_PUBLIC_HOSTNAME}:${process.env.NEXT_PUBLIC_PORT}${url}` ); ws.current.onopen = () => {