v20181004

babel.js

@@ -1,3 +1,3 @@
 require('babel-register')
 require('babel-polyfill')
-require('./app/index')
+require('./server/app/index')

helpers/calculate.js

@@ -2,8 +2,7 @@ import Handlebars from 'handlebars'
 import _ from 'lodash'
 
 import { timeDiff } from '../lib/parse/time'
-
-export const isNewPromise = ({ promise }) => promise.clix === 1
+import { isNewPromise } from '../server/models/promise'
 
 Handlebars.registerHelper('dueStatus', (dueDate) => {
   if (!dueDate) return ''

helpers/index.js

@@ -0,0 +1,5 @@
+import './calculate'
+import './colors'
+import './format'
+import './path'
+import './utils'

helpers/path.js

@@ -1,5 +1,5 @@
 import Handlebars from 'handlebars'
-import APP_DOMAIN from '../app/config'
+import APP_DOMAIN from '../server/app/config'
 
 const userPath = (name) => `//${name}.${APP_DOMAIN}`
 export const promisePath = ({ username, urtext }) =>

helpers/utils.js

@@ -1,7 +1,7 @@
 import Handlebars from 'handlebars'
 import moment from 'moment-timezone'
 
-import APP_DOMAIN from '../app/config'
+import APP_DOMAIN from '../server/app/config'
 import { promisePath } from './path'
 
 Handlebars.registerHelper('__appDomain', () => {

lib/logger.js

@@ -8,7 +8,7 @@ import {
   PAPERTRAIL_HOST,
   PAPERTRAIL_PORT,
   PAPERTRAIL_LEVEL
-} from '../app/config'
+} from '../server/app/config'
 
 const { formatter, timestamp } = consoleFormatter()
 

lib/mail.js

@@ -4,7 +4,7 @@ import mailgun from 'mailgun-js'
 import log from '../lib/logger'
 import {
   APP_DOMAIN, ENVIRONMENT, MAIL_FROM, POSTMARK_KEY, MAILGUN_KEY
-} from '../app/config'
+} from '../server/app/config'
 
 export default function sendMail({ to, subject, text }) {
   log.info('sendMail attempt', { to, subject, text })

lib/parse/url.js

@@ -4,8 +4,8 @@ const isValidUrl = ({ url }) => {
   const isAppleIcon = url.match(/\/apple\-touch\-icon.*/)
   const isBot = _.includes(['favicon.ico', 'robots.txt'], url)
   const isFileExtension = url.match(/\.[A-z]{2,4}$/)
-  const isLegacyEditRoute = url.match(/\/?edit\/?$/)
-  const isDateModifier = url.match(/\/?by\/?$/)
+  const isLegacyEditRoute = url.match(/\/edit\/?$/)
+  const isDateModifier = url.match(/\/by\/?$/)
   const isQueryString = url.match(/\?[^\/]*?$/)
   const isUsernameString = url.match(/\/\w+\.commits\.to\/.*/)
 

app/api.js → server/api/v1/frontend.js

@@ -1,46 +1,21 @@
 import moment from 'moment-timezone'
 import _ from 'lodash'
+import { Router } from 'express'
 
-import app from './express'
-import { ALLOW_ADMIN_ACTIONS, APP_DOMAIN, ENVIRONMENT } from '../app/config'
-import { Promises, Users } from '../models/'
-import log, { deSequelize } from '../lib/logger'
-import { diffPromises } from '../lib/parse/promise'
-import actionNotifier from '../lib/notify'
-import parseCredit from '../lib/parse/credit'
-import { seed, importJson } from '../db/seed'
-import cache from '../db/cache'
-
+import { Promises, Users } from '../../models/'
+import log, { deSequelize } from '../../../lib/logger'
+import actionNotifier from '../../../lib/notify'
+import parseCredit from '../../../lib/parse/credit'
+import { diffPromises } from '../../../lib/parse/promise'
 
 const userQuery = (user) => ({
   model: Users,
   where: { username: user }
 })
 
+const api = Router()
 
-// Global endpoints
-
-app.get('/users/create/:username', (req, res) => {
-  const { username } = req.params
-
-  if (username) {
-    Users.create({ username })
-      .then(() => {
-        log.info('user created', username)
-        res.redirect(`//${username}.${APP_DOMAIN}`)
-      })
-  } else {
-    res.redirect('/')
-  }
-})
-
-
-// User-scoped actions
-
-// TODO implement a /create POST endpoint
-// app.post('/promises/create/', (req, resp) => {})
-
-app.post('/_s/:user/promises/edit', (req, res) => {
+api.post('/_s/:user/promises/edit', (req, res) => {
   // invalid dates/empty string values should unset db fields
   const valOrNull = (val) => _.includes(['Invalid date', ''], val) ? null : val
   const data = _.mapValues(req.body, (val) => valOrNull(val))
@@ -81,7 +56,7 @@ app.post('/_s/:user/promises/edit', (req, res) => {
   })
 })
 
-app.post('/_s/:user/promises/complete', (req, resp) => {
+api.post('/_s/:user/promises/complete', (req, resp) => {
   Promises.findOne({
     where: {
       id: req.body.id
@@ -98,7 +73,7 @@ app.post('/_s/:user/promises/complete', (req, resp) => {
   })
 })
 
-app.post('/_s/:user/promises/remove', (req, resp) => {
+api.post('/_s/:user/promises/remove', (req, resp) => {
   Promises.destroy({
     where: {
       id: req.body.id
@@ -114,9 +89,8 @@ app.post('/_s/:user/promises/remove', (req, resp) => {
   })
 })
 
-
 // captcha
-app.post('/_s/:user/promises/validate', ({ body: { id } = {} }, resp) => {
+api.post('/_s/:user/promises/validate', ({ body: { id } = {} }, resp) => {
   if (!id) {
     resp.send(404)
   } else {
@@ -128,41 +102,4 @@ app.post('/_s/:user/promises/validate', ({ body: { id } = {} }, resp) => {
   }
 })
 
-
-// Utils
-
-// calculate and store reliability for each user
-app.get('/cache', (req, resp) => {
-  cache()
-  resp.redirect('/')
-})
-
-if (ENVIRONMENT !== 'production' || ALLOW_ADMIN_ACTIONS) {
-  // insert promises.json into db
-  app.get('/import', (req, resp) => {
-    importJson()
-    resp.redirect('/')
-  })
-
-  // drop db and repopulate
-  app.get('/reset', (req, resp) => {
-    seed()
-    resp.redirect('/')
-  })
-
-  // removes all entries from the promises table
-  app.get('/empty', (req, resp) => {
-    Promises.destroy({ where: {} })
-    resp.redirect('/')
-  })
-
-  // removes all promises for a given user
-  app.get('/_s/:user/promises/remove', function(req, resp) {
-    Promises.destroy({
-      include: [userQuery(req.params.user)],
-    }).then(function(deletedRows) {
-      log.warn('user promises removed', deletedRows)
-      resp.redirect('/')
-    })
-  })
-}
+export default api

server/api/v1/promises.js

@@ -0,0 +1,83 @@
+import { Router } from 'express'
+
+import { Users } from '../../models/'
+import log from '../../../lib/logger'
+import { parsePromise, parsePromiseWithIp } from '../../../lib/parse/promise'
+
+const api = Router()
+
+api.post('/promises/parse/', (req, res) => {
+  const {
+    promise = {},
+    urtext,
+    username,
+    timezone,
+  } = req.body
+
+  const parsedPromise = parsePromise({ promise, urtext, username, timezone })
+
+  if (!parsedPromise) {
+    resp.send(400)
+  } else {
+    res.send(parsedPromise)
+  }
+})
+
+api.post('/promises/create/', (req, res) => {
+  const {
+    promise = {},
+    urtext,
+    username,
+    timezone,
+  } = req.body
+
+  const parsedPromise = parsePromise({ promise, urtext, username, timezone })
+
+  if (!parsedPromise) {
+    res.send(400)
+  } else {
+    Users.findOne({
+      where: {
+        username,
+      }
+    }).then(user => {
+      if (user) {
+        user.createPromise(parsedPromise)
+          .then(function(prom) {
+            log.info('promise created via POST', prom, req.body)
+            res.status(201).send(prom)
+          })
+          .catch((reason) => res.status(400).send(reason))
+      }
+    })
+  }
+})
+
+api.put('/promises/:username/:urtext', ({ ip, ...req }, res) => {
+  const {
+    urtext,
+    username,
+  } = req.params
+
+  Users.findOne({
+    where: {
+      username,
+    }
+  }).then(async(user) => {
+    if (user) {
+      const parsedPromise = await parsePromiseWithIp({ urtext, username, ip })
+
+      if (parsedPromise) {
+        user.createPromise(parsedPromise)
+          .then(function(prom) {
+            log.info('promise created via PUT', prom)
+            return res.status(201).send(prom)
+          })
+          .catch((reason) => res.status(400).send(reason))
+      }
+    }
+    return res.status(400)
+  })
+})
+
+export default api

server/api/v1/users.js

@@ -0,0 +1,23 @@
+import { Router } from 'express'
+
+import { Users } from '../../models/'
+import log from '../../../lib/logger'
+import { APP_DOMAIN } from '../../app/config'
+
+const api = Router()
+
+api.get('/users/create/:username', (req, res) => {
+  const { username } = req.params
+
+  if (username) {
+    Users.create({ username })
+      .then(() => {
+        log.info('user created', username)
+        res.redirect(`//${username}.${APP_DOMAIN}`)
+      })
+  } else {
+    res.redirect('/')
+  }
+})
+
+export default api

server/app/api.js

@@ -0,0 +1,46 @@
+import app from './express'
+import { ALLOW_ADMIN_ACTIONS, ENVIRONMENT } from '../app/config'
+import { Promises } from '../models/'
+import { seed, importJson } from '../db/seed'
+import cache from '../db/cache'
+
+import FrontendApi from '../api/v1/frontend'
+import PromiseApi from '../api/v1/promises'
+import UserApi from '../api/v1/users'
+
+// TODO: https://github.com/Vincit/objection.js/tree/master/examples/express-ts
+
+// Client-side/browser API
+app.use('/', FrontendApi)
+
+// "REST" endpoints
+app.use('/_s/api/v1', PromiseApi)
+app.use('/_s/api/v1', UserApi)
+
+// Utils
+
+// calculate and store reliability for each user
+app.get('/cache', (req, resp) => {
+  cache()
+  resp.redirect('/')
+})
+
+if (ENVIRONMENT !== 'production' || ALLOW_ADMIN_ACTIONS) {
+  // insert promises.json into db
+  app.get('/import', (req, resp) => {
+    importJson()
+    resp.redirect('/')
+  })
+
+  // drop db and repopulate
+  app.get('/reset', (req, resp) => {
+    seed()
+    resp.redirect('/')
+  })
+
+  // removes all entries from the promises table
+  app.get('/empty', (req, resp) => {
+    Promises.destroy({ where: {} })
+    resp.redirect('/')
+  })
+}

app/express.js → server/app/express.js

@@ -3,13 +3,11 @@ import expressHandlebars from 'express-handlebars'
 import sassMiddleware from 'node-sass-middleware'
 import useragent from 'express-useragent'
 
+import '../../helpers'
+
 import { PORT } from './config'
-import log from '../lib/logger'
-import '../helpers/calculate'
-import '../helpers/colors'
-import '../helpers/format'
-import '../helpers/path'
-import '../helpers/utils'
+import log from '../../lib/logger'
+
 
 const app = express()
 

app/middleware.js → server/app/middleware.js

@@ -3,13 +3,13 @@ import _ from 'lodash'
 
 import app from './express'
 import { APP_DOMAIN } from '../app/config'
-import log, { deSequelize } from '../lib/logger'
-import actionNotifier from '../lib/notify'
+import log, { deSequelize } from '../../lib/logger'
+import actionNotifier from '../../lib/notify'
 import { Promises, Users } from '../models'
 
-import { parsePromise, parsePromiseWithIp } from '../lib/parse/promise'
-import isValidUrl, { isBotFromUserAgent } from '../lib/parse/url'
-import { nextCloseOfBusiness } from '../lib/parse/time'
+import { parsePromise, parsePromiseWithIp } from '../../lib/parse/promise'
+import isValidUrl, { isBotFromUserAgent } from '../../lib/parse/url'
+import { nextCloseOfBusiness } from '../../lib/parse/time'
 
 const pageWithStatus = ({
   message, reason = {}, res = {}, template, status