add it in a state where backend integration-tests are running and mock users are created

Author: 4drianMatei

.gitignore

@@ -0,0 +1 @@
+/.idea/

.idea/workspace.xml

@@ -0,0 +1,86 @@
+# Bookmarks Manager for Developers & Co
+Bookmarks.dev is a bookmark manager created and designed primarily for Developers & Co. It helps you [save time and nerves
+when managing your dev bookmarks](https://dev.to/ama/how-i-manage-my-dev-bookmarks-and-save-time-and-nerves-56ae) and eases
+[bookmarking of code snippets via Codelets](https://dev.to/ama/bookmarking-code-snippets-with-codelets-3d44). Check our
+[HowTo](https://www.bookmarks.dev/howto) page to help you get started. 
+ 
+Most worthy public bookmarks are published regularly on Github in a [separate repository](https://github.com/CodepediaOrg/bookmarks).
+
+## Getting started
+These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
+
+The project is developed with the MEAN stack and [Keycloak](http://www.keycloak.org/) for authentication and authorization:
+![components-graph](documentation/graphviz/components-graph.png)
+
+The project contains two parts
+* [frontend](frontend) which makes up the User Interface. This uses with Angular and Angular CLI.
+* [backend](backend) which is the API supporting the UI. This uses ExpressJS with MongoDB and Keycloak.
+
+### Prerequisites
+
+What you need to run this app:
+* `node` and `npm` (we recommend using [NVM](https://github.com/creationix/nvm))
+  * Ensure you're running Node at least (`v6.x.x`+) and NPM (`3.x.x`+)
+* [nodemon](https://nodemon.io/) - `npm install -g nodemon`
+* **Docker** - we recommend using [Docker Desktop](https://www.docker.com/products/docker-desktop)
+
+> Docker and Docker-compose are currently used only for local development
+
+### Installing (development setup)
+
+#### Start MongoDB and Keycloak server
+
+```bash
+docker-compose up
+```
+> Use `-d` to run it in the background
+
+#### Create a test user (2 min)
+You need to create a test user in Keycloak first.
+Follow the screenshots in [Add a Keycloak user](documentation/keycloak/add-keycloak-user.md) to create it.
+
+#### Install and run backend
+```shell
+# install
+cd backend
+nvm use
+npm install
+
+# run
+npm run debug
+```
+or in one line `cd backend; nvm use; npm install; npm run debug`
+
+This will start the API with [nodemon](http://nodemon.io) at [http://localhost:3000/api](http://localhost:3000/api) and will watch for code changes and automatically redeploy.
+
+> To be able to automatically add youtube videos published date and duration to the title you need to
+create a _nodemon.json_ file based on the [nodemon.json.example](nodemon.json.example) and a real youtube api key
+
+#### Install and run frontend
+```shell
+# install
+cd frontend
+nvm use
+npm install
+
+# run
+ng serve
+```
+or in one line `cd frontend; nvm use; npm install; ng serve`
+
+A step by step series of examples that tell you how to get a development env running
+* [backend](backend/README.md) - `cd backend; docker-compose up; nvm use; npm install; npm run debug`
+* [frontend](frontend/README.md) - TLDR `cd frontend; nvm use; npm install; ng serve`
+
+#### Backend 
+
+## Contributing
+Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.
+
+## Versioning
+
+We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/CodepediaOrg/bookmarks.dev/tags).
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details

backend/CONTRIBUTING.md CONTRIBUTING.mdbackend/CONTRIBUTING.md renamed to CONTRIBUTING.md

@@ -45,4 +45,4 @@ nodemon.json
 # pm2 prod setup
 pm2-process.json
 
-/docs/keycloak/get-access-token.local-dev.md
+/documentation/keycloak/get-access-token.local-dev.md

README.md

@@ -8,13 +8,13 @@ Back-end REST API for [www.bookmarks.dev](http://www.bookmarks.dev).
 * [Angular](https://angular.io/docs/ts/latest/)
 * [NodeJS](https://nodejs.org/en/docs/)
 * [Keycloak](http://www.keycloak.org/) for authentication and authorization:
- 
+
  ![components-graph](docs/graphviz/components-graph.png)
- 
+
 > The production setup is can be found here - [components production](https://raw.githubusercontent.com/wiki/CodepediaOrg/bookmarks-api/images/network-diagram.png)
 ***
 
-## Getting Started 
+## Getting Started
 
 These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
  See deployment for notes on how to deploy the project on a live system.
@@ -31,20 +31,6 @@ What you need to run this app:
 
 A step by step series of examples that tell you how to get a development env running
 
-#### Start MongoDB and Keycloak server
-
-```bash
-docker-compose up
-
-OR
-
-docker-compose up -d # if you want it to run in the background
-```
-
-#### Create a Keycloak user (2 min)
-To test with the front-end [bookmarks.dev](https://github.com/CodepediaOrg/bookmarks.dev) create a Keycloak test user.
-Follow the screenshots in [Add a Keycloak user](docs/keycloak/add-keycloak-user.md) to create it.
-
 #### Start the development server (API)
 
 ```bash
@@ -53,14 +39,9 @@ npm install
 npm run debug
 ```
 
-This will start the API with [nodemon](http://nodemon.io) and will watch for code changes and automatically redeploy. 
-
-> To be able to automatically add youtube videos published date and duration to the title you need to 
-create a _nodemon.json_ file based on the [nodemon.json.example](nodemon.json.example) and a real youtube api key
-
 #### Debugging
 
-##### IntelliJ / Wegstorm (Node.js plugin is required)
+##### IntelliJ / Webstorm (Node.js plugin is required)
 The ``npm run debug`` starts nodemon with the `--inspect` parameter so you can attach to this process, by using the following configuration:
 ![nodejs-remote-debugging](docs/debugging/attach-to-nodemon-process.png)
 
@@ -70,7 +51,7 @@ See [Node.js debugging in VS Code with Nodemon](https://github.com/microsoft/vsc
 
 
 #### Get Keycloak access token via API call
-To get a keycloak access token via API call see [Get Access Token from Keycloak via API call](docs/keycloak/get-access-token.md)
+To get a keycloak access token via API call see [Get Access Token from Keycloak via API call](../documentation/keycloak/get-access-token.md)
 
 ## Testing
 
@@ -90,7 +71,7 @@ A report will be generated.
 
 The API has an OpenAPI specification available at [docs/openapi/openapi.yaml](docs/openapi/openapi.yaml)
 
-Based on that a GUI is generated to test the API directly from browser: 
+Based on that a GUI is generated to test the API directly from browser:
 * [local](http://localhost:3000/api/docs)
 * [production](https://www.bookmarks.dev/api/docs)
 
@@ -115,17 +96,6 @@ pm2 restart pm2-process.json --env production
 pm2 stop pm2-process.json --env production
 ```
 
-## Contributing  
-Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.
-
-## Versioning
-
-We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/CodepediaOrg/bookmarks.dev-api/tags).
-
-## License
-
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
-
 
 
 ## Appendix

backend/.gitignore

@@ -24,9 +24,10 @@ describe('Admin API Tests', function () {
     //set admin bearer token
     const response = await superagent
       .post(config.integration_tests.token_endpoint)
-      .send('client_id=' + config.integration_tests.admin.client_id)
-      .send('client_secret=' + config.integration_tests.admin.client_secret)
-      .send('grant_type=client_credentials')
+      .send('client_id=' + 'bookmarks')
+      .send('username=' + 'admin-integration-tests')//TODO change me
+      .send('password=' + 'admin-integration-tests')
+      .send('grant_type=password')
       .set('Accept', 'application/json');
 
     adminBearerToken = 'Bearer ' + response.body.access_token;