Skip to content

Commit 1b08ab5

Browse files
author
hirsch88
committed
Merge branch 'release/3.0.0-beta'
# 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
2 parents eba3bbf + 1548d25 commit 1b08ab5

File tree

163 files changed

+2433
-5849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+2433
-5849
lines changed

.env.example

+23-37
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,47 @@
22
# APPLICATION
33
#
44
APP_NAME="express-typescript-boilerplate"
5-
APP_ENV="local"
6-
APP_HOST="http://localhost"
7-
APP_URL_PREFIX="/api"
8-
APP_PORT=3000
5+
APP_ROUTE="http://localhost:3000"
6+
APP_ROUTE_PREFIX="/api"
7+
APP_BANNER=true
98

109
#
1110
# LOGGING
1211
#
1312
LOG_LEVEL="debug"
14-
LOG_ADAPTER="winston"
13+
LOG_JSON=false
14+
LOG_OUTPUT="dev"
1515

1616
#
17-
# APPLICATION
17+
# AUTHORIZATION
1818
#
19-
APP_BASIC_USER="admin"
20-
APP_BASIC_PASSWORD="1234"
19+
AUTH_ROUTE="http://localhost:3333/tokeninfo"
2120

2221
#
23-
# API Info
22+
# DATABASE
2423
#
25-
API_INFO_ENABLED=true
26-
API_INFO_ROUTE="/info"
24+
DB_TYPE="mysql"
25+
DB_HOST="localhost"
26+
DB_PORT=3306
27+
DB_USERNAME="root"
28+
DB_PASSWORD=""
29+
DB_DATABASE="my_database"
30+
DB_SYNCHRONIZE=false
31+
DB_LOGGING=false
2732

2833
#
29-
# Swagger Documentation
34+
# Swagger
3035
#
3136
SWAGGER_ENABLED=true
3237
SWAGGER_ROUTE="/swagger"
33-
SWAGGER_FILE="/src/api/swagger.json"
38+
SWAGGER_FILE="api/swagger.json"
39+
SWAGGER_USERNAME="admin"
40+
SWAGGER_PASSWORD="1234"
3441

3542
#
36-
# Monitor
43+
# Status Monitor
3744
#
3845
MONITOR_ENABLED=true
3946
MONITOR_ROUTE="/monitor"
40-
41-
#
42-
# DATABASE
43-
#
44-
# MySql
45-
DB_CLIENT="mysql"
46-
DB_CONNECTION="mysql://root@localhost:3306/my_database"
47-
48-
# PostGres
49-
#DB_CLIENT=pg
50-
#DB_CONNECTION=postgres://root:root@localhost:5432/my_database
51-
52-
# Knex
53-
DB_POOL_MIN=0
54-
DB_POOL_MAX=7
55-
DB_MIGRATION_DIR="./src/database/migrations"
56-
DB_MIGRATION_TABLE="version"
57-
DB_SEEDS_DIR="./src/database/seeds"
58-
59-
#
60-
# Auth0
61-
#
62-
AUTH0_HOST="http://localhost:3333"
47+
MONITOR_USERNAME="admin"
48+
MONITOR_PASSWORD="1234"

.env.test

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
# APPLICATION
3+
#
4+
APP_NAME="express-typescript-boilerplate"
5+
APP_ROUTE="http://localhost:3000"
6+
APP_ROUTE_PREFIX="/api"
7+
APP_BANNER=false
8+
9+
#
10+
# LOGGING
11+
#
12+
LOG_LEVEL="none"
13+
LOG_JSON=false
14+
LOG_OUTPUT="dev"
15+
16+
#
17+
# AUTHORIZATION
18+
#
19+
AUTH_ROUTE="http://localhost:3333/tokeninfo"
20+
21+
#
22+
# DATABASE
23+
#
24+
DB_TYPE="mysql"
25+
DB_HOST="localhost"
26+
DB_PORT=3306
27+
DB_USERNAME="root"
28+
DB_PASSWORD=""
29+
DB_DATABASE="my_database"
30+
DB_SYNCHRONIZE=false
31+
DB_LOGGING=false
32+
33+
#
34+
# Swagger
35+
#
36+
SWAGGER_ENABLED=true
37+
SWAGGER_ROUTE="/swagger"
38+
SWAGGER_FILE="api/swagger.json"
39+
SWAGGER_USERNAME="admin"
40+
SWAGGER_PASSWORD="1234"
41+
42+
#
43+
# Status Monitor
44+
#
45+
MONITOR_ENABLED=true
46+
MONITOR_ROUTE="/monitor"
47+
MONITOR_USERNAME="admin"
48+
MONITOR_PASSWORD="1234"

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ typings/
2020

2121
# Dist #
2222
dist/
23+
ormconfig.json
2324

2425
# IDE #
2526
.idea/

.vscode/launch.json

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"../dist/**/*.js"
1515
],
1616
"protocol": "inspector",
17-
"preLaunchTask": "build",
1817
"env": {
1918
"NODE_ENV": "development"
2019
}

0 commit comments

Comments
 (0)