Cleanup and simplify

Author: JoeBiellik

.editorconfig

@@ -9,5 +9,5 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.{json,yml,md}]
-indent_style = tab
+indent_style = space
 indent_size = 2

controllers/github.js

@@ -3,52 +3,55 @@ const rest = require('@octokit/rest');
 const github = new rest();
 const Plugins = require('../models/plugins');
 const util = require('util');
+const fetch = require('node-fetch');
+const marked = require('marked');
 
 (async () => {
 	try {
 		github.authenticate({
 			type: 'oauth',
 			token: '1b01a00c5b950b472e444079b7e8363fe57429ab' // Put in config | Yeah just testing if it works, wasn't going to push it.
-		})
+		});
 
 		const result = await github.search.repos({ q: 'topic:nfive-plugin' });
 
-
 		for (let i of result.data.items) {
 			try {
 				let releases = await github.repos.getReleases({ owner: i.owner.login, repo: i.name, per_page: '100', page: '1' });
-				releases = releases.data.filter(r => !r.draft && !r.prerelease && !r);
+				releases = releases.data.filter(r => !r.draft && !r.prerelease);
 				releases = await Promise.all(releases.map(async r => {
+					let readme = await github.repos.getReadme({ owner: i.owner.login, repo: i.name, ref: r.tag_name });
+					readme = await fetch(readme.data.download_url);
+
 					return {
 						tag: r.tag_name,
 						created: r.published_at,
-						notes: r.body,
+						notes: marked(r.body),
 						downloads: r.assets[0].download_count,
-						readme: (await github.repos.getReadme({ owner: i.owner.login, repo: i.name, ref: r.tag_name })).data.download_url
+						readme: marked(await readme.text())
 					};
 				}));
 
 				await Plugins.findOneAndUpdate({ gh_id: i.id }, {
 					gh_id: i.id,
 					org: i.owner.login,
 					project: i.name,
-					full_name: i.full_name,
-					org_url: i.owner.html_url,
-					project_url: i.html_url,
 					avatar_url: i.owner.avatar_url,
 					homepage_url: i.homepage,
 					description: i.description,
 					releases: releases,
-					counts: { stars: i.stargazers_count, watchers: i.watchers, forks: i.forks_count, issues: i.open_issues_count },
+					counts: {
+						stars: i.stargazers_count,
+						watchers: i.watchers_count,
+						forks: i.forks_count,
+						issues: i.open_issues_count
+					},
 					license: i.license.key,
-					creationdate: i.created_at
+					created: i.created_at
 				}, {
-						upsert: true,
-						setDefaultsOnInsert: true
-					});
-
-
-				//console.log(await github.repos.getPages({owner: i.owner.login, repo: i.name}))
+					upsert: true,
+					setDefaultsOnInsert: true
+				});
 			}
 			catch (err) {
 				util.log('Error: %s', err);

controllers/projects.js

@@ -1,8 +1,6 @@
 const config = require('config');
 const Plugins = require('../models/plugins');
 const moment = require('moment');
-const fetch = require("node-fetch");
-const marked = require('marked');
 
 module.exports = {
 	async view(ctx) {
@@ -11,28 +9,21 @@ module.exports = {
 		if (plugin == null) return ctx.throw(404, 'Project not found!');
 
 		const created = [
-			moment(plugin.creationdate).fromNow(),
-			moment(plugin.creationdate).format("YYYY-MM-DD")
-		]
-
+			moment(plugin.created).fromNow(),
+			moment(plugin.created).format('YYYY-MM-DD')
+		];
 
 		let updated = [
 			moment(plugin.releases[0].created).fromNow(),
-			moment(plugin.releases[0].created).format("YYYY-MM-DD")
-		]
-
-		const readme = await fetch(plugin.releases[0].readme)
-		.then(res => res.text())
-		//.then(body => body);
-
-
+			moment(plugin.releases[0].created).format('YYYY-MM-DD')
+		];
 
 		return await ctx.render('project', {
 			pretty: config.prettyHtml,
 			title: config.name,
 			created: created,
 			updated: updated,
-			readme: readme,
+			readme: plugin.releases[0].readme,
 			plugin: plugin
 		});
 	}

db.js

@@ -11,6 +11,7 @@ module.exports = () => {
 	mongoose.set('useCreateIndex', true);
 	mongoose.set('useFindAndModify', false);
 	//mongoose.set('debug', true);
+
 	mongoose.connect(config.db, { useNewUrlParser: true });
 
 	return mongoose.connection;

docker-compose.yml

@@ -1,25 +1,23 @@
-version: '2'
+version: "3"
 
 services:
   nfivehub:
     image: node:latest
     command: "npm start"
     working_dir: /app
-    links:
-     - db
     volumes:
-     - .:/app
+      - .:/app
     ports:
-     - "3000:80"
+      - "3000:80"
     environment:
-     - NODE_ENV=docker
+      - NODE_ENV=docker
 
   db:
     image: mongo:latest
     command: "--smallfiles"
     volumes:
-     - ./db:/data/db
+      - ./db:/data/db
     expose:
-     - 27017
+      - 27017
     ports:
-     - "27017:27017"
+      - "27017:27017"

models/plugins.js

@@ -1,28 +1,35 @@
 const mongoose = require('mongoose');
 
-const Releases = new mongoose.Schema({ tag: String, created: String, notes: String, downloads: Number, readme: String });
-const Counts = new mongoose.Schema({ stars: Number, watchers: Number, forks: Number, issues: Number, })
+const Release = new mongoose.Schema({
+	tag: String,
+	created: Date,
+	notes: String,
+	downloads: Number,
+	readme: String
+});
+
 const Repositories = new mongoose.Schema({
 	gh_id: { type: Number, unique: true },
-	org: String,               	//owner.login
-	project: String,          	//name
-	full_name: String,        	//full_name
-	org_url: String,          	//owner.html_url
-	project_url: String,      	//html_url
-	avatar_url: String,       	//owner.avatar_url
-	homepage_url: String,		//homepage
-	description: String,      	//discription
-	releases: [Releases],
-	counts: [Counts],
-	license: String,			//license.key
-	creationdate: Date,       	//created_at
-	last_grab: { type: Date, default: Date.now() }
-},{	timestamps: false });
+	org: String,
+	project: String,
+	avatar_url: String,
+	homepage_url: String,
+	description: String,
+	releases: [Release],
+	counts: {
+		stars: Number,
+		watchers: Number,
+		forks: Number,
+		issues: Number
+	},
+	license: String,
+	created: Date,
+	scraped: { type: Date, default: Date.now() }
+});
 
 Repositories.index({
 	org: 'text',
 	project: 'text',
-	full_name: 'text',
 	description: 'text'
 });
 

