@blocklet/launcher-workflow 1.5.69 → 1.5.70

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 (5) hide show
  1. package/lib/components/launch-result-message.js +37 -13
  2. package/lib/components/server-eula.js +38 -22
  3. package/lib/prepare.js +14 -2
  4. package/lib/util.js +1 -1
  5. package/package.json +4 -4
package/lib/components/launch-result-message.js CHANGED
@@ -15,6 +15,10 @@ var _Check = _interopRequireDefault(require("@material-ui/icons/Check"));
15
15
 
16
16
  var _Close = _interopRequireDefault(require("@material-ui/icons/Close"));
17
17
 
18
+ var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
19
+
20
+ var _PriorityHigh = _interopRequireDefault(require("@material-ui/icons/PriorityHigh"));
21
+
18
22
  const _excluded = ["variant", "title", "subTitle", "footer"];
19
23
 
20
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -32,25 +36,45 @@ function LaunchResultMessage(_ref) {
32
36
  } = _ref,
33
37
  props = _objectWithoutProperties(_ref, _excluded);
34
38
 
35
- const Icon = variant === 'error' ? _Close.default : _Check.default;
39
+ let Icon;
40
+
41
+ switch (variant) {
42
+ case 'error':
43
+ Icon = _Close.default;
44
+ break;
45
+
46
+ case 'info':
47
+ Icon = _PriorityHigh.default;
48
+ break;
49
+
50
+ case 'loading':
51
+ Icon = _Spinner.default;
52
+ break;
53
+
54
+ default:
55
+ Icon = _Check.default;
56
+ }
57
+
36
58
  return /*#__PURE__*/_react.default.createElement(Container, Object.assign({
37
59
  variant: variant
38
- }, props), /*#__PURE__*/_react.default.createElement("span", {
39
- className: "icon"
40
- }, /*#__PURE__*/_react.default.createElement(Icon, null)), title && /*#__PURE__*/_react.default.createElement("div", {
41
- className: "result-message-title"
42
- }, title), subTitle && /*#__PURE__*/_react.default.createElement("div", {
43
- className: "sub-title"
44
- }, subTitle), footer && /*#__PURE__*/_react.default.createElement("div", {
45
- className: "result-message-footer"
46
- }, footer));
60
+ }, props), /*#__PURE__*/_react.default.createElement("div", {
61
+ className: "result-body"
62
+ }, /*#__PURE__*/_react.default.createElement("span", {
63
+ className: "result-icon color-".concat(variant)
64
+ }, /*#__PURE__*/_react.default.createElement(Icon, null)), /*#__PURE__*/_react.default.createElement("div", {
65
+ className: "result-title color-".concat(variant, " ").concat(title ? '' : 'ele-hide')
66
+ }, title), /*#__PURE__*/_react.default.createElement("div", {
67
+ className: "result-sub-title ".concat(subTitle ? '' : 'ele-hide')
68
+ }, subTitle), /*#__PURE__*/_react.default.createElement("div", {
69
+ className: "result-footer ".concat(footer ? '' : 'ele-hide')
70
+ }, footer)));
47
71
  }
48
72
 
49
73
  LaunchResultMessage.propTypes = {
50
- variant: _propTypes.default.oneOf(['success', 'error']),
74
+ variant: _propTypes.default.oneOf(['success', 'error', 'info', 'loading']),
51
75
  title: _propTypes.default.string,
52
76
  subTitle: _propTypes.default.string,
53
- footer: _propTypes.default.object
77
+ footer: _propTypes.default.any
54
78
  };
