Skip to content

Commit

Permalink
Merge branch 'release/3.0.0-beta'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.env.example
#	README.md
#	package-scripts.js
#	package.json
#	src/api/middlewares/AuthenticateMiddleware.ts
#	src/config/Database.ts
#	src/config/LoggerConfig.ts
#	src/console/templates/seed.hbs
#	src/core/ApiInfo.ts
#	src/core/ApiMonitor.ts
#	src/core/BasicAuthentication.ts
#	src/core/Bootstrap.ts
#	src/core/Server.ts
#	src/core/SwaggerUI.ts
#	src/database/seeds/create_users.ts
#	yarn.lock
  • Loading branch information
hirsch88 committed Nov 25, 2017
2 parents eba3bbf + 1548d25 commit 1b08ab5
Show file tree
Hide file tree
Showing 163 changed files with 2,433 additions and 5,849 deletions.
60 changes: 23 additions & 37 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,47 @@
# APPLICATION
#
APP_NAME="express-typescript-boilerplate"
APP_ENV="local"
APP_HOST="http://localhost"
APP_URL_PREFIX="/api"
APP_PORT=3000
APP_ROUTE="http://localhost:3000"
APP_ROUTE_PREFIX="/api"
APP_BANNER=true

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

#
# APPLICATION
# AUTHORIZATION
#
APP_BASIC_USER="admin"
APP_BASIC_PASSWORD="1234"
AUTH_ROUTE="http://localhost:3333/tokeninfo"

#
# API Info
# DATABASE
#
API_INFO_ENABLED=true
API_INFO_ROUTE="/info"
DB_TYPE="mysql"
DB_HOST="localhost"
DB_PORT=3306
DB_USERNAME="root"
DB_PASSWORD=""
DB_DATABASE="my_database"
DB_SYNCHRONIZE=false
DB_LOGGING=false

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

#
# Monitor
# Status Monitor
#
MONITOR_ENABLED=true
MONITOR_ROUTE="/monitor"

#
# DATABASE
#
# MySql
DB_CLIENT="mysql"
DB_CONNECTION="mysql://root@localhost:3306/my_database"

# PostGres
#DB_CLIENT=pg
#DB_CONNECTION=postgres://root:root@localhost:5432/my_database

# Knex
DB_POOL_MIN=0
DB_POOL_MAX=7
DB_MIGRATION_DIR="./src/database/migrations"
DB_MIGRATION_TABLE="version"
DB_SEEDS_DIR="./src/database/seeds"

#
# Auth0
#
AUTH0_HOST="http://localhost:3333"
MONITOR_USERNAME="admin"
MONITOR_PASSWORD="1234"
48 changes: 48 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#
# APPLICATION
#
APP_NAME="express-typescript-boilerplate"
APP_ROUTE="http://localhost:3000"
APP_ROUTE_PREFIX="/api"
APP_BANNER=false

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

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

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

#
# Swagger
#
SWAGGER_ENABLED=true
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"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ typings/

# Dist #
dist/
ormconfig.json

# IDE #
.idea/
Expand Down
1 change: 0 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"../dist/**/*.js"
],
"protocol": "inspector",
"preLaunchTask": "build",
"env": {
"NODE_ENV": "development"
}
Expand Down
Loading

0 comments on commit 1b08ab5

Please sign in to comment.