From f1d892facb1b3546b51435988370b508bc162452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 1 Nov 2021 10:38:48 +0100 Subject: [PATCH 1/2] Change README.md db commands for docker --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e7d9b2b72..4fcd9abd0 100644 --- a/README.md +++ b/README.md @@ -110,18 +110,19 @@ $ docker-compose -f docker-compose.yml up This will start all required Docker containers. Make sure your database is running on `http://localhost:7474/browser/`. -Prepare database once before you start: +Prepare database once before you start by running the following command in a second terminal: ```bash -# in folder backend/ -yarn run db:migrate init +# in main folder while docker-compose is up +$ docker-compose exec backend yarn run db:migrate init ``` -Then clear and seed database: +Then clear and seed database by running the following command as well in the second terminal: ```bash -# in folder backend/ -$ yarn run db:reset && db:seed +# in main folder while docker-compose is up +$ docker-compose exec backend yarn run db:reset +$ docker-compose exec backend yarn run db:seed ``` For a closer description see [backend README.md](./backend/README.md). From ef3a765d3a56c85b5367343d7d83c5b456c7d590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 1 Nov 2021 15:25:01 +0100 Subject: [PATCH 2/2] Add development logins again --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 4fcd9abd0..603ea8178 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,18 @@ Change into the new folder. $ cd Ocelot-Social ``` +### Login + + + +Logins in the browser after the following installations: + +| email | password | role | +| :--- | :--- | :--- | +| `user@example.org` | 1234 | user | +| `moderator@example.org` | 1234 | moderator | +| `admin@example.org` | 1234 | admin | + ### Docker Installation Docker is a software development container tool that combines software and its dependencies into one standardized unit that contains everything needed to run it. This helps us to avoid problems with dependencies and makes installation easier.