Skip to content

Commit

Permalink
package updates + renamed config/key files as examples.
Browse files Browse the repository at this point in the history
  • Loading branch information
rastenis committed Jun 15, 2019
1 parent 6d7a843 commit 9bddae2
Show file tree
Hide file tree
Showing 9 changed files with 6,159 additions and 2,230 deletions.
20 changes: 20 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
env: {
browser: true,
commonjs: true,
node: true
},
plugins: ["prettier"],
extends: ["eslint:recommended", "prettier","plugin:vue/essential"],
parserOptions: {
ecmaVersion: 6
},
rules: {
indent: ["error", 2],
"linebreak-style": ["error", "unix"],
quotes: ["error", "double"],
semi: ["error", "always"],
"prettier/prettier": ["error", { singleQuote: false }],
avoidEscape: true
}
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ db/*

*.env

config.json
passportKeys.json

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"eslint.enable": true
}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $ npm start

1. ~~Animations & completed alerts for various auth actions~~
2. ~~Profile page, account linking(technically operational, but no UI for it yet)~~
3. ~~Guided setup

#### Information & sources

Expand Down
2 changes: 1 addition & 1 deletion config/config.json → config/configExample.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
"production_logging": "none",
"bcrypt_salt_rounds": 12,
"NODE_ENV": "dev"
}
}
4 changes: 2 additions & 2 deletions config/passportConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { Strategy: TwitterStrategy } = require("passport-twitter");
const { OAuth2Strategy: GoogleStrategy } = require("passport-google-oauth");

const db = require("../src/external/db.js");
const keysConf = require("../passportKeys.json");
const keysConf = require("../config/passportKeys.json");
const User = require("../src/controllers/user.js");

passport.serializeUser((user, done) => {
Expand Down Expand Up @@ -84,7 +84,7 @@ passport.use(
* - Else create a new account.
*/

/*
/*
* Sign in with Twitter.
*/
passport.use(
Expand Down
6 changes: 6 additions & 0 deletions config/passportKeysExample.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"TWITTER_KEY": "kKfJNXYMKjUfgGiRhc7yqx5F9",
"TWITTER_SECRET": "MQPig9sy9QLlnMxJOETRJ0AFSutBFaoHEvv29smqdnpontVAeO",
"GOOGLE_ID": "109178143363-pk85udanmr64jrbtoh2rdqhh20gqbgg6.apps.googleusercontent.com",
"GOOGLE_SECRET": "4GPyTcUwkjOdzPbWsFWxz_Ez"
}
Loading

0 comments on commit 9bddae2

Please sign in to comment.