orzyyyy · orzyyyy · Jan 30, 2019 · Jan 29, 2019 · Jan 30, 2019 · Jan 30, 2019
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><meta name="viewport" content="width=device-width,initial-scale=1"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache-Control" content="no-cache"><meta http-equiv="Expires" content="0"><link rel="shortcut icon" href="dist/assets/favicon.ico" type="image/x-icon"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><style>*{margin:0;padding:0}</style></head><body><div id="root"></div><script type="text/javascript" src="/dist/ninoninoni.js?0d1b443654a083ee76e2"></script></body></html>
+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><meta name="viewport" content="width=device-width,initial-scale=1"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache-Control" content="no-cache"><meta http-equiv="Expires" content="0"><link rel="shortcut icon" href="dist/assets/favicon.ico" type="image/x-icon"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><style>*{margin:0;padding:0}</style></head><body><div id="root"></div><script type="text/javascript" src="/dist/ninoninoni.js?7f36b9af4bafbac9a95c"></script></body></html>
diff --git a/dist/layout/122a14c4ab646d5a612d74ceaddd20a0.json b/dist/layout/122a14c4ab646d5a612d74ceaddd20a0.json
diff --git a/dist/layout/1a79a4d60de6718e8e5b326e338ae533.json b/dist/layout/1a79a4d60de6718e8e5b326e338ae533.json
diff --git a/dist/mapping.json b/dist/mapping.json
@@ -1 +1 @@
-[{"id":"122a14c4ab646d5a612d74ceaddd20a0","title":"test1","thumbnailUrl":"dist/assets/5795774_0.jpg","hoverText":"测试 layout-122a14c4ab646d5a612d74ceaddd20a0.json","createTime":1548761194017,"modifyTime":1548761194017},{"id":"1a79a4d60de6718e8e5b326e338ae533","title":"test1","thumbnailUrl":"dist/assets/5795774_0.jpg","hoverText":"测试 layout-1a79a4d60de6718e8e5b326e338ae533.json","createTime":1548761194017,"modifyTime":1548761194017}]
+[]
diff --git a/dist/ninoninoni.js b/dist/ninoninoni.js
diff --git a/dist/vendor/3.js b/dist/vendor/3.js
diff --git a/package.json b/package.json
@@ -10,7 +10,6 @@
     "kill": "taskkill /f /im node.exe",
     "dev": "nino koei -c scripts/build.js -w -d",
     "build": "nino koei -c scripts/build.js",
-    "generate": "node scripts/generateMapping.js",
     "prettier": "node ./scripts/prettier.js",
     "test": "nino test",
     "lint-staged": "lint-staged"

diff --git a/scripts/generateMapping.js b/scripts/generateMapping.js
diff --git a/scripts/start-all.sh b/scripts/start-all.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-npm run generate & 
 npm run dev &
 npm run server &
 wait
diff --git a/server/controller/delete.js b/server/controller/delete.js
@@ -0,0 +1,27 @@
+const fs = require('fs');
+const path = require('path');
+const generate = require('../generateMapping');
+
+const del = async ctx => {
+  const body = ctx.request.body;
+  const id = body.id;
+  const writeFiles = [`src/layout/${id}.json`, `dist/layout/${id}.json`];
+  try {
+    for (let item of writeFiles) {
+      if (fs.existsSync(item)) {
+        fs.unlinkSync(path.join(process.cwd(), item));
+      } else {
+        // eslint-disable-next-line
+        throw Error("file doesn't exist.");
+      }
+    }
+    generate();
+    ctx.response.body = true;
+  } catch (error) {
+    ctx.response.body = false;
+  }
+};
+
+module.exports = {
+  'DELETE /del': del,
+};
diff --git a/server/generateMapping.js b/server/generateMapping.js
@@ -0,0 +1,33 @@
+const fs = require('fs');
+const path = require('path');
+const cwd = process.cwd();
+
+module.exports = function() {
+  const files = fs.readdirSync(path.join(cwd, 'src/layout'));
+  const layoutFiles = files.filter(file => {
+    return file.endsWith('.json');
+  });
+
+  let layouts = [];
+  for (let fileName of layoutFiles) {
+    layouts.push({
+      id: fileName.replace('.json', ''),
+      title: 'test1',
+      thumbnailUrl: 'dist/assets/5795774_0.jpg',
+      hoverText: '测试 layout-' + fileName,
+      createTime: new Date().getTime(),
+      modifyTime: new Date().getTime(),
+    });
+  }
+
+  const writeFiles = ['src/mapping.json', 'dist/mapping.json'];
+  try {
+    for (let item of writeFiles) {
+      fs.writeFileSync(path.join(process.cwd(), item), JSON.stringify(layouts));
+    }
+    // eslint-disable-next-line
+    console.log('generate completed.');
+  } catch (error) {
+    throw Error('generate failed.');
+  }
+};
diff --git a/server/index.js b/server/index.js
@@ -4,7 +4,7 @@ const router = require('koa-router')();
 const bodyParser = require('koa-bodyparser');
 const fs = require('fs');
 const KoaStatic = require('koa-static');
-const path = require('path');
+const generate = require('./generateMapping');
 
 const addMapping = (router, mapping) => {
   for (let url in mapping) {
@@ -14,6 +14,12 @@ const addMapping = (router, mapping) => {
     } else if (url.startsWith('POST ')) {
       path = url.substring(5);
       router.post(path, mapping[url]);
+    } else if (url.startsWith('DELETE ')) {
+      path = url.substring(7);
+      router.delete(path, mapping[url]);
+    } else if (url.startsWith('PUT ')) {
+      path = url.substring(4);
+      router.put(path, mapping[url]);
     } else {
       console.error(`invalid URL: ${url}`);
     }
@@ -32,6 +38,7 @@ const addControllers = router => {
   }
 };
 
+generate();
 addControllers(router);
 app.use(bodyParser());
 app.use(router.routes());

diff --git a/src/layout/122a14c4ab646d5a612d74ceaddd20a0.json b/src/layout/122a14c4ab646d5a612d74ceaddd20a0.json
diff --git a/src/layout/1a79a4d60de6718e8e5b326e338ae533.json b/src/layout/1a79a4d60de6718e8e5b326e338ae533.json