From 98e0a404eb04317607222891a7642bc5c5700225 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 1 Nov 2016 11:54:30 -0600
Subject: [PATCH] Updates for merging server down

---
 .eslintignore                                   | 1 -
 server/.eslintrc => .eslintrc.json              | 0
 .gitignore                                      | 9 +++------
 server/app.js => app.js                         | 0
 {server/bin => bin}/www                         | 0
 server/mongoose.js => mongoose.js               | 0
 package.json                                    | 6 +++---
 {server/routes => routes}/api/comments/index.js | 0
 {server/routes => routes}/api/index.js          | 0
 9 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 .eslintignore
 rename server/.eslintrc => .eslintrc.json (100%)
 rename server/app.js => app.js (100%)
 rename {server/bin => bin}/www (100%)
 rename server/mongoose.js => mongoose.js (100%)
 rename {server/routes => routes}/api/comments/index.js (100%)
 rename {server/routes => routes}/api/index.js (100%)

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index fd5305a97..000000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-test/*.conf.js
diff --git a/server/.eslintrc b/.eslintrc.json
similarity index 100%
rename from server/.eslintrc
rename to .eslintrc.json
diff --git a/.gitignore b/.gitignore
index 2209ac81a..b0359459e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-/node_modules
-/npm-debug.log
-/build
-/server/widgets/*.js
-/server/widgets/*.html
+node_modules
+npm-debug.log
+dist
 .DS_Store
-config.json
 *.iml
diff --git a/server/app.js b/app.js
similarity index 100%
rename from server/app.js
rename to app.js
diff --git a/server/bin/www b/bin/www
similarity index 100%
rename from server/bin/www
rename to bin/www
diff --git a/server/mongoose.js b/mongoose.js
similarity index 100%
rename from server/mongoose.js
rename to mongoose.js
diff --git a/package.json b/package.json
index 9f70a3f54..e3e3b0676 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,10 @@
   "name": "talk",
   "version": "0.0.1",
   "description": "A commenting platform from The Coral Project. https://coralproject.net",
-  "main": "./server/bin/www",
+  "main": "app.js",
   "scripts": {
-    "start": "./server/bin/www",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "start": "./bin/www"
   },
   "repository": {
     "type": "git",
diff --git a/server/routes/api/comments/index.js b/routes/api/comments/index.js
similarity index 100%
rename from server/routes/api/comments/index.js
rename to routes/api/comments/index.js
diff --git a/server/routes/api/index.js b/routes/api/index.js
similarity index 100%
rename from server/routes/api/index.js
rename to routes/api/index.js