Merge branch 'content-reorganize'

.gitignore

@@ -13,6 +13,6 @@ yarn-error.log*
 *.njsproj
 *.sln
 
-.vuepress/dist
+content/.vuepress/dist
 
 .env

content/.vuepress/components/Hook.vue

@@ -82,7 +82,7 @@ export default {
 </script>
 
 <style lang="scss">
-  @import "../../node_modules/highlight.js/styles/monokai-sublime";
+  @import "../../../node_modules/highlight.js/styles/monokai-sublime";
   @import "../scss/init/colors";
   @import "../scss/init/extends";
   @import "../scss/init/mixins";

content/.vuepress/config.js

@@ -1,5 +1,6 @@
 // .vuepress/config.js
 module.exports = {
+  base: '/',
   title: 'LBRY.tech',
   head: [
     ['meta', {name: 'viewport', content: 'initial-scale=1, viewport-fit=cover'}],

content/index.md

@@ -0,0 +1,4 @@
+---
+home: true
+title: LBRY.tech
+---

github.js

@@ -1,18 +0,0 @@
-require('dotenv').config();
-
-var octokit = require('@octokit/rest')();
-
-var redis = require("redis"),
-redisClient = redis.createClient(process.env.REDISCLOUD_URL);
-
-octokit.activity.getEventsForOrg({
-  org: 'lbryio',
-  per_page: 20,
-  page: 1
-}).then(function({data}) {
-
-  console.log(data);
-
-  redisClient.set('events', JSON.stringify(data), redis.print);
-
-});

package.json

@@ -5,8 +5,8 @@
   "author": "",
   "private": true,
   "scripts": {
-    "dev": "./node_modules/vuepress/bin/vuepress.js dev",
+    "dev": "./node_modules/vuepress/bin/vuepress.js dev content",
-    "start": "./node_modules/vuepress/bin/vuepress.js build && node server.js"
+    "start": "./node_modules/vuepress/bin/vuepress.js build content && node server.js"
   },
   "engines": {
     "node": "10.2.x"

server.js

@@ -2,6 +2,8 @@
 
 // env variables
 require('dotenv').config();
+// fs
+var fs = require('fs');
 // Async
 var async = require("async");
 // Express etc
@@ -22,7 +24,7 @@ redisClient = redis.createClient(process.env.REDISCLOUD_URL);
 var logger = require('heroku-logger');
 
 app = express();
-app.use(serveStatic(__dirname + "/.vuepress/dist"));
+app.use(serveStatic(__dirname + "/content/.vuepress/dist"));
 
 app.use(cors());
 
@@ -89,6 +91,17 @@ app.get('/github-feed', function(req, res) {
 
 });
 
+app.get('/*', function(req, res) {
+
+  if(fs.existsSync(__dirname + "/.vuepress/dist" + req.path + ".html")) {
+    res.redirect(req.path + ".html");
+  } else {
+    res.status(404);
+    res.send('Not found');
+  }
+
+});
+
 var port = process.env.PORT || 8080;
 app.listen(port);