Generating thumbnails. Added site overview page.

src/sites.js

@@ -3,8 +3,6 @@
 const knex = require('./knex');
 
 async function curateSite(site) {
-    const network = await knex('network').where({ id: site.network_id });
-
     return {
         id: site.id,
         name: site.name,
@@ -12,36 +10,40 @@ async function curateSite(site) {
         description: site.description,
         slug: site.slug,
         network: {
-            id: network.id,
-            name: network.name,
-            url: network.url,
-            description: network.description,
-            slug: network.slug,
+            id: site.network_id,
+            name: site.network_name,
+            slug: site.network_slug,
+            url: site.network_url,
         },
     };
 }
 
-function curateSites(releases) {
-    return Promise.all(releases.map(async site => curateSite(site)));
+function curateSites(sites) {
+    return Promise.all(sites.map(async site => curateSite(site)));
 }
 
 async function fetchSites(siteId, siteSlug) {
-    const releases = await knex('sites')
-        .where({ id: siteId })
-        .orWhere({ slug: siteSlug })
+    const sites = await knex('sites')
+        .where({ 'sites.id': siteId })
+        .orWhere({ 'sites.slug': siteSlug })
+        .select(
+            'sites.*',
+            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url',
+        )
+        .leftJoin('networks', 'sites.network_id', 'networks.id')
         .limit(100);
 
-    return curateSites(releases);
+    return curateSites(sites);
 }
 
 async function fetchSitesFromReleases() {
-    const releases = await knex('releases')
+    const sites = await knex('releases')
         .select('site_id', '')
         .leftJoin('sites', 'sites.id', 'releases.site_id')
         .groupBy('sites.id')
         .limit(100);
 
-    return curateSites(releases);
+    return curateSites(sites);
 }
 
 module.exports = {