@dssp/dcsp 0.0.21 → 0.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_index.html +2 -2
- package/assets/manifest.json +1 -1
- package/dist-client/icons/menu-icons.js +5 -19
- package/dist-client/icons/menu-icons.js.map +1 -1
- package/dist-client/themes/dark.css +43 -43
- package/dist-client/themes/light.css +39 -39
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-client/viewparts/menu-tools.js +11 -11
- package/dist-client/viewparts/menu-tools.js.map +1 -1
- package/installer/docker-compose.yml +3 -3
- package/installer/install.sh +7 -7
- package/installer/migrate.sh +1 -1
- package/installer/upgrade.sh +1 -1
- package/package.json +10 -5
- package/schema.graphql +1651 -124
- package/views/auth-page.html +1 -2
- package/views/public/home.html +2 -2
|
@@ -3,7 +3,7 @@ import { css, html, LitElement } from 'lit';
|
|
|
3
3
|
import { customElement, property } from 'lit/decorators.js';
|
|
4
4
|
import { connect } from 'pwa-helpers';
|
|
5
5
|
import { store } from '@operato/shell';
|
|
6
|
-
import { ICONS_PROGRESS, ICONS_COMPLETED,
|
|
6
|
+
import { ICONS_PROGRESS, ICONS_COMPLETED, ICONS_SETTING } from '../icons/menu-icons';
|
|
7
7
|
let MenuTools = class MenuTools extends connect(store)(LitElement) {
|
|
8
8
|
constructor() {
|
|
9
9
|
super(...arguments);
|
|
@@ -21,16 +21,16 @@ let MenuTools = class MenuTools extends connect(store)(LitElement) {
|
|
|
21
21
|
path: 'project-completed-list',
|
|
22
22
|
icons: ICONS_COMPLETED
|
|
23
23
|
},
|
|
24
|
-
{
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
},
|
|
29
|
-
{
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
},
|
|
24
|
+
// {
|
|
25
|
+
// name: '검측현황',
|
|
26
|
+
// path: 'dssp-status',
|
|
27
|
+
// icons: ICONS_STATUS
|
|
28
|
+
// },
|
|
29
|
+
// {
|
|
30
|
+
// name: '공정표',
|
|
31
|
+
// path: 'project-schedule-list',
|
|
32
|
+
// icons: ICONS_OPERATING
|
|
33
|
+
// },
|
|
34
34
|
{
|
|
35
35
|
name: '셋팅',
|
|
36
36
|
path: 'project-setting-list',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-tools.js","sourceRoot":"","sources":["../../client/viewparts/menu-tools.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAEtC,OAAO,EAAE,cAAc,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"menu-tools.js","sourceRoot":"","sources":["../../client/viewparts/menu-tools.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAEtC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAiC,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAG5G,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,OAAO,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC;IAAlD;;QA0GG,UAAK,GAAsD,EAAE,CAAA;IAqDvE,CAAC;IAnDC,MAAM;QACJ,IAAI,CAAC,KAAK,GAAG;YACX;gBACE,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;aACtB;YACD;gBACE,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,wBAAwB;gBAC9B,KAAK,EAAE,eAAe;aACvB;YACD,IAAI;YACJ,kBAAkB;YAClB,yBAAyB;YACzB,wBAAwB;YACxB,KAAK;YACL,IAAI;YACJ,iBAAiB;YACjB,mCAAmC;YACnC,2BAA2B;YAC3B,KAAK;YACL;gBACE,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,sBAAsB;gBAC5B,KAAK,EAAE,aAAa;aACrB;SACF,CAAA;QAED,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;QAE1B,OAAO,IAAI,CAAA;;UAEL,IAAI,CAAC,KAAK,CAAC,GAAG,CACd,IAAI,CAAC,EAAE,CAAC,IAAI,CAAA;;wBAEE,IAAI,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;2BAC5C,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;uBAC9D,IAAI,CAAC,IAAI;;;WAGrB,CACF;;KAEJ,CAAA;IACH,CAAC;IAED,YAAY,CAAC,KAAK;QAChB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAA;QAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAA;IACjC,CAAC;;AA7JM,gBAAM,GAAG;IACd,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkGF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;uCAAc;AACzC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;wCAAe;AAxG9C,SAAS;IADrB,aAAa,CAAC,YAAY,CAAC;GACf,SAAS,CA+JrB;SA/JY,SAAS","sourcesContent":["import { css, html, LitElement } from 'lit'\nimport { customElement, property, query } from 'lit/decorators.js'\n\nimport { connect } from 'pwa-helpers'\n\nimport { store } from '@operato/shell'\n\nimport { ICONS_PROGRESS, ICONS_COMPLETED, ICONS_STATUS, ICONS_OPERATING, ICONS_SETTING } from '../icons/menu-icons'\n\n@customElement('menu-tools')\nexport class MenuTools extends connect(store)(LitElement) {\n static styles = [\n css`\n :host {\n display: flex;\n background-color: var(--secondary-color);\n\n /* for narrow mode */\n flex-direction: column;\n width: 100%;\n --menu-tools-color: rgba(255, 255, 255, 0.9);\n --menu-tools-active-color: rgba(107, 178, 249, 1);\n }\n\n :host([width='WIDE']) {\n /* for wide mode */\n flex-direction: row;\n width: initial;\n height: 100%;\n }\n\n ul {\n display: flex;\n flex-direction: row;\n\n margin: auto;\n padding: 0;\n list-style: none;\n height: 100%;\n overflow: none;\n }\n\n :host([width='NARROW']) ul {\n width: 100%;\n justify-content: space-around;\n }\n\n :host([width='WIDE']) ul {\n flex-direction: column;\n }\n :host([width='NARROW']) li {\n flex: 1;\n }\n\n :host([width='WIDE']) li {\n border-top: 1px solid rgba(255, 255, 255, 0.1);\n border-bottom: 1px solid rgba(0, 0, 0, 0.1);\n }\n\n a {\n display: flex;\n flex-direction: column;\n padding: 5px 0px;\n opacity: 0.7;\n align-items: center;\n text-align: center;\n text-decoration: none;\n text-transform: capitalize;\n color: var(--menu-tools-color);\n border-left: 2px solid transparent;\n }\n\n a[active] {\n opacity: 1;\n color: var(--menu-tools-active-color);\n font-weight: bold;\n background-color: rgba(0, 0, 0, 0.15);\n border-left: 2px solid var(--menu-tools-active-color);\n }\n\n :host([width='NARROW']) a {\n padding: 0px 0px 5px 0px;\n opacity: 0.8;\n color: var(--menu-tools-color);\n border-left: none;\n border-top: 2px solid transparent;\n }\n\n :host([width='NARROW']) a[active] {\n opacity: 1;\n color: var(--menu-tools-active-color);\n font-weight: bold;\n background-color: rgba(0, 0, 0, 0.15);\n border-left: none;\n border-top: 2px solid var(--menu-tools-active-color);\n }\n\n img {\n display: block;\n width: 35px;\n padding: 5px 10px 0px 10px;\n }\n\n :host([width='NARROW']) img {\n padding: 0;\n }\n\n div {\n font-size: 0.6em;\n }\n `\n ]\n\n @property({ type: String }) page?: string\n @property({ type: String, reflect: true }) width?: string\n\n private menus: { name: string; path: string; icons: string[] }[] = []\n\n render() {\n this.menus = [\n {\n name: '진행중',\n path: 'project-list',\n icons: ICONS_PROGRESS\n },\n {\n name: '완료',\n path: 'project-completed-list',\n icons: ICONS_COMPLETED\n },\n // {\n // name: '검측현황',\n // path: 'dssp-status',\n // icons: ICONS_STATUS\n // },\n // {\n // name: '공정표',\n // path: 'project-schedule-list',\n // icons: ICONS_OPERATING\n // },\n {\n name: '셋팅',\n path: 'project-setting-list',\n icons: ICONS_SETTING\n }\n ]\n\n var page = this.page || ''\n\n return html`\n <ul>\n ${this.menus.map(\n menu => html`\n <li>\n <a href=${menu.path} ?active=${!!~page.indexOf(menu.path)}>\n <img src=${!!~page.indexOf(menu.path) ? menu.icons[1] : menu.icons[0]} />\n <div>${menu.name}</div>\n </a>\n </li>\n `\n )}\n </ul>\n `\n }\n\n stateChanged(state) {\n this.page = state.route.page\n this.width = state.layout.width\n }\n}\n"]}
|
|
@@ -8,8 +8,8 @@ services:
|
|
|
8
8
|
- app
|
|
9
9
|
app:
|
|
10
10
|
build: .
|
|
11
|
-
container_name:
|
|
12
|
-
image: hatiolab/
|
|
11
|
+
container_name: dcsp
|
|
12
|
+
image: hatiolab/dcsp:latest
|
|
13
13
|
privileged: true
|
|
14
14
|
volumes:
|
|
15
15
|
- ./logs:/app/logs
|
|
@@ -21,7 +21,7 @@ services:
|
|
|
21
21
|
- mosquitto
|
|
22
22
|
postgres:
|
|
23
23
|
image: postgres:13.2
|
|
24
|
-
container_name: db-
|
|
24
|
+
container_name: db-dcsp
|
|
25
25
|
environment:
|
|
26
26
|
POSTGRES_PASSWORD: abcd1234
|
|
27
27
|
POSTGRES_USER: postgres
|
package/installer/install.sh
CHANGED
|
@@ -2,42 +2,42 @@ if [ -f "config.production.js" ] ; then
|
|
|
2
2
|
echo "config.production.js exist"
|
|
3
3
|
else
|
|
4
4
|
echo "config.production.js create"
|
|
5
|
-
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/
|
|
5
|
+
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/config.production.js
|
|
6
6
|
fi
|
|
7
7
|
|
|
8
8
|
if [ -f "start.sh" ] ; then
|
|
9
9
|
echo "start.sh exist"
|
|
10
10
|
else
|
|
11
11
|
echo "start.sh create"
|
|
12
|
-
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/
|
|
12
|
+
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/start.sh
|
|
13
13
|
fi
|
|
14
14
|
|
|
15
15
|
if [ -f "stop.sh" ] ; then
|
|
16
16
|
echo "stop.sh exist"
|
|
17
17
|
else
|
|
18
18
|
echo "stop.sh create"
|
|
19
|
-
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/
|
|
19
|
+
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/stop.sh
|
|
20
20
|
fi
|
|
21
21
|
|
|
22
22
|
if [ -f "upgrade.sh" ] ; then
|
|
23
23
|
echo "upgrade.sh exist"
|
|
24
24
|
else
|
|
25
25
|
echo "upgrade.sh create"
|
|
26
|
-
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/
|
|
26
|
+
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/upgrade.sh
|
|
27
27
|
fi
|
|
28
28
|
|
|
29
29
|
if [ -f "migrate.sh" ] ; then
|
|
30
30
|
echo "migrate.sh exist"
|
|
31
31
|
else
|
|
32
32
|
echo "migrate.sh create"
|
|
33
|
-
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/
|
|
33
|
+
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/migrate.sh
|
|
34
34
|
fi
|
|
35
35
|
|
|
36
36
|
if [ -f "docker-compose.yml" ] ; then
|
|
37
37
|
echo "docker-compose.yml exist"
|
|
38
38
|
else
|
|
39
39
|
echo "docker-compose.yml create"
|
|
40
|
-
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/
|
|
40
|
+
curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/docker-compose.yml
|
|
41
41
|
fi
|
|
42
42
|
|
|
43
43
|
chmod u+x start.sh
|
|
@@ -47,7 +47,7 @@ chmod u+x migrate.sh
|
|
|
47
47
|
|
|
48
48
|
echo "HostPort=3000" > .env
|
|
49
49
|
|
|
50
|
-
docker pull hatiolab/
|
|
50
|
+
docker pull hatiolab/dcsp:latest
|
|
51
51
|
|
|
52
52
|
docker pull hatiolab/operato-nginx:latest
|
|
53
53
|
|
package/installer/migrate.sh
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
docker exec -it
|
|
1
|
+
docker exec -it dcsp npm run migration -- --mode=production
|
package/installer/upgrade.sh
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
curl -fsSL https://raw.githubusercontent.com/things-factory/things-factory/master/packages/
|
|
1
|
+
curl -fsSL https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/install.sh | bash -s
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dssp/dcsp",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.23",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "dist-client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -39,8 +39,12 @@
|
|
|
39
39
|
"docker:push": "docker image push hatiolab/dcsp:latest && docker image push hatiolab/dcsp:$npm_package_version"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@dssp/building-complex": "^0.0.
|
|
43
|
-
"@dssp/project": "^0.0.
|
|
42
|
+
"@dssp/building-complex": "^0.0.23",
|
|
43
|
+
"@dssp/project": "^0.0.23",
|
|
44
|
+
"@dssp/supervision": "^0.0.23",
|
|
45
|
+
"@material/web": "^2.1.0",
|
|
46
|
+
"@operato/chart": "^8.0.0-alpha",
|
|
47
|
+
"@operato/gantt": "^8.0.0-alpha",
|
|
44
48
|
"@operato/scene-auth": "^8.0.0-alpha",
|
|
45
49
|
"@operato/scene-chartjs": "^8.0.0-alpha",
|
|
46
50
|
"@operato/scene-clock": "^8.0.0-alpha",
|
|
@@ -83,10 +87,11 @@
|
|
|
83
87
|
"@things-factory/setting-base": "^8.0.0-alpha",
|
|
84
88
|
"@things-factory/setting-ui": "^8.0.0-alpha",
|
|
85
89
|
"@things-factory/shell": "^8.0.0-alpha",
|
|
86
|
-
"@things-factory/system": "^8.0.0-alpha"
|
|
90
|
+
"@things-factory/system": "^8.0.0-alpha",
|
|
91
|
+
"puppeteer": "22.12.1"
|
|
87
92
|
},
|
|
88
93
|
"devDependencies": {
|
|
89
94
|
"@things-factory/builder": "^8.0.0-alpha"
|
|
90
95
|
},
|
|
91
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "d2b020ad1b7ba93251c07e69192af8fdadeded23"
|
|
92
97
|
}
|