55
79
  LaunchResultMessage.defaultProps = {
56
80
  variant: 'success',
@@ -62,4 +86,4 @@ LaunchResultMessage.defaultProps = {
62
86
  const Container = _styledComponents.default.div.withConfig({
63
87
  displayName: "launch-result-message__Container",
64
88
  componentId: "sc-17nd2le-0"
65
- })(["display:flex;flex-direction:column;align-items:center;justify-content:center;text-align:center;width:100%;height:100%;.icon{display:inline-flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:100%;background-color:", ";color:", ";}.result-message-title{margin-top:24px;color:", ";font-size:24px;font-weight:bolder;}.sub-title{margin-top:8px;color:", ";font-size:14px;}.result-message-footer{margin-top:24px;}"], props => props.variant === 'error' ? props.theme.palette.error.main : props.theme.palette.success.main, props => props.theme.palette.common.white, props => props.variant === 'error' ? props.theme.palette.error.main : props.theme.palette.success.main, props => props.theme.palette.grey[700]);
89
+ })(["display:flex;flex-direction:column;align-items:center;justify-content:center;text-align:center;width:100%;height:100%;.result-body{max-width:500px;text-align:center;margin-top:-64px;}.result-icon{display:inline-flex;justify-content:center;align-items:center;margin-bottom:24px;width:48px;height:48px;border-radius:100%;color:", ";transition:all ease 0.3s;&.color-success{background-color:", ";}&.color-error{background-color:", ";}&.color-info{background-color:", ";}}.result-title{height:34px;font-size:24px;margin-bottom:8px;font-weight:bolder;transition:all ease 0.3s;&.ele-hide{height:0;opacity:0;margin-bottom:0;}&.color-success{color:", ";}&.color-error{color:", ";}&.color-info{color:", ";}&.ele-hide{line-height:0;opacity:0;}}.result-sub-title{margin:0 auto;max-width:90%;color:", ";font-size:14px;line-height:1.21em;transition:all ease 0.3s;&.ele-hide{line-height:0;opacity:0;}}.result-footer{margin-top:38px;height:70px;overflow:hidden;transition:all ease 0.3s;&.ele-hide{margin-top:0;height:0;opacity:0;}}"], props => props.theme.palette.common.white, props => props.theme.palette.success.main, props => props.theme.palette.error.main, props => props.theme.palette.primary.main, props => props.theme.palette.success.main, props => props.theme.palette.error.main, props => props.theme.palette.primary.main, props => props.theme.palette.grey[700]);
package/lib/components/server-eula.js CHANGED
@@ -11,8 +11,6 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
11
11
 
12
12
  var _propTypes = _interopRequireDefault(require("prop-types"));
13
13
 
14
- var _useLocalStorage = _interopRequireDefault(require("react-use/lib/useLocalStorage"));
15
-
16
14
  var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox"));
17
15
 
18
16
  var _CheckCircleRounded = _interopRequireDefault(require("@material-ui/icons/CheckCircleRounded"));
@@ -25,10 +23,6 @@ var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
25
23
 
26
24
  var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
27
25
 
28
- var _server = _interopRequireDefault(require("@arcblock/license/lib/server"));
29
-
30
- var _locale = require("../contexts/locale");
31
-
32
26
  var _confirm = _interopRequireDefault(require("./confirm"));
33
27
 
