From e486ebd2d52c33e356d57ebb0d07dbd9a52c6538 Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Sun, 15 Nov 2020 11:13:39 +0100 Subject: [PATCH] Add database --- apps/front/templates/chat.html | 13 +++++-------- docker-compose.yaml | 21 +++++++++++++++++++++ mi_web/settings.py | 9 ++++++--- 3 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 docker-compose.yaml diff --git a/apps/front/templates/chat.html b/apps/front/templates/chat.html index 8f16785..a8815b4 100644 --- a/apps/front/templates/chat.html +++ b/apps/front/templates/chat.html @@ -25,7 +25,7 @@
- +
@@ -53,6 +53,7 @@ /* * FUNCIONES */ + function anyadirNuevoMensajeAlHTML(nombre, texto, propio = false) { // Contenedor const MI_CONTENEDOR = document.createElement('div'); @@ -101,13 +102,9 @@ // Recibir mensaje CHAT_SOCKET.addEventListener('message', (event) => { - console.log('Recibido nuevo mensaje'); - const miNuevaData = JSON.parse(event.data); - // Add message to View - this.addMessage( - myData.member_send === this.$store.state.info_user.id, - myData.text - ); + console.log('Recibido nuevo mensaje'); + const MI_NUEVA_DATA = JSON.parse(event.data); + anyadirNuevoMensajeAlHTML(MI_NUEVA_DATA.nombre, MI_NUEVA_DATA.texto, false); }); // Enviar mensaje cuando se pulsa en Enviar diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..67ed10b --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,21 @@ +version: '3.1' + +services: + + db: + image: postgres + restart: always + volumes: + - ./postgres:/var/lib/postgresql/data + environment: + POSTGRES_DB: postgres + POSTGRES_PASSWORD: postgres + ports: + - 5432:5432 + + redis: + image: redis:alpine + restart: always + ports: + - 6379:6379 + diff --git a/mi_web/settings.py b/mi_web/settings.py index f594488..a23242b 100644 --- a/mi_web/settings.py +++ b/mi_web/settings.py @@ -70,7 +70,6 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'mi_web.wsgi.application' # Database @@ -78,8 +77,12 @@ WSGI_APPLICATION = 'mi_web.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'postgres', + 'USER': 'postgres', + 'PASSWORD': 'postgres', + 'HOST': '127.0.0.1', + 'PORT': '5432', } }