From 5d38fbfc424c6b0a1803175989241a7cfd6ce5ff Mon Sep 17 00:00:00 2001 From: cyuamber Date: Mon, 26 Aug 2019 19:34:22 +0800 Subject: feat: add mock data routers config Change-Id: I155f6957499cfb6da2462671083fa0622de6463a Issue-ID: USECASEUI-307 Signed-off-by: cyuamber --- .../src/app/core/services/text.service.ts | 2 +- usecaseui-portal/src/app/mock/fake/fakedata.js | 24 ++++++++++++++++++++++ usecaseui-portal/src/app/mock/fake/mock.js | 7 +++++++ usecaseui-portal/src/app/mock/fakedata.js | 24 ---------------------- usecaseui-portal/src/app/mock/mock.js | 7 ------- usecaseui-portal/src/app/mock/routes.js | 10 +++++++++ usecaseui-portal/src/app/mock/server.js | 5 ++--- 7 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 usecaseui-portal/src/app/mock/fake/fakedata.js create mode 100644 usecaseui-portal/src/app/mock/fake/mock.js delete mode 100644 usecaseui-portal/src/app/mock/fakedata.js delete mode 100644 usecaseui-portal/src/app/mock/mock.js create mode 100644 usecaseui-portal/src/app/mock/routes.js (limited to 'usecaseui-portal/src/app') diff --git a/usecaseui-portal/src/app/core/services/text.service.ts b/usecaseui-portal/src/app/core/services/text.service.ts index 26a2caad..9ccea18a 100644 --- a/usecaseui-portal/src/app/core/services/text.service.ts +++ b/usecaseui-portal/src/app/core/services/text.service.ts @@ -36,7 +36,7 @@ export class TextService { return this.http.get(this.url["singleInterface"]); } getjsonData() { - return this.http.get(this.url["jsonInterface"]); + return this.http.get(this.url["multipleInterface"]); } //------------------------------------------------------------------------------------- diff --git a/usecaseui-portal/src/app/mock/fake/fakedata.js b/usecaseui-portal/src/app/mock/fake/fakedata.js new file mode 100644 index 00000000..a008c14a --- /dev/null +++ b/usecaseui-portal/src/app/mock/fake/fakedata.js @@ -0,0 +1,24 @@ +const faker = require("faker"); +const _ = require("lodash"); +faker.locale = "en"; + +module.exports = { + customer: _.times(20, function (n) { + return { + id: n, + name: faker.name.findName(), + phone: faker.phone.phoneNumber(), + address: faker.address.streetAddress(), + avatar: faker.internet.avatar() + } + }), + home: _.times(10, function (n) { + return { + id: n, + name: faker.name.findName(), + phone: faker.phone.phoneNumber(), + address: faker.address.streetAddress(), + avatar: faker.internet.avatar() + } + }), +} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/fake/mock.js b/usecaseui-portal/src/app/mock/fake/mock.js new file mode 100644 index 00000000..2864d4c5 --- /dev/null +++ b/usecaseui-portal/src/app/mock/fake/mock.js @@ -0,0 +1,7 @@ +const fakeData = require('./fakedata.js'); +module.exports = { + //Mock json + 'customer_info': fakeData.customer, + 'alarm_formdata_multiple': fakeData, + 'home': fakeData.home, +} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/fakedata.js b/usecaseui-portal/src/app/mock/fakedata.js deleted file mode 100644 index a008c14a..00000000 --- a/usecaseui-portal/src/app/mock/fakedata.js +++ /dev/null @@ -1,24 +0,0 @@ -const faker = require("faker"); -const _ = require("lodash"); -faker.locale = "en"; - -module.exports = { - customer: _.times(20, function (n) { - return { - id: n, - name: faker.name.findName(), - phone: faker.phone.phoneNumber(), - address: faker.address.streetAddress(), - avatar: faker.internet.avatar() - } - }), - home: _.times(10, function (n) { - return { - id: n, - name: faker.name.findName(), - phone: faker.phone.phoneNumber(), - address: faker.address.streetAddress(), - avatar: faker.internet.avatar() - } - }), -} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/mock.js b/usecaseui-portal/src/app/mock/mock.js deleted file mode 100644 index 2864d4c5..00000000 --- a/usecaseui-portal/src/app/mock/mock.js +++ /dev/null @@ -1,7 +0,0 @@ -const fakeData = require('./fakedata.js'); -module.exports = { - //Mock json - 'customer_info': fakeData.customer, - 'alarm_formdata_multiple': fakeData, - 'home': fakeData.home, -} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js new file mode 100644 index 00000000..aad505f2 --- /dev/null +++ b/usecaseui-portal/src/app/mock/routes.js @@ -0,0 +1,10 @@ +// proxy routers setting +module.exports = + { + + "/api/*": "/$1", + "/*/*": "/$1_$2", + "/*/*/*": "/$1_$2_$3", + "/*/*/*/*": "/$1_$2_$3_$4", + + } diff --git a/usecaseui-portal/src/app/mock/server.js b/usecaseui-portal/src/app/mock/server.js index 45d6b2b5..2b8f5fe0 100644 --- a/usecaseui-portal/src/app/mock/server.js +++ b/usecaseui-portal/src/app/mock/server.js @@ -1,6 +1,7 @@ const jsonServer = require('json-server'); const server = jsonServer.create(); const middlewares = jsonServer.defaults(); +// const customersRouters = require('./routes'); // Set default middlewares (logger, static, cors and no-cache) server.use(middlewares); @@ -10,7 +11,7 @@ const fs = require('fs'); const path = require('path'); let localJsonDb = {}; //import mock datas -const fakeoriginalData = require('./mock.js'); //import datas created in fakedata.js +const fakeoriginalData = require('./fake/mock.js'); //import datas created in fakedata.js const mockFolder = './src/app/mock/json'; //mock json path folder const filePath = path.resolve(mockFolder); @@ -54,8 +55,6 @@ function fileDisplay(filePath) { }) }) setTimeout(() => { - // console.log(rewriter, "===rewriter", localJsonDb, "===localJsonDb", fileList, "===fileList"); - // console.log(localJsonDb, "===localJsonDb"); serverRewrite(rewriter); runServer(localJsonDb); }, 100) -- cgit 1.2.3-korg