34
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -42,15 +36,18 @@ function ServerEula(_ref) {
42
36
  let {
43
37
  onContinue,
44
38
  nextDisabled,
45
- launching
39
+ launching,
40
+ checkKey,
41
+ texts,
42
+ description
46
43
  } = _ref;
47
- const [agreed, setAgreed] = (0, _useLocalStorage.default)('server-eula-checked', false);
44
+ const [agreed, setAgreed] = (0, _react.useState)(localStorage.getItem(checkKey) === 'true');
48
45
  const [open, setOpen] = (0, _react.useState)(false);
49
- const {
50
- t
51
- } = (0, _react.useContext)(_locale.LocaleContext);
52
46
 
53
- const handleChecked = () => setAgreed(x => !x);
47
+ const handleChecked = () => setAgreed(x => {
48
+ localStorage.setItem(checkKey, !x);
49
+ return !x;
50
+ });
54
51
 
55
52
  const handleOpen = () => setOpen(x => !x);
56
53
 
@@ -58,6 +55,7 @@ function ServerEula(_ref) {
58
55
 
59
56
  const handleConfirm = () => {
60
57
  setAgreed(true);
58
+ localStorage.setItem(checkKey, true);
61
59
  setOpen(false);
62
60
  };
63
61
 
@@ -72,7 +70,7 @@ function ServerEula(_ref) {
72
70
  }), /*#__PURE__*/_react.default.createElement(_FormLabel.default, {
73
71
  className: "eula-trigger",
74
72
  onClick: handleOpen
75
- }, t('license.footer'))), /*#__PURE__*/_react.default.createElement(_Button.default, {
73
+ }, texts.listenName)), /*#__PURE__*/_react.default.createElement(_Button.default, {
76
74
  disabled: !agreed || nextDisabled,
77
75
  color: "primary",
78
76
  variant: "contained",
@@ -80,28 +78,46 @@ function ServerEula(_ref) {
80
78
  onClick: onContinue
81
79
  }, launching ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Spinner.default, {
82
80
  size: 14
83
- }), t('common.launching')) : t('common.next'))), open && /*#__PURE__*/_react.default.createElement(_confirm.default, {
84
- title: t('license.title'),
85
- description: /*#__PURE__*/_react.default.createElement(_server.default, {
86
- className: "eula-content"
87
- }),
81
+ }), texts.launchingText) : texts.buttonNext)), open && (texts.confirmOK ? /*#__PURE__*/_react.default.createElement(_confirm.default, {
82
+ title: texts.confirmTitle,
83
+ description: description,
84
+ color: "primary",
85
+ confirm: texts.confirmOK,
86
+ cancel: texts.confirmCancel,
87
+ onCancel: handleCancel,
88
+ onConfirm: handleConfirm
89
+ }) : /*#__PURE__*/_react.default.createElement(_confirm.default, {
90
+ title: texts.confirmTitle,
91
+ description: description,
88
92
  color: "primary",
89
93
  onCancel: handleCancel,
90
94
  onConfirm: handleConfirm
91
- }));
95
+ })));
92
96
  }
93
97
 
94
98
  ServerEula.propTypes = {
95
99
  onContinue: _propTypes.default.func.isRequired,
96
100
  nextDisabled: _propTypes.default.bool,
97
- launching: _propTypes.default.bool
101
+ launching: _propTypes.default.bool,
102
+ checkKey: _propTypes.default.string.isRequired,
103
+ description: _propTypes.default.any,
104
+ texts: _propTypes.default.object
98
105
  };
99
106
  ServerEula.defaultProps = {
100
107
  nextDisabled: false,
101
- launching: false
108
+ launching: false,
109
+ description: '',
110
+ texts: {
111
+ listenName: '',
112
+ launchingText: '',
113
+ buttonNext: '',
114
+ confirmTitle: '',
115
+ confirmOK: '',
116
+ confirmCancel: ''
117
+ }
102
118
  };
103
119
 
