dockered

.env

@@ -0,0 +1,3 @@
+POSTGRES_DB=django
+POSTGRES_USER=django
+POSTGRES_PASSWORD=apagnan

django/Dockerfile

@@ -0,0 +1,13 @@
+FROM python:slim
+
+WORKDIR /app
+
+RUN apt-get update && apt-get -y install gettext
+
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+
+COPY . .
+
+ENTRYPOINT ["sh", "docker-entrypoint.sh"]
+CMD ["0.0.0.0:8000"]

django/docker-entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/env sh
+
+python manage.py makemigrations chat games profiles notice
+python manage.py migrate
+python manage.py compilemessages
+
+exec python manage.py runserver "$@"

django/frontend/static/js/api/Client.js

@@ -2,14 +2,6 @@ import { Account } from "./Account.js";
 import { MatchMaking } from "./Matchmaking.js";
 import { Profiles } from "./Profiles.js";
 import { MyProfile } from "./MyProfile.js";
-<<<<<<< Updated upstream
-import { Channel } from "./chat/Channel.js";
-||||||| Stash base
-import { Tourmanents } from "./tournament/Tournaments.js";
-import { Channel } from "./chat/Channel.js";
-=======
-import { Tourmanents } from "./tournament/Tournaments.js";
->>>>>>> Stashed changes
 import Notice from "./Notice.js";
 import LanguageManager from './LanguageManager.js';