Merge branch 'master' of github.com:jorilallo/atlas

.env.sample

@@ -0,0 +1,11 @@
+# Copy this file to .env, remove this comment and change the keys
+
+ALLOWED_SLACK_DOMAINS=mytestslackdomain
+DATABASE_URL=postgres://user:pass@example.com:5432/atlas
+DATABASE_URL_TEST=postgres://user:pass@example.com:5432/atlas-test
+PORT=3000
+REDIS_URL=redis://localhost:6379
+SEQUELIZE_SECRET=F0E5AD933D7F6FD8F4DBB3E038C501C052DC0593C686D21ACB30AE205D2F634B
+SLACK_KEY=71315967491.XXXXXXXXXX
+SLACK_SECRET=d2dc414f9953226bad0a356c794XXXXX
+URL=http://localhost:3000

README.md

@@ -1,7 +1,16 @@
 # Atlas
 
+## Installation
+
+ 1. Install dependencies with `yarn`
+ 1. Register a Slack app at https://api.slack.com/apps
+ 1. Copy the file `.env.sample` to `.env` and fill out the keys
+ 1. Run DB migrations `./node_modules/.bin/sequelize db:migrate`
+ 1. Start the server `yarn start`
+
+
 ## Ideas
 
 - Create sharable private URLs for notes
 - Settings
-  - Enable :emoji: autoconvert
+  - Enable :emoji: autoconvert

frontend/scenes/Home/Home.js

@@ -52,7 +52,7 @@ export default class Home extends React.Component {
               </div>
             ) }
             <div className={ styles.action }>
-              <SlackAuthLink>
+              <SlackAuthLink redirectUri={ `${URL}/auth/slack` }>
                 <img
                   alt="Sign in with Slack"
                   height="40"

server/api/auth.js

@@ -80,7 +80,7 @@ router.post('auth.slack', async (ctx) => {
   const body = {
     client_id: process.env.SLACK_KEY,
     client_secret: process.env.SLACK_SECRET,
-    redirect_uri: `${process.env.URL}/auth/slack/`,
+    redirect_uri: `${process.env.URL}/auth/slack`,
     code,
   };