Merge branch 'develop' into register_module

Author: Lala Sabathil

README.md

@@ -13,55 +13,8 @@
 </p>
 
 # Human-Connection WebApp
-> uses the Nuxt.js and Express.js projects
-
-> **Note:** This is only the WebApp part of Human-Connection, you have to also checkout the [API](https://github.com/Human-Connection/API) which is used by this WebApp.
-
-## Local Installation
-
-Run:
-``` bash
-# install dependencies
-$ yarn install
-
-# serve with hot reload at localhost:3000
-$ yarn dev
-
-# build once and launch server
-$ yarn build
-$ yarn start
-```
-
-Create your individual set of environment variables:
-```sh
-$ cp .env.example .env
-# now open .env and change it according to your setup
-```
-
-For detailed explanation on how things work, checkout the [Nuxt.js docs](https://github.com/nuxt/nuxt.js).
-
-## Env Vars
-
-> More information on environment variables can be found in the [documentation (WIP)](https://docs.human-connection.org/environments/docker-test-production/docker-configuration.html)
-
-### Test Logins
-
-
-| Role      | E-Mail         | Password |
-| --------- | -------------- | -------- | 
-| Admin     | test@test.de   | 1234     |
-| Moderator | test2@test2.de | 1234     |
-| User      | test3@test3.de | 1234     |
-
-
-## Styleguide
-
-The Developer Style Guide provides important infos about components and styles. To start it simply type:
-
-``` bash
-$ yarn run styleguide
-```
-When built you can open it at [http://localhost:6060](http://localhost:6060)
+This is the frontend of HC.<br />
+It uses the Nuxt.js and Express.js projects.<br />
 
 ## Localization
 
@@ -72,12 +25,9 @@ When built you can open it at [http://localhost:6060](http://localhost:6060)
 [Lokalise.co](https://lokalise.co/public/829625945b3c04bf56d560.80490143/)
 
 ## Help
-
-The HC platform is documented in our [docs](https://docs.human-connection.org/) (work in progress).<br>
-Connect with other developers over [Discord](https://discord.gg/mVmjvNF).
+The HC platform and its setup is documented in our [docs](https://docs.human-connection.org/) (work in progress).<br />
+Connect with other developers over [Discord](https://discord.gg/354TGs2)<br />
 
 ## License 
-
-Copyright (c) 2018 [Human-Connection.org](https://human-connection.org)
-
-Licensed under the [MIT](https://github.com/Human-Connection/WebApp/blob/develop/LICENSE.md) license.
+Copyright (c) 2018 [Human-Connection.org](https://human-connection.org)<br />
+Licensed under the [MIT](https://github.com/Human-Connection/WebApp/blob/develop/LICENSE.md) license.<br />

docker-compose.override.yml

@@ -1,65 +1,15 @@
-version: '3'
+version: '3.5'
 
 services:
   webapp:
-    networks:
-      hc-network:
-        ipv4_address: 172.25.0.20
+    build:
+      context: .
+      args:
+        BUILD_COMMIT: ${BUILD_COMMIT}
     environment:
       - NODE_ENV=development
-      - MAINTENANCE=${MAINTENANCE}
-      - WEBAPP_HOST=172.25.0.20
-      - WEBAPP_BASE_URL=http://172.25.0.20:3000
-      - API_HOST=172.25.0.11
-      - WEBAPP_PORT=3000
-      - API_PORT=3030
-      - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
-      - SENTRY_DNS_PUBLIC=${SENTRY_DNS_PUBLIC}
-      - EMBED_API_URL=${EMBED_API_URL}
-        # these secrets should only be accessible on the server:
-      - SENTRY_DNS_PRIVATE=${SENTRY_DNS_PRIVATE}
-      - EMBED_API_TOKEN=${EMBED_API_TOKEN}
-    depends_on:
-      - api
-  mongo:
-    image: mongo
-    networks:
-      - hc-network
-    command: "--smallfiles --logpath=/dev/null"
-  api:
-    image: humanconnection/api-feathers
-    depends_on:
-      - maildev
-      - thumbor
-      - mongo
-    environment:
-      - NODE_ENV=staging
-    ports:
-      - "3030:3030"
-    stdin_open: true
+    volumes:
+      - .:/WebApp/
+      - /WebApp/node_modules
+    command: yarn run dev
     tty: true
-    networks:
-      hc-network:
-        ipv4_address: 172.25.0.11
-  maildev:
-    image: djfarrelly/maildev
-    networks:
-      - hc-network
-    ports:
-      - "1080:80"
-      - "1025:25"
-  thumbor:
-    image: apsl/thumbor
-    networks:
-      - hc-network
-    ports:
-      - "8000:8000"
-
-networks:
-  hc-network:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-      -
-        subnet: 172.25.0.0/16

docker-compose.staging.yml

@@ -0,0 +1,12 @@
+version: '3.5'
+
+services:
+  webapp:
+    environment:
+      - NODE_ENV=development # this is just `development` so https will not be enforced
+      - MAINTENANCE=${MAINTENANCE}
+      - SENTRY_DNS_PUBLIC=${SENTRY_DNS_PUBLIC}
+      - EMBED_API_URL=${EMBED_API_URL}
+        # these secrets should only be accessible on the server:
+      - SENTRY_DNS_PRIVATE=${SENTRY_DNS_PRIVATE}
+      - EMBED_API_TOKEN=${EMBED_API_TOKEN}

docker-compose.yml

@@ -1,13 +1,20 @@
-version: '3'
+version: '3.5'
 
 services:
   webapp:
-    image: humanconnection/frontend-nuxt
-    build:
-      context: .
-      args:
-        BUILD_COMMIT: ${BUILD_COMMIT}
-    stdin_open: true
-    tty: true
+    image: humanconnection/frontend-nuxt:edge
     ports:
-      - 3000:3000/tcp
+      - "3000:3000"
+    networks:
+      - hc-network
+    environment:
+      - WEBAPP_HOST=webapp
+      - WEBAPP_BASE_URL=http://localhost:3000
+      - API_HOST=api.127.0.0.1.xip.io
+      - WEBAPP_PORT=3000
+      - API_PORT=3030
+      - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+
+networks:
+  hc-network:
+    name: hc-network