@things-factory/operato-fleet 7.0.1-alpha.1 → 7.0.1-alpha.100

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.
Files changed (38) hide show
  1. package/_index.html +6 -2
  2. package/client/actions/fleets.js +1 -1
  3. package/client/bootstrap.js +20 -10
  4. package/client/commons/common-map.js +2 -2
  5. package/client/commons/fleet-item.js +11 -9
  6. package/client/commons/fleet-search.js +4 -4
  7. package/client/commons/geofence-item.js +4 -3
  8. package/client/commons/geofence-search.js +3 -3
  9. package/client/commons/marker-info-content.js +1 -1
  10. package/client/pages/admin/admin.js +3 -3
  11. package/client/pages/client/client.js +3 -3
  12. package/client/pages/device/device.js +3 -3
  13. package/client/pages/fleet-page-style.js +1 -1
  14. package/client/pages/geofence/geofence.js +2 -2
  15. package/client/pages/monitoring/monitoring.js +3 -3
  16. package/client/pages/report/report-air-pressure.js +3 -3
  17. package/client/pages/report/report-based-on-track.js +2 -2
  18. package/client/pages/report/report-breakdown.js +3 -3
  19. package/client/pages/report/report-delivery.js +4 -4
  20. package/client/pages/report/report-device.js +4 -4
  21. package/client/pages/report/report-humidity.js +3 -3
  22. package/client/pages/report/report-illuminance.js +3 -3
  23. package/client/pages/report/report-shock.js +3 -3
  24. package/client/pages/report/report-style.js +1 -1
  25. package/client/pages/report/report-temperature.js +3 -3
  26. package/client/pages/report/report.js +9 -8
  27. package/client/themes/app-theme.css +19 -4
  28. package/client/themes/grist-theme.css +7 -5
  29. package/client/themes/layout-theme.css +2 -2
  30. package/client/themes/report-theme.css +1 -1
  31. package/client/viewparts/infowindow-setting-let.js +6 -7
  32. package/client/viewparts/menu-tools.js +1 -1
  33. package/config/config.production.js +0 -1
  34. package/dist-server/tsconfig.tsbuildinfo +1 -1
  35. package/package.json +27 -26
  36. package/schema.graphql +4314 -0
  37. package/views/auth-page.html +3 -1
  38. package/views/public/home.html +4 -2
package/_index.html CHANGED
@@ -1,4 +1,4 @@
1
- <!DOCTYPE html>
1
+ <!doctype html>
2
2
  <html lang="en">
3
3
  <head>
4
4
  <meta charset="utf-8" />
@@ -52,6 +52,10 @@
52
52
  <!-- Performance tip: hint to the browser to start the handshake for the fonts site -->
53
53
  <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin />
54
54
  <link href="/node_modules/@material-design-icons/font/index.css" rel="stylesheet" />
55
+ <link href="/node_modules/material-symbols/index.css" rel="stylesheet" />
56
+ <link href="/node_modules/@fontsource/roboto/index.css" rel="stylesheet" />
57
+ <link rel="stylesheet" href="/theme.css" />
58
+
55
59
  <style>
56
60
  body {
57
61
  margin: 0;
@@ -77,7 +81,7 @@
77
81
  }
78
82
  </script>
79
83
  </head>
80
- <body>
84
+ <body class="light">
81
85
  <things-app></things-app>
82
86
  <noscript> Please enable JavaScript to view this website. </noscript>
83
87
  <!-- Load webcomponents-loader.js to check and load any polyfills your browser needs -->
package/client/actions/fleets.js CHANGED
@@ -1,4 +1,4 @@
1
- import { store } from '@things-factory/shell'
1
+ import { store } from '@operato/shell'
2
2
  import { fetchFleets } from '../commons/fetch-fleets'
3
3
 
4
4
  export const UPDATE_FLEETS = 'UPDATE_FLEETS'
package/client/bootstrap.js CHANGED
@@ -1,22 +1,24 @@
1
1
  import '@things-factory/notification'
2
2
  import '@things-factory/board-ui'
3
+ import '@things-factory/setting-ui/dist-client'
4
+ import '@operato/i18n/ox-i18n.js'
5
+
3
6
  import './viewparts/user-circle'
4
7
  import './viewparts/menu-tools'
5
8
  import './viewparts/infowindow-setting-let'
6
- import '@operato/i18n/ox-i18n.js'
7
9
 
