From 27daf06e3456fc7e4570eb4dc03df412d163f6f1 Mon Sep 17 00:00:00 2001 From: Tim Buchholz Date: Sun, 21 Feb 2021 15:57:05 +0100 Subject: [PATCH 1/2] Clarification in Readme about Object-Deletion --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 68138a6b..2a8a86fe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![](https://github.com/BuchholzTim/Whitebird/wiki/images/banner.png) -Whitebird is an open-source, web-based, collaborative, digital Whiteboard built with [NestJS](https://nestjs.com/), [MongoDB](https://www.mongodb.com/), [NuxtJs](https://nuxtjs.org/) and [FabricJs](https://github.com/fabricjs/fabric.js). +Whitebird is an open-source, web-based, collaborative, digital Whiteboard built with [NestJS](https://nestjs.com/), [MongoDB](https://www.mongodb.com/), [NuxtJs](https://nuxtjs.org/) and [FabricJs](https://github.com/fabricjs/fabric.js). The application was developed as part as a study project at the [Hochschule Kaiserslautern](https://github.com/HochschuleKaiserslautern). Due to limited time, we cannot promise to actively continue development on this project, but we will of course look into Pull Requests! @@ -21,14 +21,13 @@ Currently the application is in early development and contains the following fea - Export of the whiteboard as .png/.pdf - Changeable Background: Use backgrounds as templates for organizing your whiteboard -- Whiteboard Tools +- Whiteboard Tools - Creation of Text-Fields - Pencil for freehand drawing - Basic geometric objects: circle, square - Sticky Notes - Basic Edit Actions: Deleting, Moving, Rotating and Scaling of objects - - + - Deleting is currently only supported by selecting & pressing the 'delete'-key. ### Getting Started From cf1eadd8d6634f50c26b6c9fcb86cfcedcc201ac Mon Sep 17 00:00:00 2001 From: Tim Buchholz Date: Sun, 21 Feb 2021 15:58:05 +0100 Subject: [PATCH 2/2] Removed Unused .env-Config & Added Clarification --- docker/whitebird_prod/docker-compose.yml | 1 - docker/whitebird_prod/frontend.env | 6 ------ frontend/.env.bak | 1 + frontend/Dockerfile | 1 + 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 docker/whitebird_prod/frontend.env diff --git a/docker/whitebird_prod/docker-compose.yml b/docker/whitebird_prod/docker-compose.yml index 3fe187da..86bfed0d 100644 --- a/docker/whitebird_prod/docker-compose.yml +++ b/docker/whitebird_prod/docker-compose.yml @@ -22,7 +22,6 @@ services: container_name: WhitebirdFrontend restart: 'no' build: ../../frontend - env_file: ./frontend.env ports: - '40000:5000' diff --git a/docker/whitebird_prod/frontend.env b/docker/whitebird_prod/frontend.env deleted file mode 100644 index 0ec225c0..00000000 --- a/docker/whitebird_prod/frontend.env +++ /dev/null @@ -1,6 +0,0 @@ -# Backend Server Location -API_URL='http://backend:3001/' -SOCKET_URL='http://backend:3001/' - -# Frontend Host -FRONTEND_HOST='http://localhost:40000' \ No newline at end of file diff --git a/frontend/.env.bak b/frontend/.env.bak index bb12f81c..bd22ae73 100644 --- a/frontend/.env.bak +++ b/frontend/.env.bak @@ -1,3 +1,4 @@ +# If you are using Docker - Please Change the ENV Variables directly in the Dockerfile # Backend Server Location API_URL='http://localhost:3001/' SOCKET_URL='http://localhost:3002/' diff --git a/frontend/Dockerfile b/frontend/Dockerfile index e7e045bf..4e35392d 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -28,6 +28,7 @@ FROM node:14-alpine as production-stage WORKDIR /app +# This makes Nuxt available from every IP & Sets the Port internally of docker. ENV NUXT_HOST=0.0.0.0 ENV NUXT_PORT=5000