Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ build
coverage
node_modules
npm-debug.log

conf/*.json
conf/*.tar
35 changes: 35 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
language: node_js
node_js:
- '6'
cache:
directories:
- node_modules
env:
global:
- NODE_ENV=staging
- URL="https://matchmyroute-backend.appspot.com"
- secure: on4jgkRvu0rt9ThaqcMW9OvlTjVkfSDekhRAT2oDa7cYppvqRKxQyYCivWinlKsDPNF5MD13tZO4VpvezvmhT1YIPSkEejLt2+U7AypxYlM4R7EVBwhpIH1KDpjuJYeDMiq6gcFEaWl5DVrey39MZArrNip01co5uEnFDmyArk90M2iR2tySatTjqy4ZMZrhbgXOxsin7AjJejx+5KGpekAvId2infmQt1EKlOUoRsp/HHOV0qaK1DpevBNdbl2rHzKm0x07xP5bQaf3FKgm82qx9NPyl/bmczBQ+J6vbneP0kN/yRce9ipchoSaCrRn7V69CUYfioDBT/ddY0ae7ow7rLPKuDrdKZcgGOKo6uYAlnh235yzEi7R61UvuVZAb46ltRnsVjOt6Igxmh4xg9lvW5Yr5241jKpggqvyEz4LrQxFkMwwA3QhLE3CLE5+8QbS/+tjYM7mjL7LVPNvoUS2qGV0HSPlGDmUmDRhwUVZO2/MmH+Io7smVjIuDaDF4xfhwhlHA/G94xOkKr036fIpcSgK1jvK69dwwHQfxAR0tdYF8XamylrNUWlXjIZ1Te2uN4S8aO25S7/ChOBqJjI9tXH3f1WiYos63Z3Svp3JcK2eYV38ov7Zy0YQkxR4Abhum9GUzRF+VGpauThM1CWQu57nbbK5Eb/Mw55xTt0=
addons:
postgresql: '9.6'
apt:
packages:
- postgresql-9.6-postgis-2.3
before_install:
- openssl aes-256-cbc -K $encrypted_0e3badaffc60_key -iv $encrypted_0e3badaffc60_iv
-in ./conf/credentials.tar.enc -out ./conf/credentials.tar -d
- tar xvf ./conf/credentials.tar -C ./conf
before_script:
- psql -U postgres -c "create extension postgis"
- psql -c "CREATE USER testuser WITH PASSWORD 'test' SUPERUSER;"
- psql -c 'CREATE DATABASE "matchMyRouteTest" WITH OWNER testuser;'
script:
- npm run test
- npm run build
deploy:
provider: gae
keyfile: "./conf/key-file.json"
project: matchmyroute-backend
config: "./build/app.yaml"
skip_cleanup: true
after_deploy:
- npm run e2etest
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
MatchMyRoute Backend
CityCycler Backend
====================

also known as: matchmyroute-backend (which was the pre-release name)

## Install

Install node and npm, then install this project's dependencies:
Expand Down Expand Up @@ -143,7 +145,7 @@ If you want to revoke accounts, you can do so with:

```
gcloud auth list
gcloud auth revoke [email protected]
gcloud auth revoke [email protected]
```

If you want to see all the HTTP requests and responses during deployment you
Expand Down
40 changes: 0 additions & 40 deletions circle.yml

This file was deleted.

6 changes: 0 additions & 6 deletions conf/.netrc

This file was deleted.

Binary file added conf/credentials.tar.enc
Binary file not shown.
3 changes: 0 additions & 3 deletions conf/info.json

This file was deleted.

12 changes: 0 additions & 12 deletions conf/key-file.json

This file was deleted.

12 changes: 0 additions & 12 deletions conf/matchmyroute-backend-firebase-adminsdk-jm5jb-e33eab9419.json

This file was deleted.

12 changes: 0 additions & 12 deletions conf/storage-keyfile.json

This file was deleted.

Binary file removed conf/watermark.png
Binary file not shown.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function getProductionEnvVars() {
STATIC_DIR: "static",
NODE_ENV: "production",
PGUSER: "postgres",
PGPASSWORD: "aUZw[:Gw38H&>Jf2hUwd",
PGPASSWORD: process.env.PGPRODPW,
GOOGLE_APPLICATION_CREDENTIALS: "conf/storage-keyfile.json",
STORAGE_BUCKET: "matchmyroute-prod"
});
Expand Down
2 changes: 1 addition & 1 deletion src/common/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const minimumHashingRounds = 30000;
initFirebase();

function initFirebase() {
const firebaseServiceAccount = require("conf/matchmyroute-backend-firebase-adminsdk-jm5jb-e33eab9419.json");
const firebaseServiceAccount = require("conf/firebase-admin-sdk.json");

firebaseAdmin.initializeApp({
credential: firebaseAdmin.credential.cert(firebaseServiceAccount),
Expand Down