8
10
  import { html } from 'lit'
9
11
 
10
12
  import { registerDefaultGroups } from '@operato/board/register-default-groups.js'
11
13
  import { appendViewpart, toggleOverlay, TOOL_POSITION, updateViewpart, VIEWPART_POSITION } from '@operato/layout'
12
- import { APPEND_APP_TOOL } from '@things-factory/apptool-base'
13
- import { setupAppToolPart } from '@things-factory/apptool-ui'
14
- import { setAuthManagementMenus } from '@things-factory/auth-ui'
15
- import { setupContextUIPart } from '@things-factory/context-ui'
14
+ import { APPEND_APP_TOOL } from '@things-factory/apptool-base/client'
15
+ import { setupAppToolPart } from '@things-factory/apptool-ui/dist-client'
16
+ import { setAuthManagementMenus } from '@things-factory/auth-ui/dist-client'
17
+ import { setupContextUIPart } from '@things-factory/context-ui/dist-client'
16
18
  import { fetchBoardSettings, UPDATE_BOARD_SETTINGS } from '@things-factory/dashboard'
17
- import { ADD_MORENDA } from '@things-factory/more-base'
18
- import { ADD_SETTING } from '@things-factory/setting-base'
19
- import { navigate, store } from '@things-factory/shell'
19
+ import { ADD_MORENDA } from '@things-factory/more-base/client'
20
+ import { ADD_SETTING } from '@things-factory/setting-base/dist-client'
21
+ import { navigate, store } from '@operato/shell'
20
22
 
21
23
  import { searchFleets } from './actions/fleets'
22
24
  import GoogleMapLoader from './commons/google-map-loader'
