diff --git a/client/coral-admin/src/components/App.css b/client/coral-admin/src/components/App.css
new file mode 100644
index 000000000..39c7cf942
--- /dev/null
+++ b/client/coral-admin/src/components/App.css
@@ -0,0 +1,11 @@
+:global {
+ html, body, #root, #root > div {
+ min-height: 100%;
+ }
+
+ body {
+ margin: 0;
+ background-color: #FAFAFA;
+ font-family: 'Roboto', sans-serif;
+ }
+}
diff --git a/client/coral-admin/src/components/App.js b/client/coral-admin/src/components/App.js
index 52535f91a..a7ab1e336 100644
--- a/client/coral-admin/src/components/App.js
+++ b/client/coral-admin/src/components/App.js
@@ -1,5 +1,6 @@
import React from 'react';
import ToastContainer from './ToastContainer';
+import './App.css';
import 'material-design-lite';
import AppRouter from '../AppRouter';
diff --git a/middleware/staticTemplate.js b/middleware/staticTemplate.js
index f16caaea9..d8137693e 100644
--- a/middleware/staticTemplate.js
+++ b/middleware/staticTemplate.js
@@ -94,9 +94,13 @@ const createResolveFactory = (() => {
module.exports = async (req, res, next) => {
try {
- // Attach the custom css url.
- const { customCssUrl } = await SettingsService.select('customCssUrl');
+ // Attach the custom css url and organization name.
+ const { customCssUrl, organizationName } = await SettingsService.select(
+ 'customCssUrl',
+ 'organizationName'
+ );
res.locals.customCssUrl = customCssUrl;
+ res.locals.organizationName = organizationName;
} catch (err) {
console.warn(err);
}
diff --git a/package.json b/package.json
index f6ff46a59..01b671dde 100644
--- a/package.json
+++ b/package.json
@@ -219,6 +219,7 @@
"babel-plugin-dynamic-import-node": "^1.1.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"browserstack-local": "^1.3.0",
+ "casual": "^1.5.19",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"chai-datetime": "^1.5.0",
diff --git a/public/css/dev.css b/public/css/dev.css
new file mode 100644
index 000000000..2fd6c1982
--- /dev/null
+++ b/public/css/dev.css
@@ -0,0 +1,9 @@
+.container {
+ width: auto;
+ max-width: 680px;
+ padding: 0 15px;
+}
+
+.graphiql em {
+ font-family: georgia;
+}
diff --git a/routes/dev/assets.js b/routes/dev/assets.js
index cb1f27e43..aea0628e3 100644
--- a/routes/dev/assets.js
+++ b/routes/dev/assets.js
@@ -1,49 +1,58 @@
const express = require('express');
const router = express.Router();
-
-const errors = require('../../errors');
-const Assets = require('../../services/assets');
-
-const body =
- 'Lorem ipsum dolor sponge amet, consectetur adipiscing clam. Ut lobortis sollicitudin pillar a ornare. Curabitur dignissim vestibulum cay non rhoncus. Cras laoreet ante vel nunc hendrerit, shelf imperdiet neque egestas. Suspendisse aliquet iaculis fermentum. Talk volutpat, tellus posuere laoreet consequat, mi lacus laoreet massa, sed vehicula mauris velit non lectus. Integer non trust nec neque congue faucibus porttitor sit amet elkhorn.';
+const casual = require('casual');
+const { ErrNotFound } = require('../../errors');
+const Asset = require('../../models/asset');
router.get('/id/:asset_id', async (req, res, next) => {
try {
- const asset = await Assets.findById(req.params.asset_id);
+ const asset = await Asset.findOne({ id: req.params.asset_id });
if (asset === null) {
- return next(errors.ErrNotFound);
+ throw new ErrNotFound();
}
res.render('dev/article', {
title: asset.title,
asset_id: asset.id,
asset_url: asset.url,
- body: '',
- basePath: '/client/embed/stream',
});
} catch (err) {
return next(err);
}
});
+router.get('/random', (req, res) => {
+ const title = casual.title;
+
+ res.redirect(`./title/${title.replace(/ /g, '-')}`);
+});
+
router.get('/title/:asset_title', (req, res) => {
- return res.render('dev/article', {
+ res.render('dev/article', {
title: req.params.asset_title.split('-').join(' '),
asset_url: '',
asset_id: null,
- body: body,
- basePath: '/client/embed/stream',
});
});
router.get('/', async (req, res, next) => {
- let skip = req.query.skip ? parseInt(req.query.skip) : 0;
- let limit = req.query.limit ? parseInt(req.query.limit) : 25;
-
try {
- const assets = await Assets.all(skip, limit);
+ const skip = req.query.skip ? parseInt(req.query.skip) : 0;
+ const limit = req.query.limit ? parseInt(req.query.limit) : 6;
+
+ const [assets, count] = await Promise.all([
+ Asset.find({})
+ .sort({ created_at: 1 })
+ .limit(limit)
+ .skip(skip),
+ Asset.count(),
+ ]);
+
res.render('dev/articles', {
- assets: assets,
+ skip,
+ limit,
+ count,
+ assets,
});
} catch (err) {
return next(err);
diff --git a/routes/dev/index.js b/routes/dev/index.js
index ac72db254..58daca583 100644
--- a/routes/dev/index.js
+++ b/routes/dev/index.js
@@ -16,8 +16,6 @@ router.get('/', staticTemplate, async (req, res) => {
title: 'Coral Talk',
asset_url: '',
asset_id: '',
- body: '',
- basePath: '/static/embed/stream',
});
}
});
diff --git a/services/assets.js b/services/assets.js
index 794145eb3..5f1fa989d 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -232,11 +232,5 @@ module.exports = class AssetsService {
await AssetModel.remove({
id: srcAssetID,
});
-
- // That's it!
- }
-
- static all(limit = undefined) {
- return AssetModel.find({}).limit(limit);
}
};
diff --git a/views/admin.ejs b/views/admin.ejs
index b8f775d79..89cc150f7 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -3,16 +3,11 @@
Talk - Coral Admin
-
+ <%- include partials/head %>
-
-
- <%- include partials/head %>
+ <%- include partials/custom-css %>
diff --git a/views/api/graphiql.ejs b/views/api/graphiql.ejs
index b6d609de6..8007569b3 100644
--- a/views/api/graphiql.ejs
+++ b/views/api/graphiql.ejs
@@ -5,13 +5,17 @@
GraphiQL
+ <%- include ../partials/dev %>
@@ -20,6 +24,8 @@
+ <%- include ../partials/dev-nav %>
+
-