Skip to content

Commit 2224eef

Browse files
authored
Merge pull request #22 from LiftOffLLC/upgrades-v2.1.1
updates, minor fixes, added license
2 parents 7378474 + ef1c0be commit 2224eef

Some content is hidden

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

49 files changed

+1030
-403
lines changed

.example.env

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# default environment is set to development
2+
# pass the environment to the process if it's not development
3+
# e.g. NODE_ENV=test yarn migrate
4+
5+
# database
6+
DATABASE_URL = postgres://postgres:password@localhost:5432/jumpstarter
7+
DB_RECREATE = false
8+
DB_ID_NAMESPACE = X
9+
10+
# redis
11+
REDIS_URL = redis://localhost:6379
12+
13+
# server
14+
HOST = localhost
15+
PORT = 3000
16+
WEB_APP_URL = http://localhost:3000
17+
FORCE_SSL = false
18+
PM2 = false
19+
20+
# pm2
21+
# Set by Heroku or -1 to scale to max cpu core -1
22+
WEB_CONCURRENCY = -1
23+
# Max Memory per core
24+
WEB_MEMORY = 512
25+
26+
# country
27+
COUNTRY = US
28+
COUNTRY_CODE = +1
29+
30+
# auth
31+
AUTH_JWT_KEY = NeverShareYourSecret
32+
AUTH_JWT_PWD_KEY = NeverShareYourSecret
33+
34+
# scheduler
35+
START_SCHEDULER = true
36+
37+
# cache
38+
CACHED_MODELS =
39+
40+
# model cache
41+
MODEL_CACHE_DURATION = 3600000
42+
MODEL_CACHE_TIMEOUT = 30000
43+
44+
# new relic
45+
NEW_RELIC_LICENSE_KEY = XXX
46+
NEW_RELIC_LOG_LEVEL = info
47+
48+
# email
49+
DEFAULT_MAIL_SERVICE = ses
50+
SUPPORT_FROM_EMAIL = Support Team <support@dummy.com>
51+
INFO_FROM_EMAIL = Info <info@dummy.com>
52+
NOTIFICATIONS_FROM_EMAIL = Notifications Team <notifications@dummy.com>
53+
54+
# aws ses
55+
AWS_SES_ACCESS_KEY_ID = XXX
56+
AWS_SES_SECRET_ACCESS_KEY = XXX
57+
58+
# sendgrid
59+
SENDGRID_API_KEY = XXX
60+
61+
# sentry
62+
SENTRY_DSN =
63+
SENTRY_ENABLED =

.github/workflows/main.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Test and Deploy
22
on:
33
push:
4-
branches: [ 'master', 'upgrades' ]
4+
branches: ['master', 'upgrades*']
55
jobs:
66
test:
77
name: Test
@@ -52,7 +52,7 @@ jobs:
5252
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
5353
restore-keys: |
5454
${{ runner.os }}-yarn-
55-
55+
5656
- name: Cache node_modules
5757
id: cache-node-modules
5858
uses: actions/cache@v2
@@ -61,23 +61,18 @@ jobs:
6161
key: ${{ runner.os }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
6262
restore-keys: |
6363
${{ runner.os }}-nodemodules-
64-
64+
6565
- name: Install modules if cache not found
6666
if: |
6767
steps.cache-yarn-cache.outputs.cache-hit != 'true' ||
6868
steps.cache-node-modules.outputs.cache-hit != 'true'
6969
run: yarn --frozen-lockfile
7070

71-
- name: Create .env from .env.example
72-
run: cp .env.example .env
73-
74-
- name: Run database migration and seeding
75-
run: |
76-
yarn knex migrate:latest
77-
yarn knex seed:run
71+
- name: Create .env.test from .example.env
72+
run: cp .example.env .env.test
7873

79-
- name: Run tests
80-
run: yarn test
74+
- name: Run database rollback, migration, seeding and tests with coverage
75+
run: yarn test:coverage
8176

8277
deploy:
8378
name: Deploy

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jspm_packages
5454
Thumbs.db
5555

5656
# Personal Files
57+
gitignored
5758
TODO.md
5859
tt.js
5960
ngrok
@@ -67,7 +68,8 @@ mydb2dump.sql
6768
nes_client.js
6869

6970
# Environment
70-
.env
71+
.env*
72+
bin/env.sh
7173

7274
artifacts
7375
https://github.com/serverless/serverless

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"cSpell.words": ["Jumpstarter"]
2+
"cSpell.words": ["Jumpstarter"],
3+
"editor.formatOnSave": true
34
}

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 LiftOff LLC
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)