@@ -69,7 +71,7 @@ export default async function bootstrap() {
69
71
  store.dispatch({
70
72
  type: ADD_MORENDA,
71
73
  morenda: {
72
- icon: html` <mwc-icon>settings</mwc-icon> `,
74
+ icon: html` <md-icon>settings</md-icon> `,
73
75
  name: html` <ox-i18n msgid="label.setting"></ox-i18n> `,
74
76
  action: () => {
75
77
  navigate('setting')
@@ -92,7 +94,7 @@ export default async function bootstrap() {
92
94
  // store.dispatch({
93
95
  // type: ADD_MORENDA,
94
96
  // morenda: {
95
- // icon: html` <mwc-icon>help</mwc-icon> `,
97
+ // icon: html` <md-icon>help</md-icon> `,
96
98
  // name: html` <ox-i18n msgid="text.help"></ox-i18n> `,
97
99
  // action: () => {
98
100
  // navigate('help')
@@ -186,6 +188,14 @@ export default async function bootstrap() {
186
188
  })
187
189
 
188
190
  /* for settings */
191
+ store.dispatch({
192
+ type: ADD_SETTING,
193
+ setting: {
194
+ seq: 10,
195
+ template: html` <theme-mode-setting-let></theme-mode-setting-let> `
196
+ }
197
+ })
198
+
189
199
  store.dispatch({
190
200
  type: ADD_SETTING,
191
201
  setting: {
package/client/commons/common-map.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { LitElement, html, css } from 'lit'
2
2
  import { connect } from 'pwa-helpers/connect-mixin.js'
3
- import { store } from '@things-factory/shell'
4
- import { ScrollbarStyles } from '@things-factory/styles'
3
+ import { store } from '@operato/shell'
4
+ import { ScrollbarStyles } from '@operato/styles'
5
5
 
6
6
  import GoogleMapLoader from './google-map-loader'
7
7
 
package/client/commons/fleet-item.js CHANGED
@@ -1,3 +1,5 @@
1
+ import '@material/web/icon/icon.js'
2
+
1
3
  import { LitElement, html, css } from 'lit'
2
4
 
3
5
  export class FleetItem extends LitElement {
@@ -36,7 +38,7 @@ export class FleetItem extends LitElement {
36
38
  text-overflow: ellipsis;
37
39
  }
38
40
 
39
- [second-line] mwc-icon {
41
+ [second-line] md-icon {
40
42
  margin-right: 2px;
41
43
  font-size: 13px;
42
44
  }
@@ -55,7 +57,7 @@ export class FleetItem extends LitElement {
55
57
  text-align: right;
56
58
  }
57
59
 
58
- [battery] mwc-icon {
60
+ [battery] md-icon {
59
61
  width: 10px;
60
62
  height: 10px;
61
63
  background-color: #ccc;
@@ -67,15 +69,15 @@ export class FleetItem extends LitElement {
67
69
  font-weight: normal;
68
70
  }
69
71
 
70
- [battery].good mwc-icon {
72
+ [battery].good md-icon {
71
73
  background-color: #539d04;
72
74
  }
73
75
 
74
- [battery].warn mwc-icon {
76
+ [battery].warn md-icon {
75
77
  background-color: #f48400;
76
78
  }
77
79
 
78
- [battery].bad mwc-icon {
80
+ [battery].bad md-icon {
79
81
  background-color: #bb4023;
80
82
  }
81
83
 
@@ -126,13 +128,13 @@ export class FleetItem extends LitElement {
126
128
  return html`
127
129
  <div first-line>
128
130
  <span name>${name}</span>
129
- <span battery class=${batteryLevel}><mwc-icon>battery_full</mwc-icon>${battery}%</span>
131
+ <span battery class=${batteryLevel}><md-icon>battery_full</md-icon>${battery}%</span>
130
132
  <span status ?on=${!!status}>${status ? 'on' : 'off'}</span>
131
133
  </div>
132
134
  <div second-line>
133
- <span client title=${client}><mwc-icon>domain</mwc-icon>${client}</span>
134
- <span delivery title=${delivery}><mwc-icon>local_shipping</mwc-icon>${delivery}</span>
135
- <span driver title=${driver}><mwc-icon>account_circle</mwc-icon>${driver}</span>
135
+ <span client title=${client}><md-icon>domain</md-icon>${client}</span>
136
+ <span delivery title=${delivery}><md-icon>local_shipping</md-icon>${delivery}</span>
137
+ <span driver title=${driver}><md-icon>account_circle</md-icon>${driver}</span>
136
138
  </div>
137
139
  `
138
140
  }
package/client/commons/fleet-search.js CHANGED
@@ -2,9 +2,9 @@ import '@operato/i18n/ox-i18n.js'
2
2
 
3
3
  import { LitElement, html, css } from 'lit'
4
4
  import { connect } from 'pwa-helpers/connect-mixin.js'
5
- import { store } from '@things-factory/shell'
6
- import { ScrollbarStyles } from '@things-factory/styles'
7
- import { localize, i18next } from '@things-factory/i18n-base'
5
+ import { store } from '@operato/shell'
6
+ import { ScrollbarStyles } from '@operato/styles'
7
+ import { localize, i18next } from '@operato/i18n'
8
8
 
9
9
  import './fleet-item'
10
10
 
@@ -30,7 +30,7 @@ export class FleetSearch extends connect(store)(localize(i18next)(LitElement)) {
30
30
  display: flex;
31
31
  flex-direction: column;
32
32
  overflow: hidden;
33
- background-color: var(--main-section-background-color);
33
+ background-color: var(--md-sys-color-background);
34
34
  border-right: 1px solid rgba(0, 0, 0, 0.2);
35
35
  }
36
36
 
package/client/commons/geofence-item.js CHANGED
@@ -1,3 +1,4 @@
1
+ import '@material/web/icon/icon.js'
1
2
  import { LitElement, html, css } from 'lit'
2
3
 
3
4
  export class GeofenceItem extends LitElement {
@@ -23,7 +24,7 @@ export class GeofenceItem extends LitElement {
23
24
  vertical-align: middle;
24
25
  opacity: 0.8;
25
26
  }
26
- [second-line] mwc-icon {
27
+ [second-line] md-icon {
27
28
  margin-right: 2px;
28
29
  font-size: 13px;
29
30
  }
@@ -80,8 +81,8 @@ export class GeofenceItem extends LitElement {
80
81
  <span class=${type.toLowerCase()} type>${type}</span>
81
82
  </div>
82
83
  <div second-line>
83
- <span client><mwc-icon>domain</mwc-icon>${client}</span>
84
- <span event><mwc-icon>notification_important</mwc-icon>${event}</span>
84
+ <span client><md-icon>domain</md-icon>${client}</span>
85
+ <span event><md-icon>notification_important</md-icon>${event}</span>
85
86
  </div>
86
87
  `
87
88
  }
package/client/commons/geofence-search.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import '@operato/i18n/ox-i18n.js'
2
2
 
3
3
  import { LitElement, html, css } from 'lit'
4
- import { ScrollbarStyles } from '@things-factory/styles'
5
- import { i18next } from '@things-factory/i18n-base'
4
+ import { ScrollbarStyles } from '@operato/styles'
5
+ import { i18next } from '@operato/i18n'
6
6
  import Chance from 'chance'
7
7
 
8
8
  import { fetchGeofence } from './fetch-geofence'
@@ -17,7 +17,7 @@ export class GeofenceSearch extends LitElement {
17
17
  display: flex;
18
18
  flex-direction: column;
19
19
  overflow: hidden;
20
- background-color: var(--main-section-background-color);
20
+ background-color: var(--md-sys-color-background);
21
21
  box-shadow: inset 2px 0px 3px 0px rgba(0, 0, 0, 0.15);
22
22
  border-right: 1px solid rgba(0, 0, 0, 0.2);
23
23
  }
package/client/commons/marker-info-content.js CHANGED
@@ -5,7 +5,7 @@ import gql from 'graphql-tag'
5
5
  import { css, html, LitElement } from 'lit'
6
6
 
7
7
  import { provider } from '@things-factory/board-ui'
8
- import { client } from '@things-factory/shell'
8
+ import { client } from '@operato/graphql'
9
9
 
10
10
  /**
11
11
  * 구글맵 마커 인포윈도우용 컨텐트
package/client/pages/admin/admin.js CHANGED
@@ -1,9 +1,9 @@
1
1
  import { html, css } from 'lit'
2
2
  import { connect } from 'pwa-helpers/connect-mixin.js'
3
3
  import '@material/mwc-button'
4
- import { store, PageView } from '@things-factory/shell'
5
- import { i18next, localize } from '@things-factory/i18n-base'
6
- import { ScrollbarStyles } from '@things-factory/styles'
4
+ import { store, PageView } from '@operato/shell'
5
+ import { i18next, localize } from '@operato/i18n'
6
+ import { ScrollbarStyles } from '@operato/styles'
7
7
  import { FMSPageStyles } from '../fleet-page-style'
8
8
 
9
9
  class FMSAdmin extends connect(store)(localize(i18next)(PageView)) {
package/client/pages/client/client.js CHANGED
@@ -2,10 +2,10 @@ import { html, css } from 'lit'
2
2
  import { connect } from 'pwa-helpers/connect-mixin.js'
3
3
  import '@material/mwc-button'
4
4
  import '@material/mwc-textfield'
5
- import { store, PageView } from '@things-factory/shell'
5
+ import { store, PageView } from '@operato/shell'
6
6
  import '@operato/data-grist'
7
- import { i18next, localize } from '@things-factory/i18n-base'
8
- import { isMobileDevice } from '@things-factory/utils'
7
+ import { i18next, localize } from '@operato/i18n'
8
+ import { isMobileDevice } from '@operato/utils'
9
9
  import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
10
10
  import { FMSPageStyles } from '../fleet-page-style'
11
11
 
package/client/pages/device/device.js CHANGED
@@ -2,10 +2,10 @@ import { html, css } from 'lit'
2
2
  import { connect } from 'pwa-helpers/connect-mixin.js'
3
3
  import '@material/mwc-button'
4
4
  import '@material/mwc-textfield'
5
- import { store, PageView } from '@things-factory/shell'
5
+ import { store, PageView } from '@operato/shell'
6
6
  import '@operato/data-grist'
7
- import { i18next, localize } from '@things-factory/i18n-base'
8
- import { isMobileDevice } from '@things-factory/utils'
7
+ import { i18next, localize } from '@operato/i18n'
8
+ import { isMobileDevice } from '@operato/utils'
9
9
  import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
10
10
  import { FMSPageStyles } from '../fleet-page-style'
11
11
 
package/client/pages/fleet-page-style.js CHANGED
@@ -48,7 +48,7 @@ export const FMSPageStyles = css`
48
48
  justify-content: flex-start;
49
49
  padding: 5px 15px;
50
50
  box-shadow: inset 0px 3px 3px 0px rgba(0, 0, 0, 0.2);
51
- background-color: var(--main-section-background-color);
51
+ background-color: var(--md-sys-color-background);
52
52
  }
53
53
 
54
54
  [search] * {
package/client/pages/geofence/geofence.js CHANGED
@@ -2,8 +2,8 @@ import { html, css } from 'lit'
2
2
  import { connect } from 'pwa-helpers/connect-mixin.js'
3
3
  import '@material/mwc-button'
4
4
  import '@material/mwc-textfield'
5
- import { store, PageView } from '@things-factory/shell'
6
- import { i18next, localize } from '@things-factory/i18n-base'
5
+ import { store, PageView } from '@operato/shell'
6
+ import { i18next, localize } from '@operato/i18n'
7
7
 
8
8
  import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
9
9
  import { FMSPageStyles } from '../fleet-page-style'
package/client/pages/monitoring/monitoring.js CHANGED
@@ -3,10 +3,10 @@ import { connect } from 'pwa-helpers/connect-mixin.js'
3
3
  import '@material/mwc-button'
4
4
  import '@material/mwc-textfield'
5
5
 
6
- import { store, PageView } from '@things-factory/shell'
7
- import { i18next, localize } from '@things-factory/i18n-base'
6
+ import { store, PageView } from '@operato/shell'
7
+ import { i18next, localize } from '@operato/i18n'
8
8
 
9
- import { ScrollbarStyles } from '@things-factory/styles'
9
+ import { ScrollbarStyles } from '@operato/styles'
10
10
  import { FMSPageStyles } from '../fleet-page-style'
11
11
 
12
12
  import { MapBuilder } from '../../commons/map-builder'
package/client/pages/report/report-air-pressure.js CHANGED
@@ -2,9 +2,9 @@ import { html, css } from 'lit'
2
2
  import '@material/mwc-button'
3
3
  import '@material/mwc-textfield'
4
4
  import '@operato/data-grist'
5
- import { i18next } from '@things-factory/i18n-base'
6
- import { isMobileDevice } from '@things-factory/utils'
7
- import { ScrollbarStyles } from '@things-factory/styles'
5
+ import { i18next } from '@operato/i18n'
6
+ import { isMobileDevice } from '@operato/utils'
7
+ import { ScrollbarStyles } from '@operato/styles'
8
8
 
9
9
  import { ReportBasedOnTrack } from './report-based-on-track'
10
10
 
package/client/pages/report/report-based-on-track.js CHANGED
@@ -8,8 +8,8 @@ import Chance from 'chance'
8
8
  import { connect } from 'pwa-helpers/connect-mixin.js'
9
9
 
10
10
  import { openPopup } from '@operato/layout'
11
- import { i18next, localize } from '@things-factory/i18n-base'
12
- import { PageView, store } from '@things-factory/shell'
11
+ import { i18next, localize } from '@operato/i18n'
12
+ import { PageView, store } from '@operato/shell'
13
13
 
14
14
  import { fetchTrack } from '../../commons/fetch-track'
15
15
  import { getISO6709StringFromLatLng } from '../../commons/iso-6709'
package/client/pages/report/report-breakdown.js CHANGED
@@ -2,9 +2,9 @@ import { html, css } from 'lit'
2
2
  import '@material/mwc-button'
3
3
  import '@material/mwc-textfield'
4
4
  import '@operato/data-grist'
5
- import { i18next } from '@things-factory/i18n-base'
6
- import { isMobileDevice } from '@things-factory/utils'
7
- import { ScrollbarStyles } from '@things-factory/styles'
5
+ import { i18next } from '@operato/i18n'
6
+ import { isMobileDevice } from '@operato/utils'
7
+ import { ScrollbarStyles } from '@operato/styles'
8
8
 
9
9
  import { ReportBasedOnTrack } from './report-based-on-track'
10
10
 
package/client/pages/report/report-delivery.js CHANGED
@@ -2,11 +2,11 @@ import { html, css } from 'lit'
2
2
  import { connect } from 'pwa-helpers/connect-mixin.js'
3
3
  import '@material/mwc-button'
4
4
  import '@material/mwc-textfield'
5
- import { store, PageView } from '@things-factory/shell'
5
+ import { store, PageView } from '@operato/shell'
6
6
  import '@operato/data-grist'
7
- import { i18next, localize } from '@things-factory/i18n-base'
8
- import { isMobileDevice } from '@things-factory/utils'
9
- import { ScrollbarStyles } from '@things-factory/styles'
7
+ import { i18next, localize } from '@operato/i18n'
8
+ import { isMobileDevice } from '@operato/utils'
9
+ import { ScrollbarStyles } from '@operato/styles'
10
10
 
11
11
  import { ReportStyles } from './report-style'
12
12
 
package/client/pages/report/report-device.js CHANGED
@@ -2,11 +2,11 @@ import { html, css } from 'lit'
2
2
  import { connect } from 'pwa-helpers/connect-mixin.js'
3
3
  import '@material/mwc-button'
4
4
  import '@material/mwc-textfield'
5
- import { store, PageView } from '@things-factory/shell'
5
+ import { store, PageView } from '@operato/shell'
6
6
  import '@operato/data-grist'
7
- import { i18next, localize } from '@things-factory/i18n-base'
8
- import { isMobileDevice } from '@things-factory/utils'
9
- import { ScrollbarStyles } from '@things-factory/styles'
7
+ import { i18next, localize } from '@operato/i18n'
8
+ import { isMobileDevice } from '@operato/utils'
9
+ import { ScrollbarStyles } from '@operato/styles'
10
10
 
11
11
  import { ReportStyles } from './report-style'
12
12
 
package/client/pages/report/report-humidity.js CHANGED
@@ -2,9 +2,9 @@ import { html, css } from 'lit'
2
2
  import '@material/mwc-button'
3
3
  import '@material/mwc-textfield'
4
4
  import '@operato/data-grist'
5
- import { i18next } from '@things-factory/i18n-base'
6
- import { isMobileDevice } from '@things-factory/utils'
7
- import { ScrollbarStyles } from '@things-factory/styles'
5
+ import { i18next } from '@operato/i18n'
6
+ import { isMobileDevice } from '@operato/utils'
7
+ import { ScrollbarStyles } from '@operato/styles'
8
8
 
9
9
  import { ReportBasedOnTrack } from './report-based-on-track'
10
10
 
package/client/pages/report/report-illuminance.js CHANGED
@@ -2,9 +2,9 @@ import { html, css } from 'lit'
2
2
  import '@material/mwc-button'
3
3
  import '@material/mwc-textfield'
4
4
  import '@operato/data-grist'
5
- import { i18next } from '@things-factory/i18n-base'
6
- import { isMobileDevice } from '@things-factory/utils'
7
- import { ScrollbarStyles } from '@things-factory/styles'
5
+ import { i18next } from '@operato/i18n'
6
+ import { isMobileDevice } from '@operato/utils'
7
+ import { ScrollbarStyles } from '@operato/styles'
8
8
 
9
9
  import { ReportBasedOnTrack } from './report-based-on-track'
10
10
 
package/client/pages/report/report-shock.js CHANGED
@@ -2,9 +2,9 @@ import { html, css } from 'lit'
2
2
  import '@material/mwc-button'
3
3
  import '@material/mwc-textfield'
4
4
  import '@operato/data-grist'
5
- import { i18next } from '@things-factory/i18n-base'
6
- import { isMobileDevice } from '@things-factory/utils'
7
- import { ScrollbarStyles } from '@things-factory/styles'
5
+ import { i18next } from '@operato/i18n'
6
+ import { isMobileDevice } from '@operato/utils'
7
+ import { ScrollbarStyles } from '@operato/styles'
8
8
 
9
9
  import { ReportBasedOnTrack } from './report-based-on-track'
10
10
 
package/client/pages/report/report-style.js CHANGED
@@ -30,7 +30,7 @@ export const ReportStyles = css`
30
30
  justify-content: flex-start;
31
31
  padding: 5px 15px;
32
32
  box-shadow: inset 0px 3px 3px 0px rgba(0, 0, 0, 0.2);
33
- background-color: var(--main-section-background-color);
33
+ background-color: var(--md-sys-color-background);
34
34
  }
35
35
 
36
36
  [search] * {
package/client/pages/report/report-temperature.js CHANGED
@@ -2,9 +2,9 @@ import { html, css } from 'lit'
2
2
  import '@material/mwc-button'
3
3
  import '@material/mwc-textfield'
4
4
  import '@operato/data-grist'
5
- import { i18next } from '@things-factory/i18n-base'
6
- import { isMobileDevice } from '@things-factory/utils'
7
- import { ScrollbarStyles } from '@things-factory/styles'
5
+ import { i18next } from '@operato/i18n'
6
+ import { isMobileDevice } from '@operato/utils'
7
+ import { ScrollbarStyles } from '@operato/styles'
8
8
 
9
9
  import { ReportBasedOnTrack } from './report-based-on-track'
10
10
 
package/client/pages/report/report.js CHANGED
@@ -1,13 +1,14 @@
1
1
  import '@operato/board/ox-board-viewer.js'
2
+ import '@operato/oops'
2
3
 
3
4
  import gql from 'graphql-tag'
4
5
  import { css, html } from 'lit'
5
6
  import { connect } from 'pwa-helpers/connect-mixin.js'
6
7
 
7
8
  import { provider } from '@things-factory/board-ui'
8
- import { i18next, localize } from '@things-factory/i18n-base'
9
+ import { i18next, localize } from '@operato/i18n'
9
10
  import { client, PageView, store } from '@things-factory/shell'
10
- import { ScrollbarStyles } from '@things-factory/styles'
11
+ import { ScrollbarStyles } from '@operato/styles'
11
12
 
12
13
  import { FMSPageStyles } from '../fleet-page-style'
13
14
 
@@ -44,7 +45,7 @@ export class FMSReport extends connect(store)(localize(i18next)(PageView)) {
44
45
  flex: 1;
45
46
  }
46
47
 
47
- oops-spinner {
48
+ ox-oops-spinner {
48
49
  display: none;
49
50
  position: absolute;
50
51
  left: 50%;
@@ -52,11 +53,11 @@ export class FMSReport extends connect(store)(localize(i18next)(PageView)) {
52
53
  transform: translate(-50%, -50%);
53
54
  }
54
55
 
55
- oops-spinner[show] {
56
+ ox-oops-spinner[show] {
56
57
  display: block;
57
58
  }
58
59
 
59
- oops-note {
60
+ ox-oops-note {
60
61
  display: block;
61
62
  position: absolute;
62
63
  left: 50%;
@@ -87,17 +88,17 @@ export class FMSReport extends connect(store)(localize(i18next)(PageView)) {
87
88
  return oops
88
89
  ? html`
89
90
  <div main>
90
- <oops-note
91
+ <ox-oops-note
91
92
  icon=${oops.icon}
92
93
  title=${oops.title}
93
94
  description=${oops.description}
94
95
  @click=${oops.click || NOOP}
95
- ></oops-note>
96
+ ></ox-oops-note>
96
97
  </div>
97
98
  `
98
99
  : html`
99
100
  <ox-board-viewer main .board=${this._board} .provider=${provider}></ox-board-viewer>
100
- <oops-spinner ?show=${this._showSpinner}></oops-spinner>
101
+ <ox-oops-spinner ?show=${this._showSpinner}></ox-oops-spinner>
101
102
  `
102
103
  }
103
104
 
package/client/themes/app-theme.css CHANGED
@@ -7,7 +7,6 @@ body {
7
7
  --focus-color: var(--theme-white-color);
8
8
  --primary-background-color: var(--secondary-color);
9
9
  --secondary-background-color: #283644;
10
- --main-section-background-color: #edf5fd;
11
10
  --theme-white-color: #fff;
12
11
  --theme-black-color: rgba(0, 0, 0, 0.9);
13
12
 
@@ -82,17 +81,33 @@ body {
82
81
  --mdc-button-outline-width: 1px;
83
82
  --mdc-button-horizontal-padding: 16px;
84
83
 
84
+ --md-fab-container-color: var(--primary-color);
85
+ --md-fab-icon-color: var(--focus-color);
86
+
87
+ --md-theme-on-primary: var(--theme-white-color);
88
+ --md-theme-primary: var(--secondary-text-color);
89
+ --md-theme-on-secondary: var(--theme-white-color);
90
+ --md-theme-secondary: var(--primary-color);
91
+ --md-button-outline-color: var(--primary-color);
92
+ --md-danger-button-primary-color: var(--status-danger-color);
93
+ --md-danger-button-outline-color: var(--status-danger-color);
94
+ --md-button-outline-width: 1px;
95
+ --md-button-horizontal-padding: 16px;
96
+
85
97
  /* button style */
86
98
  --button-background-color: #fafbfc;
87
99
  --button-border: var(--border-dark-color);
88
100
  --button-border-radius: var(--border-radius);
89
101
  --button-margin: var(--margin-default) var(--margin-default) var(--margin-default) 0;
90
- --button-padding: var(--padding-default);
102
+ --button-padding: calc(var(--padding-narrow) * 1.5) var(--padding-wide);
91
103
  --button-color: var(--secondary-color);
92
- --button-font: normal 15px var(--theme-font);
104
+ --button-font: 600 var(--fontsize-default) var(--theme-font);
93
105
  --button-text-transform: capitalize;
94
106
  --button-active-box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.2);
95
107
  --button-activ-border: 1px solid var(--primary-color);
108
+ --button-activ-background-color: var(--primary-color);
109
+ --button-activ-color: var(--theme-white-color);
110
+ --iconbtn-padding: var(--padding-narrow);
96
111
 
97
112
  --button-primary-background-color: var(--primary-color);
98
113
  --button-primary-active-background-color: var(--status-success-color);
@@ -123,7 +138,7 @@ body {
123
138
  --label-color: var(--secondary-color);
124
139
  --label-text-transform: capitalize;
125
140
  --input-margin: var(--margin-narrow) 0;
126
- --input-padding: var(--padding-default);
141
+ --input-padding: 6px 2px;
127
142
  --input-min-width: 200px;
128
143
  --input-font: normal var(--fontsize-default) var(--theme-font);
129
144
  --input-hint-font: normal var(--fontsize-small) var(--theme-font);
package/client/themes/grist-theme.css CHANGED
@@ -2,7 +2,7 @@ body {
2
2
  --grid-container-border-color: 1px solid rgba(0, 0, 0, 0.09);
3
3
  --grid-container-border-width: 1px 0;
4
4
 
5
- --grist-background-color: var(--main-section-background-color);
5
+ --grist-background-color: var(--md-sys-color-background);
6
6
  --grist-title-margin: 0 0 0 10px;
7
7
  --grist-title-border: none;
8
8
  --grist-title-font: bold 16px var(--theme-font);
@@ -36,6 +36,8 @@ body {
36
36
  --grid-header-filter-title-font: normal 12px var(--theme-font);
37
37
  --grid-header-filter-title-icon-color: var(--primary-color);
38
38
 
39
+ --grid-body-bottom-border: 1px solid rgba(var(--secondary-color-rgb), 0.2);
40
+
39
41
  --grid-gutter-padding: var(--padding-default) 0;
40
42
 
41
43
  --grid-record-background-color: var(--theme-white-color);
@@ -72,7 +74,7 @@ body {
72
74
  --grid-footer-inactive-color: var(--grid-footer-limit-color);
73
75
  --grid-footer-padding: var(--padding-default) var(--padding-narrow);
74
76
 
75
- --data-list-background-color: var(--main-section-background-color);
77
+ --data-list-background-color: var(--md-sys-color-background);
76
78
  --data-list-item-margin: var(--margin-default) 0 var(--margin-default) var(--margin-wide);
77
79
  --data-list-item-padding: var(--padding-default) var(--padding-wide);
78
80
  --data-list-item-border-bottom: var(--grid-container-border-color);
@@ -91,7 +93,7 @@ body {
91
93
  --data-list-fab-color: var(--primary-color);
92
94
  --data-list-fab-shadow: var(--box-shadow);
93
95
 
94
- --data-card-background-color: var(--main-section-background-color);
96
+ --data-card-background-color: var(--md-sys-color-background);
95
97
  --data-card-record-card-background-color: var(--theme-white-color);
96
98
  --data-card-record-card-border: var(--border-dark-color);
97
99
  --data-card-record-card-border-hover: 1px solid var(--primary-color);
@@ -125,7 +127,7 @@ body {
125
127
  --data-card-thumbnail-border-bottom: var(--border-dark-color);
126
128
  --data-card-attachimg-height: 70px;
127
129
 
128
- --record-view-background-color: var(--main-section-background-color);
130
+ --record-view-background-color: var(--md-sys-color-background);
129
131
  --record-view-gap: var(--margin-narrow) 0;
130
132
  --record-view-padding: var(--padding-default);
131
133
  --record-view-label-font: bold 15px var(--theme-font);
@@ -143,7 +145,7 @@ body {
143
145
  --record-view-footer-button-border-width: 0 0 0 1px;
144
146
  --record-view-footer-button-font: 17px;
145
147
  --record-view-footer-button-color: var(--theme-white-color);
146
- --record-view-footer-iconbutton-size: 35px;
148
+ --record-view-footer-iconbutton-size: 28px;
147
149
  --record-view-footer-focus-background: var(--primary-color);
148
150
 
149
151
  --ox-grist-padding: var(--padding-default) var(--padding-default) 0 var(--padding-default);