JSON view

src/containers/character.js

@@ -6,7 +6,6 @@ import {Character as Component} from '../components/character';
 export const Character = connect(
     (state) => ({
         ...state.character,
-        data: state.character.data && JSON.parse(state.character.data),
         types: state.types,
     }),
     (dispatch) => ({

src/server/__tests__/test-router.js

@@ -11,7 +11,7 @@ describe('routes', () => {
 
         const get = app.get.mock.calls.map((call) => call[0]);
         expect(get).toContain('/');
-        expect(get).toContain('/:id');
+        expect(get).toContain('/:id([0-9a-f]+)');
 
         const post = app.post.mock.calls.map((call) => call[0]);
         expect(post).toContain('/');

src/server/router.js

@@ -48,23 +48,41 @@ export const router = (app) => {
             }))
             .catch(next)
     );
-    app.get('/:id', (req, res, next) =>
+
+    const getCharacter = (id) =>
         knex('characters')
             .whereNull('deleted')
-            .where('id', req.params.id)
+            .where('id', id)
             .first()
             .then((character) => character || Promise.reject('Not Found'))
-            .then((character) => res.render('index', {
-                script,
-                route: {
-                    route: 'Character',
-                    params: req.params,
-                },
-                state: {
-                    types: config.types,
-                    character,
-                },
-            }))
+            .then((character) => ({
+                ...character,
+                data: character.data && JSON.parse(character.data),
+            }));
+    app.get('/:id([0-9a-f]+).json', (req, res, next) =>
+        getCharacter(req.params.id)
+            .then((character) => res.send(character))
+            .catch(next)
+    );
+    app.get('/:id([0-9a-f]+)', (req, res, next) =>
+        getCharacter(req.params.id)
+            .then((character) => {
+                if (!req.accepts('html') && req.accepts('json')) {
+                    return res.send(character);
+                }
+
+                return res.render('index', {
+                    script,
+                    route: {
+                        route: 'Character',
+                        params: req.params,
+                    },
+                    state: {
+                        types: config.types,
+                        character,
+                    },
+                });
+            })
             .catch(next)
     );