Skip to content

Commit 09b9dc4

Browse files
authored
Merge pull request #196 from CodeForBaltimore/HOTFIX-cleanup
Code cleanup
2 parents 8487ff1 + 3c22e2d commit 09b9dc4

Some content is hidden

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

43 files changed

+5165
-4314
lines changed

.all-contributorsrc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,6 @@
6464
"review"
6565
]
6666
},
67-
{
68-
"login": "joffutt-bellese",
69-
"name": "joffutt-bellese",
70-
"avatar_url": "https://avatars2.githubusercontent.com/u/61434152?v=4",
71-
"profile": "https://github.com/joffutt-bellese",
72-
"contributions": [
73-
"code",
74-
"doc",
75-
"review"
76-
]
77-
},
7867
{
7968
"login": "snyk-bot",
8069
"name": "Snyk bot",

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,6 @@ dist
117117

118118
# MKDocs Wiki
119119
site/
120+
121+
# Postman
122+
Prod.postman_environment.json

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ services:
1111
before_script:
1212
- psql -c 'create database travis_ci_test;' -U postgres
1313
- npm run db-create
14-
- npm run db-seed
1514
script:
1615
- npm test
1716
after_script:

README.md

Lines changed: 10 additions & 157 deletions
Large diffs are not rendered by default.

docs/SlowStart.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ If you want to deploy to AWS, we have included a `terraform` option. For more in
2424

2525
<TODO: Consider migrating terraform docs to be here or do some sort of INCLUDE to reuse the content>
2626

27+
## SMTP
28+
29+
To send emails with the system you will need to setup your SMTP sever and set the relevant `SMTP_*` variables. For testing we recommend using [Ethereal](https://ethereal.email/)
30+
2731
## Running in Docker
2832

2933
You can build and run the application in Docker locally by running the following commands:

docs/about.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ technologies:
4343
- [Node.js](https://nodejs.org/en/)
4444
- [Express.js](https://expressjs.com/)
4545
- [Sequelize](https://sequelize.org/v3/)
46+
- [Casbin](https://casbin.org/en/)
4647
- [Docker](https://www.docker.com/)
4748
- [Terraform](https://www.terraform.io/)
4849

package-lock.json

Lines changed: 2668 additions & 2304 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bmore-responsive",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"description": "An API-driven CRM (Civic Relationship Management) system.",
55
"main": "src/index.js",
66
"directories": {
@@ -15,8 +15,6 @@
1515
"db-delete": "sequelize db:migrate:undo:all",
1616
"db-seed": "sequelize db:seed:all",
1717
"db-unseed": "sequelize db:seed:undo:all",
18-
"contributors:add": "all-contributors add",
19-
"contributors:generate": "all-contributors generate",
2018
"snyk-protect": "snyk protect",
2119
"prepare": "npm run snyk-protect"
2220
},
@@ -59,6 +57,7 @@
5957
"pg": "7.18.2",
6058
"random-words": "1.1.1",
6159
"sequelize": "5.21.11",
60+
"serve-index": "1.9.1",
6261
"snyk": "^1.332.1",
6362
"supertest": "4.0.2",
6463
"swagger-ui-express": "4.1.4",

publiccode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ publiccodeYmlVersion: "0.2"
33
name: Bmore-Responsive
44
url: "https://github.com/CodeForBaltimore/Bmore-Responsive.git"
55
landingUrl: "https://github.com/CodeForBaltimore/Bmore-Responsive"
6-
softwareVersion: "1.2.0"
6+
softwareVersion: "1.3.0"
77
releaseDate: "2020-04-06"
88
platforms:
99
- web

sequelize/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require('dotenv').config();
22
const fs = require('fs');
33
const rdsCa = fs.readFileSync('./rds-combined-ca-bundle.pem');
4+
const utils = require('../src/utils');
45

56
module.exports = {
67
development: {

0 commit comments

Comments
 (0)