Skip to content
This repository was archived by the owner on Jun 13, 2019. It is now read-only.

Fixed heroku app deployment #74

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"website": "https://codingblocks.com/",
"repository": "https://github.com/coding-blocks/shortlr",
"addons": ["heroku-postgresql:hobby-dev"]
}
}
8 changes: 6 additions & 2 deletions routes/api_v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
*/
const express = require('express')
const config = require('../config.json')
const secrets = require('../secrets')
const route = express.Router()
var secrets;
try {
secrets = require('./../secrets.json');
} catch (e) {
secrets = require('./../secrets-sample.json');
}const route = express.Router()
const models = require('./../utils/db').models

const validUrl = require('../utils/validator').validUrl
Expand Down
8 changes: 6 additions & 2 deletions utils/db.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ const Sequelize = require('sequelize');
const r = require('convert-radix64');
const axios = require('axios');
const uid = require('uid2');
const secrets = require('../secrets');

var secrets;
try {
secrets = require('./../secrets.json');
} catch (e) {
secrets = require('./../secrets-sample.json');
}
//This is so that BIGINT is treated at integer in JS
require('pg').defaults.parseInt8 = true;
//We have made sure that we do not use integers larger than 2^53 in our logic
Expand Down
Loading