104
120
  const Div = _styledComponents.default.div.withConfig({
105
121
  displayName: "server-eula__Div",
106
122
  componentId: "sc-16uy00s-0"
107
- })(["width:90%;max-width:450px;margin:0 auto;display:flex;justify-content:space-between;align-items:center;@media (max-width:", "px){flex-direction:column;}.eula-checkbox{display:flex;align-items:center;.eula-trigger{cursor:pointer;font-size:14px;&:hover{color:", ";}}}.next-button{width:120px;}"], props => props.theme.breakpoints.values.sm, props => props.theme.palette.primary.main);
123
+ })(["margin:0 auto;display:flex;justify-content:space-between;align-items:center;@media (max-width:", "px){flex-direction:column;}.eula-checkbox{display:flex;flex:1;align-items:center;.eula-trigger{cursor:pointer;", "{padding-right:24px;}font-size:14px;white-space:nowrap;&:hover{color:", ";}}}.next-button{width:200px;}"], props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.up('md'), props => props.theme.palette.primary.main);
package/lib/prepare.js CHANGED
@@ -25,6 +25,8 @@ var _FormHelperText = _interopRequireDefault(require("@material-ui/core/FormHelp
25
25
 
26
26
  var _launcherConstant = require("@blocklet/launcher-constant");
27
27
 
28
+ var _server = _interopRequireDefault(require("@arcblock/license/lib/server"));
29
+
28
30
  var _pageHeader = _interopRequireDefault(require("./components/page-header"));
29
31
 
30
32
  var _serverEula = _interopRequireDefault(require("./components/server-eula"));
@@ -242,7 +244,17 @@ function PreparePage() {
242
244
  }, /*#__PURE__*/_react.default.createElement(_serverEula.default, {
243
245
  onContinue: handleLaunch,
244
246
  nextDisabled: !name.trim() || !description.trim() || launching,
245
- launching: launching
247
+ launching: launching,
248
+ checkKey: "server-eula-checked",
249
+ description: /*#__PURE__*/_react.default.createElement(_server.default, {
250
+ className: "eula-content"
251
+ }),
252
+ texts: {
253
+ listenName: t('license.footer'),
254
+ launchingText: t('common.launching'),
255
+ buttonNext: t('common.next'),
256
+ confirmTitle: t('license.title')
257
+ }
246
258
  }))), /*#__PURE__*/_react.default.createElement(_Connect.default, {
247
259
  open: showLaunchInstanceDialog,
248
260
  popup: true,
@@ -275,4 +287,4 @@ function PreparePage() {
275
287
  const Container = _styledComponents.default.div.withConfig({
276
288
  displayName: "prepare__Container",
277
289
  componentId: "sc-1ddofcz-0"
278
- })(["display:flex;flex-direction:column;width:100%;height:100%;.page-logo{display:flex;justify-content:center;margin-top:62px;", "{margin-top:48px;}}.inputs{display:flex;align-items:center;flex-direction:column;text-align:center;}.input-item{margin-top:24px;width:90%;max-width:450px;font-size:14px;input,textarea{font-size:14px;}}.botton-container{margin-top:24px;text-align:center;}"], props => props.theme.breakpoints.down('sm'));
290
+ })(["display:flex;flex-direction:column;width:100%;height:100%;.page-logo{display:flex;justify-content:center;margin-top:62px;", "{margin-top:48px;}}.inputs{display:flex;align-items:center;flex-direction:column;text-align:center;}.input-item{margin-top:24px;width:90%;max-width:450px;font-size:14px;input,textarea{font-size:14px;}}.botton-container{width:100%;margin:24px auto;max-width:450px;text-align:center;}"], props => props.theme.breakpoints.down('sm'));
package/lib/util.js CHANGED
@@ -22,7 +22,7 @@ const getLaunchBlockletUrl = (serverUrl, blockletMetaUrl, locale) => {
22
22
  return serverUrl;
23
23
  }
24
24
 
25
- let result = (0, _urlJoin.default)(serverUrl, "/launch-blocklet?blocklet_meta_url=".concat(encodeURIComponent(blockletMetaUrl)));
25
+ let result = (0, _urlJoin.default)(serverUrl, "/launch-blocklet/install?blocklet_meta_url=".concat(encodeURIComponent(blockletMetaUrl), "&from=launcher"));
26
26
 
27
27
  if (locale) {
28
28
  result += "&locale=".concat(locale);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blocklet/launcher-workflow",
3
- "version": "1.5.69",
3
+ "version": "1.5.70",
4
4
  "description": "Purchase components for Launcher UI",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -41,8 +41,8 @@
41
41
  "@arcblock/icons": "^1.16.49",
42
42
  "@arcblock/license": "^1.16.49",
43
43
  "@arcblock/ux": "^1.16.49",
44
- "@blocklet/launcher-constant": "1.5.69",
45
- "@blocklet/launcher-layout": "1.5.69",
44
+ "@blocklet/launcher-constant": "1.5.70",
45
+ "@blocklet/launcher-layout": "1.5.70",
46
46
  "@material-ui/core": "^4.12.3",
47
47
  "@material-ui/icons": "^4.11.2",
48
48
  "@material-ui/lab": "^4.0.0-alpha.60",
@@ -69,5 +69,5 @@
69
69
  "babel-plugin-inline-react-svg": "^2.0.1",
70
70
  "babel-plugin-styled-components": "^1.10.7"
71
71
  },
72
- "gitHead": "f61a739613c0d36042a6cbb0c06b77b817147ca7"
72
+ "gitHead": "6cd2aa6e4d3559047c68e2208b7ec12f31236930"
73
73
  }