From 0c1e82ccbfa6dcb8ee5d11220a93fefc61465374 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Thu, 29 Aug 2019 18:43:08 +0800 Subject: feat: change the mock data path config file Change-Id: I5ca301d8ff0b084f64366312543c9036d8e76de8 Issue-ID: USECASEUI-307 Signed-off-by: cyuamber --- usecaseui-portal/README.md | 10 +- usecaseui-portal/localproxy.conf.json | 2 +- usecaseui-portal/package.json | 2 +- usecaseui-portal/src/app/app.component.html | 28 +- usecaseui-portal/src/app/app.component.less | 18 + usecaseui-portal/src/app/app.component.ts | 11 +- .../src/app/core/services/myhttp.service.ts | 118 +++---- .../src/app/core/services/onboard.service.ts | 74 ++-- .../src/app/core/services/text.service.spec.ts | 15 - .../src/app/core/services/text.service.ts | 17 +- usecaseui-portal/src/app/mock/fake/fakedata.js | 1 + usecaseui-portal/src/app/mock/fake/mock.js | 3 +- .../src/app/mock/json/alarmFormData.json | 371 --------------------- .../src/app/mock/json/alarm_form_data.json | 371 +++++++++++++++++++++ .../src/app/mock/json/current_language.json | 3 + usecaseui-portal/src/app/mock/json/user_login.json | 8 + usecaseui-portal/src/app/mock/routes.js | 25 ++ usecaseui-portal/src/app/mock/server.js | 42 +-- usecaseui-portal/src/app/test/test.component.html | 2 +- usecaseui-portal/src/app/test/test.component.ts | 15 +- 20 files changed, 607 insertions(+), 529 deletions(-) delete mode 100644 usecaseui-portal/src/app/core/services/text.service.spec.ts delete mode 100644 usecaseui-portal/src/app/mock/json/alarmFormData.json create mode 100644 usecaseui-portal/src/app/mock/json/alarm_form_data.json create mode 100644 usecaseui-portal/src/app/mock/json/current_language.json create mode 100644 usecaseui-portal/src/app/mock/json/user_login.json diff --git a/usecaseui-portal/README.md b/usecaseui-portal/README.md index 29e92ed4..2fbea7a1 100644 --- a/usecaseui-portal/README.md +++ b/usecaseui-portal/README.md @@ -88,7 +88,11 @@ npm run changelog └── README.md ``` -### [Change log](./CHANGELOG.md) + +### Mock data + +This project allows developers to develop in mock data with `npm run mock`, which means FEers can develop independently in the beginning of the project developing period. Developers can set mock data in `mock/fake/mock.js`, where supports two methods of creating mock data. The remote method relies on [faker.js](https://github.com/marak/Faker.js/). + ### Git commit message rules @@ -139,6 +143,10 @@ When there is breaking changes in the project, please write the commit message i ``` Also, run the script `npm run changelog` can generate all the `feat` and `fix` commits. Click [CHANGELOG.md](./CHANGELOG.md) shows all these commit histories. + +### [Change log](./CHANGELOG.md) + + ### Contributor ``` diff --git a/usecaseui-portal/localproxy.conf.json b/usecaseui-portal/localproxy.conf.json index bf4dcf52..99adbad5 100644 --- a/usecaseui-portal/localproxy.conf.json +++ b/usecaseui-portal/localproxy.conf.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://localhost:3004", + "target": "http://localhost:3002", "secure": false, "logLevel": "debug", "changeOrigin": true, diff --git a/usecaseui-portal/package.json b/usecaseui-portal/package.json index 8001ac14..fb08ed80 100644 --- a/usecaseui-portal/package.json +++ b/usecaseui-portal/package.json @@ -11,7 +11,7 @@ "lint": "ng lint", "e2e": "ng e2e", "mockproxy": "ng serve --host='0.0.0.0' --proxy-config localproxy.conf.json", - "mockconfig": "node ./src/app/mock/server.js --port 3004", + "mockconfig": "node ./src/app/mock/server.js --port 3002", "mock": "npm run mockconfig & npm run mockproxy", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s" }, diff --git a/usecaseui-portal/src/app/app.component.html b/usecaseui-portal/src/app/app.component.html index 26e736de..f5ee199c 100644 --- a/usecaseui-portal/src/app/app.component.html +++ b/usecaseui-portal/src/app/app.component.html @@ -23,7 +23,8 @@ - home + home {{"i18nTextDefine_Home" | translate}} @@ -33,8 +34,10 @@
  • - - home + + home {{"i18nTextDefine_Customer" | translate}} @@ -45,7 +48,8 @@ - home + home {{"i18nTextDefine_Monitor" | translate}} @@ -53,11 +57,13 @@

  • - + - home - - {{"i18nTextDefine_Services" | translate}} + home + + {{"i18nTextDefine_Services" | translate}}