Liu Song’s Projects

diff --git a/funkit-api/Dockerfile b/funkit-api/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..702e5c2952f65ae51fde565a7af8bac49b19fb6c
--- /dev/null
+++ b/funkit-api/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:12
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm i --production
+
+EXPOSE 3005
+
+CMD [ "node", "." ]
\ No newline at end of file




diff --git a/funkit-api/package.json b/funkit-api/package.json
index 5ea9c51d7381060a3f95b2722d2949e5f066a188..383afb7d9836c6f9d858f7a7c2a16590834638c3 100644
--- a/funkit-api/package.json
+++ b/funkit-api/package.json
@@ -2,6 +2,7 @@ {
   "dependencies": {
     "kelp": "^2.0.2",
     "kelp-body": "^1.4.2",
+    "kelp-cors": "^0.0.0",
     "kelp-logger": "^1.1.0",
     "kelp-router": "^0.0.2",
     "kelp-send": "^1.0.6",




diff --git a/funkit-api/server.js b/funkit-api/server.js
index a46f1444a24db6afa0d056713a5c1e732a985cba..b996b7053286bc9ec035579398478cfe1328e73e 100644
--- a/funkit-api/server.js
+++ b/funkit-api/server.js
@@ -2,10 +2,10 @@ const http = require('http');
 const kelp = require('kelp');
 const body = require('kelp-body');
 const send = require('kelp-send');
+const cors = require('kelp-cors');
 const Router = require('kelp-router');
 const logger = require('kelp-logger');
 const { MongoClient, ObjectId } = require('mongodb');
-
 
 (async () => {
   const client = new MongoClient('mongodb://lsong.me:27017');
@@ -22,22 +22,12 @@
   const app = kelp();
   app.use(body);
   app.use(send);
-  app.use(logger);
-  app.use(router);
-
-  // cors
-  router.options('/*', (req, res) => {
-    res.writeHead(200, {
+const { MongoClient, ObjectId } = require('mongodb');
 const kelp = require('kelp');
-const logger = require('kelp-logger');
 const kelp = require('kelp');
-const { MongoClient, ObjectId } = require('mongodb');
+const http = require('http');
 const kelp = require('kelp');
-
 const kelp = require('kelp');
-(async () => {
-    res.end();
-  });
 
   router.get('/rules', async (req, res) => {
     const rules = await Rule.find().toArray();




diff --git a/funkit-frontend/server.js b/funkit-frontend/server.js
index 56a38d8e0a9307790428a5a2eff36317f0b9d6d9..5efa534e85b2a7348fa407ea11b0a2c60f7255f6 100644
--- a/funkit-frontend/server.js
+++ b/funkit-frontend/server.js
@@ -1,7 +1,7 @@
 const http = require('http');
 const kelp = require('kelp');
-const serve = require('kelp-static');
 const proxy = require('kelp-proxy');
+const serve = require('kelp-static');
 const logger = require('kelp-logger');
 
 const app = kelp();




diff --git a/funkit-server/Dockerfile b/funkit-server/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..4e7388a5b3563557f201f6f97e285b2ced1610bd
--- /dev/null
+++ b/funkit-server/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:12
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm i --production
+
+EXPOSE 3000
+
+CMD [ "node", "." ]
\ No newline at end of file