package-lock.json

@@ -2,10 +2,6 @@ body {
 	font-family: 'Open Sans', sans-serif;
 }
 
-header {
-	height: 5rem;
-}
-
 header .container {
 	max-width: 1540px;
 }

public/clippy.svg

@@ -5,7 +5,7 @@ const orgs = require('./controllers/orgs');
 const projects = require('./controllers/projects');
 
 router
-	.get('/', async (ctx) => {
+	.get('/', async ctx => {
 		await ctx.render('index', {
 			pretty: config.prettyHtml,
 			title: config.name

public/style.css

@@ -15,11 +15,11 @@ html(lang='en')
 			header.mb-5.border-bottom
 				.container
 					.row
-						.col-sm-2
+						.col-xlg-2
 							h1.float-left
 								a(href="/") #{title}
 
-						.col-sm-10
+						.col-lg-10
 							form(action="/search").form-inline
 								label(for="search").sr-only Search
 								input(name="q" placeholder="Search plugins")#search.form-control.w-100

router.js

@@ -6,5 +6,5 @@ block content
 	hr
 
 	each plugin in plugins
-		a(href="/" + plugin.full_name) #{plugin.full_name}
+		a(href="/" +  plugin.org + "/" + plugin.project) #{plugin.org}/#{plugin.project}
 		hr