From 2e5b733059463434a99b983e4a83c133a15c2ae4 Mon Sep 17 00:00:00 2001
From: Shawn <skhameneh@gmail.com>
Date: Wed, 7 Nov 2018 16:38:34 -0500
Subject: [PATCH 1/2] Update .gitignore

---
 .gitignore | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26605005..f68ecf84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,17 +6,11 @@ node_modules
 
 client/build
 
-client_custom/build
-client_custom/scss
-client_custom/src/components
-client_custom/src/containers
-client_custom/src/pages
+site/
 
 devConfig/sequelizeCliConfig.js
 devConfig/testingConfig.js
 
-config/
-
 public/bundle/bundle.js
 public/bundle/bundle.js.map
 public/bundle/Lekton-*
-- 
2.45.3


From 651d1cc9dbdeef33b964e4f49b93210dc4720f33 Mon Sep 17 00:00:00 2001
From: Shawn <skhameneh@gmail.com>
Date: Wed, 7 Nov 2018 17:03:17 -0500
Subject: [PATCH 2/2] Update CLI configuration

---
 cli/configure.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cli/configure.js b/cli/configure.js
index 9c573def..861261ff 100644
--- a/cli/configure.js
+++ b/cli/configure.js
@@ -13,16 +13,16 @@ let thumbnailChannel = '';
 let thumbnailChannelId = '';
 
 const createConfigFile = (fileName, configObject) => {  // siteConfig.json , siteConfig
-  const fileLocation = Path.resolve(__dirname, `../config/${fileName}`);
+  const fileLocation = Path.resolve(__dirname, `../site/config/${fileName}`);
   const fileContents = JSON.stringify(configObject, null, 2);
   fs.writeFileSync(fileLocation, fileContents, 'utf-8');
-  console.log(`Successfully created /config/${fileName}\n`);
+  console.log(`Successfully created ./site/config/${fileName}\n`);
 };
 
 // import existing configs or import the defaults
 let mysqlConfig;
 try {
-  mysqlConfig = require('../config/mysqlConfig.json');
+  mysqlConfig = require('../site/config/mysqlConfig.json');
 } catch (error) {
   mysqlConfig = require('./defaults/mysqlConfig.json');
 }
@@ -30,7 +30,7 @@ const { database: mysqlDatabase, username: mysqlUsername, password: mysqlPasswor
 
 let siteConfig;
 try {
-  siteConfig = require('../config/siteConfig.json');
+  siteConfig = require('../site/config/siteConfig.json');
 } catch (error) {
   siteConfig = require('./defaults/siteConfig.json');
 }
@@ -48,21 +48,21 @@ const {
 
 let lbryConfig;
 try {
-  lbryConfig = require('../config/lbryConfig.json');
+  lbryConfig = require('../site/config/lbryConfig.json');
 } catch (error) {
   lbryConfig = require('./defaults/lbryConfig.json');
 }
 
 let loggerConfig;
 try {
-  loggerConfig = require('../config/loggerConfig.json');
+  loggerConfig = require('../site/config/loggerConfig.json');
 } catch (error) {
   loggerConfig = require('./defaults/loggerConfig.json');
 }
 
 let slackConfig;
 try {
-  slackConfig = require('../config/slackConfig.json');
+  slackConfig = require('../site/config/slackConfig.json');
 } catch (error) {
   slackConfig = require('./defaults/slackConfig.json');
 }
-- 
2.45.3