Move server to new folder

robertistok · Apr 2, 2017 · df47040 · df47040
1 parent 7116577
commit df47040
Show file tree

Hide file tree

Showing 24 changed files with 620 additions and 23 deletions.
diff --git a/client/package.json b/client/package.json
@@ -2,7 +2,7 @@
   "name": "client",
   "version": "0.1.0",
   "private": true,
-  "proxy": "http//localhost:3001/",
+  "proxy": "http//localhost:3001",
   "dependencies": {
     "axios": "^0.15.3",
     "history": "^4.6.1",
@@ -14,6 +14,7 @@
     "react-scripts": "0.9.5",
     "redux": "^3.6.0",
     "redux-form": "^6.5.0",
+		"redux-immutable-state-invariant": "^2.0.0",
     "redux-logger": "^2.10.2",
     "redux-storage": "^4.1.2",
     "redux-storage-decorator-debounce": "^1.1.3",
@@ -24,9 +25,6 @@
     "semantic-ui": "^2.2.9",
     "semantic-ui-react": "^0.67.2"
   },
-  "devDependencies": {
-    "redux-immutable-state-invariant": "^2.0.0"
-  },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",

diff --git a/package.json b/package.json
@@ -4,29 +4,18 @@
 	"private": true,
   "main": "index.js",
   "license": "MIT",
+	"engines": {
+		"node": "7.4.0"
+	},
   "dependencies": {
-    "babel-cli": "^6.24.0",
-    "babel-core": "^6.24.0",
-    "bcrypt-nodejs": "^0.0.3",
-    "body-parser": "^1.17.1",
-    "cors": "^2.8.1",
-    "express": "^4.15.2",
-    "jwt-simple": "^0.5.1",
-    "mongoose": "^4.9.0",
-    "morgan": "^1.8.1",
-    "passport": "^0.3.2",
-    "passport-jwt": "^2.2.1",
-    "passport-local": "^1.0.0"
+		"concurrently": "^3.4.0"
   },
   "scripts": {
-    "server": "node server.js",
-    "client": "node start-client.js",
-    "start": "concurrently \"npm run server\" \"npm run client \"",
-    "lint": "eslint ."
+		"install": "(cd client && yarn) && (cd server && yarn)",
+		"start": "concurrently \"cd client && PORT=3000 yarn start\" \"cd server && PORT=3001 yarn start\""
   },
   "devDependencies": {
     "babel-eslint": "^7.1.1",
-    "concurrently": "^3.4.0",
     "eslint": "^3.18.0",
     "eslint-config-airbnb": "^14.1.0",
     "eslint-plugin-import": "^2.2.0",

diff --git a/server/.gitignore b/server/.gitignore
@@ -0,0 +1,2 @@
+# dependencies
+/node_modules
diff --git a/app.js → server/app.js b/app.js → server/app.js
@@ -5,14 +5,14 @@ const cors = require('cors');
 const morgan = require('morgan');
 const path = require('path');
 
-const router = require('./api/router');
+const router = require('./router');
 
 const app = express();
 
 app.set('port', process.env.PORT || 3001);
 
 if (process.env.NODE_ENV === 'production') {
-  app.use(express.static(path.join(__dirname, 'client/build')));
+  app.use(express.static(path.join(__dirname, '../client/build')));
 }
 
 mongoose.Promise = global.Promise;
@@ -24,6 +24,7 @@ if (process.env.NODE_ENV !== 'production') {
 app.use(morgan('combined'));
 app.use(cors());
 app.use(bodyParser.json({ type: '*/*' }));
+app.use(bodyParser.urlencoded({ extended: false }));
 
 router(app);
 

diff --git a/api/controllers/authentication.js → server/controllers/authentication.js b/api/controllers/authentication.js → server/controllers/authentication.js
diff --git a/api/controllers/courses.js → server/controllers/courses.js b/api/controllers/courses.js → server/controllers/courses.js
diff --git a/api/controllers/groups.js → server/controllers/groups.js b/api/controllers/groups.js → server/controllers/groups.js
diff --git a/api/controllers/schedules.js → server/controllers/schedules.js b/api/controllers/schedules.js → server/controllers/schedules.js
diff --git a/api/controllers/teachers.js → server/controllers/teachers.js b/api/controllers/teachers.js → server/controllers/teachers.js
diff --git a/api/models/attendance.js → server/models/attendance.js b/api/models/attendance.js → server/models/attendance.js
diff --git a/api/models/course.js → server/models/course.js b/api/models/course.js → server/models/course.js
diff --git a/api/models/grade.js → server/models/grade.js b/api/models/grade.js → server/models/grade.js
diff --git a/api/models/group.js → server/models/group.js b/api/models/group.js → server/models/group.js
diff --git a/api/models/notification.js → server/models/notification.js b/api/models/notification.js → server/models/notification.js
diff --git a/api/models/schedule.js → server/models/schedule.js b/api/models/schedule.js → server/models/schedule.js
diff --git a/api/models/student.js → server/models/student.js b/api/models/student.js → server/models/student.js
diff --git a/api/models/teacher.js → server/models/teacher.js b/api/models/teacher.js → server/models/teacher.js
diff --git a/api/models/user.js → server/models/user.js b/api/models/user.js → server/models/user.js
diff --git a/server/package.json b/server/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "server",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "bcrypt-nodejs": "^0.0.3",
+    "body-parser": "^1.17.1",
+    "cors": "^2.8.3",
+    "express": "^4.15.2",
+    "jwt-simple": "^0.5.1",
+    "mongoose": "^4.9.2",
+    "morgan": "^1.8.1",
+    "passport": "^0.3.2",
+    "passport-jwt": "^2.2.1",
+    "passport-local": "^1.0.0"
+  },
+  "scripts": {
+    "start": "nodemon server.js"
+  }
+}
diff --git a/api/router.js → server/router.js b/api/router.js → server/router.js
diff --git a/server.js → server/server.js b/server.js → server/server.js
diff --git a/api/services/passport.js → server/services/passport.js b/api/services/passport.js → server/services/passport.js
diff --git a/api/utils/index.js → server/utils/index.js b/api/utils/index.js → server/utils/index.js