Prep for Heroku

checker · Dec 8, 2018 · b3c4f03 · b3c4f03
1 parent b985e56
commit b3c4f03
Show file tree

Hide file tree

Showing 13 changed files with 366 additions and 99 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,14 @@
+# Instagram
+IG_CLIENT_ID=
+IG_CLIENT_SECRET=
+IG_ACCESS_TOKEN=
+
+# Twitter
+TWTR_CONSUMER_KEY=
+TWTR_CONSUMER_SECRET=
+TWTR_ACCESS_TOKEN_KEY=
+TWTR_ACCESS_TOKEN_SECRET=
+
+# TWitch
+TWITCH_CLIENT_ID=
+TWITCH_CLIENT_SECRET=
diff --git a/.gitignore b/.gitignore
@@ -10,9 +10,8 @@ node_modules/
 .atom/
 
 # Private Configuration Variables
-configs/twitter.json
-configs/instagram.json
-configs/twitch.json
+configs/*
+.env
 
 # Private API Keys
 apikeys.json

diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web=npm start
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# OGCheckr API
+# Penguin API
 
-The official REST API for OGCheckr applications
+The official REST API for Penguin apps
diff --git a/app.js b/app.js
@@ -1,3 +1,5 @@
+require('dotenv').config();
+
 const express = require('express');
 const cors = require('cors');
 const app = express();
@@ -109,6 +111,6 @@ function haltOnTimedout (req, res, next) {
   if (!req.timedout) next()
 }
 
-app.listen(8080, 'localhost');
+app.listen(process.env.PORT || 5000);
 
 module.exports = app;
diff --git a/configs/instagram.example.json b/configs/instagram.example.json
diff --git a/configs/twitch.example.json b/configs/twitch.example.json
diff --git a/configs/twitter.example.json b/configs/twitter.example.json
diff --git a/docs.html b/docs.html
diff --git a/libs/Twitch.js b/libs/Twitch.js
@@ -4,9 +4,8 @@ const twitch = require('twitch-api-v5');
 
 function CheckTwitch(service, word, res) {
    res.type('json');
-   var config = require('../configs/twitch.json');
 
-   twitch.clientID = config.clientId;
+   twitch.clientID = process.env.TWITCH_CLIENT_ID;
 
    twitch.users.usersByName({"users": [word]}, function(error, response) {
       if(error) {

diff --git a/libs/Twitter.js b/libs/Twitter.js
@@ -5,7 +5,12 @@ const Twitter = require('twitter-lite');
 
 function CheckTwitter(service, word, res) {
       res.type('json');
-   var config = require('../configs/twitter.json');
+   var config = {
+      "consumer_key": process.env.TWTR_CONSUMER_KEY,
+      "consumer_secret": process.env.TWTR_CONSUMER_SECRET,
+      "access_token_key": process.env.TWTR_ACCESS_TOKEN_KEY,
+      "access_token_secret": process.env.TWTR_ACCESS_TOKEN_SECRET
+   };
    var client = new Twitter(config);
 
    client.get('users/show', {screen_name: word, include_entities: false})

diff --git a/package.json b/package.json
@@ -3,7 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "start": "node ./bin/www"
+    "dev": "node ./bin/www",
+    "start": "node ./app.js"
   },
   "dependencies": {
     "apicache": "^1.2.1",
@@ -14,6 +15,7 @@
     "cookie-parser": "~1.4.3",
     "cors": "^2.8.4",
     "debug": "~2.6.9",
+    "dotenv": "^6.2.0",
     "express": "~4.15.5",
     "faker": "^4.1.0",
     "morgan": "~1.9.0",