Merge pull request #34 from datasci4health/development

Development

CHANGELOG.md

@@ -1,51 +1,75 @@
-<a name="unreleased"></a>
-## [Unreleased]
+<a name="v1.0.7"></a>
+## [v1.0.7](https://github.com/datasci4health/harena-manager/compare/v1.0.6...v1.0.7)
 
-### Fix
-- **artifact:** Fix error at artifact upload
+> 2019-08-05
+
+### Bug Fixes
+
+* **artifact:** Enable upload of .jpeg files - (close issue [#33](https://github.com/datasci4health/harena-manager/issues/33))
+* **artifact:** Fix error at artifact upload - (fix issue [#26](https://github.com/datasci4health/harena-manager/issues/26))
+
+### Build
+
+* **docker:** A docker image of develop environment avaivable
 
 
 <a name="v1.0.6"></a>
-## [v1.0.6] - 2019-07-23
+## [v1.0.6](https://github.com/datasci4health/harena-manager/compare/v1.0.5...v1.0.6)
+
+> 2019-07-23
+
 
 <a name="v1.0.5"></a>
-## [v1.0.5] - 2019-07-07
-### Bug
-- Error on delete case - [#23](https://github.com/datasci4health/harena-manager/issues/23)
+## [v1.0.5](https://github.com/datasci4health/harena-manager/compare/v1.0.4...v1.0.5)
 
-### Feature
-- **documentation:** Added a CHANGELOG
+> 2019-07-07
 
-### BREAKING CHANGE
+### Bug Fixes
 
-Harena Manager started to keep a changelog
+* Error on delete case - (close issue [#23](https://github.com/datasci4health/harena-manager/issues/23))
+
+### Features
+
+* **documentation:** Added a CHANGELOG in the project.
 
 <a name="v1.0.4"></a>
-## [v1.0.4] - 2019-05-15
+## [v1.0.4](https://github.com/datasci4health/harena-manager/compare/v1.0.3...v1.0.4)
+
+> 2019-05-15
+
 
 <a name="v1.0.3"></a>
-## [v1.0.3] - 2019-05-14
+## [v1.0.3](https://github.com/datasci4health/harena-manager/compare/v1.0.1...v1.0.3)
+
+> 2019-05-14
 
-<a name="v1.0.2"></a>
-## [v1.0.2] - 2019-05-12
 
 <a name="v1.0.1"></a>
-## [v1.0.1] - 2019-05-12
+## [v1.0.1](https://github.com/datasci4health/harena-manager/compare/v1.0.2...v1.0.1)
+
+> 2019-05-12
+
+
+<a name="v1.0.2"></a>
+## [v1.0.2](https://github.com/datasci4health/harena-manager/compare/v1.0.0...v1.0.2)
+
+> 2019-05-12
+
 
 <a name="v1.0.0"></a>
-## [v1.0.0] - 2019-05-12
+## [v1.0.0](https://github.com/datasci4health/harena-manager/compare/v0.1.0...v1.0.0)
+
+> 2019-05-12
+
 
 <a name="v0.1.0"></a>
-## [v0.1.0] - 2019-05-05
+## [v0.1.0](https://github.com/datasci4health/harena-manager/compare/v0.0.1...v0.1.0)
+
+> 2019-05-05
+
 
 <a name="v0.0.1"></a>
-## v0.0.1 - 2019-04-15
-
-[Unreleased]: https://github.com/datasci4health/harena-manager/compare/v1.0.5...HEAD
-[v1.0.5]: https://github.com/datasci4health/harena-manager/compare/v1.0.4...v1.0.5
-[v1.0.4]: https://github.com/datasci4health/harena-manager/compare/v1.0.3...v1.0.4
-[v1.0.3]: https://github.com/datasci4health/harena-manager/compare/v1.0.2...v1.0.3
-[v1.0.2]: https://github.com/datasci4health/harena-manager/compare/v1.0.1...v1.0.2
-[v1.0.1]: https://github.com/datasci4health/harena-manager/compare/v1.0.0...v1.0.1
-[v1.0.0]: https://github.com/datasci4health/harena-manager/compare/v0.1.0...v1.0.0
-[v0.1.0]: https://github.com/datasci4health/harena-manager/compare/v0.0.1...v0.1.0
+## v0.0.1
+
+> 2019-04-15
+

README.md

@@ -22,38 +22,16 @@
 
 If you want to run the harena-manager code
 
-### Running as a Docker container - Linux
-
-This is the recomended way of run the harena-manager code, since it guarantees the default configuration of the development environment, dispensing a manual configuration.
-
-Clone the repository and get into it:
-
-```bash
-git clone https://github.com/datasci4health/harena-manager.git
-cd harena-manager
-```
-
-Then, checkout to development branch and get the latest code version:
+### Running as Docker containers - Linux
 
 ```bash
-git checkout -b development
-git pull origin development
+sudo apt-get install -y wget
+wget https://github.com/datasci4health/harena-manager/blob/master/docker-compose.yml
+sudo docker-compose up
 ```
 
-Then, run the command to start the docker<sup>1</sup> container:
+<small> Make sure you have **node.js** and **npm** already installed (see [system requirements](#system-requirements) for more details). </small>
 
-```bash
-docker-compose up
-```
-<sub><sup>1</sup>Make sure you have [docker](https://docs.docker.com/install/) and [docker-compose command](https://docs.docker.com/compose/install/) already installed on your system.</sub>
-
-After starting the container, go to http://localhost:10010/ to see the welcome page.
-
-If you want to get the command line of the container, then run the command:
-
-```bash
-docker exec -it adonisjs_harena-manager_1 bash
-```
 
 
 ### Running locally - Linux

docker-compose.yml

@@ -2,16 +2,18 @@ version: '3'
 
 services:
 
-
   harena-manager:
     image: datasci4health/harena-manager:v1
     ports:
       - "10020:10020"
+#    This not work yet
+#    volumes:
+#      - ./src/adonisjs:/app
     environment:
-      - ENV_SILENT=true      
+      - ENV_SILENT=false
       - HOST=0.0.0.0
       - PORT=10020
-      - NODE_ENV=production
+      - NODE_ENV=dev
       - APP_NAME=harena-manager
       - APP_URL=http://0.0.0.0:10020
       - CACHE_VIEWS=false
@@ -29,7 +31,6 @@ services:
     networks:
       - harena-manager
 
-
   harena-manager-database:
     image: mysql:5.7
     ports:

src/adonisjs/.env.example

@@ -1,14 +1,18 @@
 HOST=127.0.0.1
-PORT=3333
-NODE_ENV=development
+PORT=10020
 APP_URL=http://${HOST}:${PORT}
+APP_NAME=jacinto-casemanager
+
 CACHE_VIEWS=false
+
+NODE_ENV=development
+
 APP_KEY=
-DB_CONNECTION=sqlite
+
+DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_USER=
-DB_PASSWORD=
-DB_DATABASE=
-SESSION_DRIVER=cookie
+DB_PORT=10021
+DB_DATABASE=harena-manager
+DB_USER=jacinto
+DB_PASSWORD=jacinto
 HASH_DRIVER=bcrypt

src/adonisjs/app/Controllers/Http/v1/ArtifactController.js

@@ -9,12 +9,11 @@ const uuid4     = require('uuid/v4');
 class ArtifactController {
 
 	constructor(){
-
  		// See this for more on MIM types: https://docs.openx.com/Content/publishers/adunit_linearvideo_mime_types.html
 		this.validationOptions = {
 			  						size:     '100mb',
 			  						types:    ['image','video'],
-			  						extnames: ['png', 'jpg', 'jpge', 'gif','mp4','avi', '.wmv']
+			  						extnames: ['png', 'jpg', 'jpeg', 'gif','mp4','avi', '.wmv']
 								  }
 
 		this.relativePath     = '/artifacts/' 

src/adonisjs/bootstrap.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+adonis migration:run
+adonis seed --files InitialSeeder.js
+
+adonis serve --dev --debug