Skip to content

Commit

Permalink
Merge branch 'release/3.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
hirsch88 committed Mar 27, 2018
2 parents 2d2e6fd + 3e49cc7 commit ea30ebc
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 42 deletions.
42 changes: 21 additions & 21 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
#
# APPLICATION
#
APP_NAME="express-typescript-boilerplate"
APP_SCHEMA="http"
APP_HOST="localhost"
APP_PORT="3000"
APP_ROUTE_PREFIX="/api"
APP_NAME=express-typescript-boilerplate
APP_SCHEMA=http
APP_HOST=localhost
APP_PORT=3000
APP_ROUTE_PREFIX=/api
APP_BANNER=true

#
# LOGGING
#
LOG_LEVEL="debug"
LOG_LEVEL=debug
LOG_JSON=false
LOG_OUTPUT="dev"
LOG_OUTPUT=dev

#
# AUTHORIZATION
#
AUTH_ROUTE="http://localhost:3333/tokeninfo"
AUTH_ROUTE=http://localhost:3333/tokeninfo

#
# DATABASE
#
DB_TYPE="mysql"
DB_HOST="localhost"
DB_TYPE=mysql
DB_HOST=localhost
DB_PORT=3306
DB_USERNAME="root"
DB_PASSWORD=""
DB_DATABASE="my_database"
DB_USERNAME=root
DB_PASSWORD=
DB_DATABASE=my_database
DB_SYNCHRONIZE=false
DB_LOGGING=false

#
# GraphQL
#
GRAPHQL_ENABLED=true
GRAPHQL_ROUTE="/graphql"
GRAPHQL_ROUTE=/graphql
GRAPHQL_EDITOR=true

#
# Swagger
#
SWAGGER_ENABLED=true
SWAGGER_ROUTE="/swagger"
SWAGGER_FILE="api/swagger.json"
SWAGGER_USERNAME="admin"
SWAGGER_PASSWORD="1234"
SWAGGER_ROUTE=/swagger
SWAGGER_FILE=api/swagger.json
SWAGGER_USERNAME=admin
SWAGGER_PASSWORD=1234

#
# Status Monitor
#
MONITOR_ENABLED=true
MONITOR_ROUTE="/monitor"
MONITOR_USERNAME="admin"
MONITOR_PASSWORD="1234"
MONITOR_ROUTE=/monitor
MONITOR_USERNAME=admin
MONITOR_PASSWORD=1234
36 changes: 18 additions & 18 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
#
# APPLICATION
#
APP_NAME="express-typescript-boilerplate"
APP_SCHEMA="http"
APP_HOST="localhost"
APP_PORT="3000"
APP_ROUTE_PREFIX="/api"
APP_NAME=express-typescript-boilerplate
APP_SCHEMA=http
APP_HOST=localhost
APP_PORT=3000
APP_ROUTE_PREFIX=/api
APP_BANNER=false

#
# LOGGING
#
LOG_LEVEL="none"
LOG_LEVEL=none
LOG_JSON=false
LOG_OUTPUT="dev"
LOG_OUTPUT=dev

#
# AUTHORIZATION
#
AUTH_ROUTE="http://localhost:3333/tokeninfo"
AUTH_ROUTE=http://localhost:3333/tokeninfo

#
# DATABASE
#
DB_TYPE="sqlite"
DB_DATABASE="./mydb.sql"
DB_TYPE=sqlite
DB_DATABASE=./mydb.sql
DB_LOGGING=false

#
# GraphQL
#
GRAPHQL_ENABLED=true
GRAPHQL_ROUTE="/graphql"
GRAPHQL_ROUTE=/graphql

#
# Swagger
#
SWAGGER_ENABLED=true
SWAGGER_ROUTE="/swagger"
SWAGGER_FILE="api/swagger.json"
SWAGGER_USERNAME="admin"
SWAGGER_PASSWORD="1234"
SWAGGER_ROUTE=/swagger
SWAGGER_FILE=api/swagger.json
SWAGGER_USERNAME=admin
SWAGGER_PASSWORD=1234

#
# Status Monitor
#
MONITOR_ENABLED=true
MONITOR_ROUTE="/monitor"
MONITOR_USERNAME="admin"
MONITOR_PASSWORD="1234"
MONITOR_ROUTE=/monitor
MONITOR_USERNAME=admin
MONITOR_PASSWORD=1234
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ tsconfig.build.json
# Generated source-code #
src/**/*.js
src/**/*.js.map
!src/public/**/*
test/**/*.js
test/**/*.js.map
coverage/
Expand Down
46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected] & [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ All script are defined in the `package-scripts.js` file, but the most important
### Tests

- Run the unit tests using `npm start test` (There is also a vscode task for this called `test`).
- Run the integration tests using `npm start test:integration`.
- Run the e2e tests using `npm start test:e2e`.
- Run the integration tests using `npm start test.integration`.
- Run the e2e tests using `npm start test.e2e`.

### Running in dev mode

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "express-typescript-boilerplate",
"version": "3.0.0",
"version": "3.0.1",
"description": "A delightful way to building a Node.js RESTful API Services with beautiful code written in TypeScript",
"main": "src/app.ts",
"scripts": {
Expand Down

0 comments on commit ea30ebc

Please sign in to comment.