@blocklet/launcher-workflow 2.2.19 → 2.2.21
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/es/purchase.js +5 -2
- package/lib/checkout.js +1 -2
- package/lib/components/layout/body.js +1 -2
- package/lib/components/plan.js +1 -2
- package/lib/locales/en.js +2 -3
- package/lib/locales/index.js +2 -3
- package/lib/locales/zh.js +2 -3
- package/lib/purchase.js +6 -4
- package/lib/util.js +3 -5
- package/package.json +17 -17
package/es/purchase.js
CHANGED
|
@@ -341,14 +341,17 @@ function PurchasePage({
|
|
|
341
341
|
loginToken,
|
|
342
342
|
nftId,
|
|
343
343
|
type,
|
|
344
|
-
sessionId
|
|
344
|
+
sessionId,
|
|
345
|
+
sourceAppPid
|
|
345
346
|
}) => {
|
|
346
347
|
if (type === NFT_TYPE_SERVERLESS) {
|
|
347
348
|
params.set('launchType', 'serverless');
|
|
348
349
|
}
|
|
349
350
|
if (loginToken) {
|
|
350
351
|
storage.setToken(decrypt(loginToken));
|
|
351
|
-
|
|
352
|
+
if (sourceAppPid) {
|
|
353
|
+
await session.loginFederatedMaster();
|
|
354
|
+
}
|
|
352
355
|
session.refresh();
|
|
353
356
|
}
|
|
354
357
|
if (sessionId) {
|
package/lib/checkout.js
CHANGED
|
@@ -466,5 +466,4 @@ CheckoutPage.defaultProps = {
|
|
|
466
466
|
blocklet: null
|
|
467
467
|
};
|
|
468
468
|
const Container = (0, _styled.default)(_layout.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .header {\n font-weight: bolder;\n font-size: 1.2em;\n }\n\n .divider {\n margin-top: 20px;\n border: 1.2px solid #f6f6f6;\n }\n\n .skeleton {\n height: 64px;\n }\n\n .space {\n margin-top: 18px;\n }\n\n .total-order {\n display: flex;\n justify-content: space-between;\n align-items: center;\n font-weight: bolder;\n }\n\n .total-payment {\n display: flex;\n justify-content: space-between;\n align-items: center;\n color: ", ";\n font-size: 22px;\n font-weight: bolder;\n }\n\n .details {\n display: flex;\n justify-content: space-between;\n align-items: center;\n height: 40px;\n\n .basic {\n display: flex;\n height: 40px;\n\n .basic-info {\n display: flex;\n flex-direction: column;\n justify-content: space-between;\n margin-left: 8px;\n\n .title {\n font-weight: bolder;\n }\n\n .sub-title {\n color: grey;\n font-size: 0.8em;\n }\n }\n }\n\n .period {\n display: flex;\n align-items: center;\n\n .info-icon {\n color: grey;\n margin-left: 8px;\n }\n }\n }\n\n .payment-method {\n background-color: #fbfbfb;\n padding: 18px;\n\n .payment-method__title {\n color: #9397a1;\n }\n\n .payment-method__list {\n margin-top: 8px;\n }\n }\n\n .footer {\n display: flex;\n align-items: center;\n justify-content: ", ";\n\n .agreement {\n .agreement-label {\n margin-left: 4px;\n color: ", ";\n text-decoration: underline;\n }\n }\n\n @media (min-width: ", ") {\n .actions {\n .button-pay {\n width: 200px;\n }\n }\n }\n\n @media (max-width: ", ") {\n flex-direction: column;\n align-items: center;\n\n .actions {\n display: flex;\n justify-content: space-between;\n width: 100%;\n margin-top: 20px;\n\n & > button {\n width: 48%;\n }\n }\n }\n }\n"])), props => props.theme.palette.primary.main, props => props.enableBlockletAgreement ? 'space-between' : 'flex-end', props => props.theme.palette.primary.main, props => props.mobileSize, props => props.mobileSize);
|
|
469
|
-
var _default = CheckoutPage;
|
|
470
|
-
exports.default = _default;
|
|
469
|
+
var _default = exports.default = CheckoutPage;
|
|
@@ -37,5 +37,4 @@ Body.propTypes = {
|
|
|
37
37
|
children: _propTypes.default.any.isRequired
|
|
38
38
|
};
|
|
39
39
|
const Container = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n flex: 1;\n\n @media (min-width: 960px) {\n margin-top: 32px;\n }\n\n @media (max-width: 960px) {\n margin-top: 16px;\n }\n\n .page-body-article {\n width: 100%;\n height: 100%;\n overflow-y: auto;\n display: flex;\n flex-direction: column;\n gap: 16px;\n }\n"])));
|
|
40
|
-
var _default = Body;
|
|
41
|
-
exports.default = _default;
|
|
40
|
+
var _default = exports.default = Body;
|
package/lib/components/plan.js
CHANGED
package/lib/locales/en.js
CHANGED
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var _default = {
|
|
7
|
+
var _default = exports.default = {
|
|
8
8
|
common: {
|
|
9
9
|
error: 'Oops',
|
|
10
10
|
agreeTo: 'Agree to the',
|
|
@@ -138,5 +138,4 @@ var _default = {
|
|
|
138
138
|
},
|
|
139
139
|
agreement: '{name} User Agreement'
|
|
140
140
|
}
|
|
141
|
-
};
|
|
142
|
-
exports.default = _default;
|
|
141
|
+
};
|
package/lib/locales/index.js
CHANGED
|
@@ -10,8 +10,7 @@ var _zh = _interopRequireDefault(require("./zh"));
|
|
|
10
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
11
|
/* eslint-disable import/prefer-default-export */
|
|
12
12
|
|
|
13
|
-
const translations = {
|
|
13
|
+
const translations = exports.translations = {
|
|
14
14
|
en: (0, _flat.default)(_en.default),
|
|
15
15
|
zh: (0, _flat.default)(_zh.default)
|
|
16
|
-
};
|
|
17
|
-
exports.translations = translations;
|
|
16
|
+
};
|
package/lib/locales/zh.js
CHANGED
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var _default = {
|
|
7
|
+
var _default = exports.default = {
|
|
8
8
|
common: {
|
|
9
9
|
error: '哎呀',
|
|
10
10
|
agreeTo: '同意',
|
|
@@ -137,5 +137,4 @@ var _default = {
|
|
|
137
137
|
},
|
|
138
138
|
agreement: '{name} 用户协议'
|
|
139
139
|
}
|
|
140
|
-
};
|
|
141
|
-
exports.default = _default;
|
|
140
|
+
};
|
package/lib/purchase.js
CHANGED
|
@@ -360,14 +360,17 @@ function PurchasePage(_ref) {
|
|
|
360
360
|
loginToken,
|
|
361
361
|
nftId,
|
|
362
362
|
type,
|
|
363
|
-
sessionId
|
|
363
|
+
sessionId,
|
|
364
|
+
sourceAppPid
|
|
364
365
|
} = _ref3;
|
|
365
366
|
if (type === _constant.NFT_TYPE_SERVERLESS) {
|
|
366
367
|
params.set('launchType', 'serverless');
|
|
367
368
|
}
|
|
368
369
|
if (loginToken) {
|
|
369
370
|
storage.setToken(decrypt(loginToken));
|
|
370
|
-
|
|
371
|
+
if (sourceAppPid) {
|
|
372
|
+
await session.loginFederatedMaster();
|
|
373
|
+
}
|
|
371
374
|
session.refresh();
|
|
372
375
|
}
|
|
373
376
|
if (sessionId) {
|
|
@@ -554,5 +557,4 @@ PurchasePage.propTypes = {
|
|
|
554
557
|
PurchasePage.defaultProps = {
|
|
555
558
|
disableBack: false
|
|
556
559
|
};
|
|
557
|
-
var _default = PurchasePage;
|
|
558
|
-
exports.default = _default;
|
|
560
|
+
var _default = exports.default = PurchasePage;
|
package/lib/util.js
CHANGED
|
@@ -13,8 +13,7 @@ var _lodash3 = _interopRequireDefault(require("lodash.pick"));
|
|
|
13
13
|
var _axios = _interopRequireDefault(require("axios"));
|
|
14
14
|
var _util = require("@blocklet/launcher-ux/lib/util");
|
|
15
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
|
-
const BLOCKLET_STORE_URL = (0, _lodash.default)(window, 'blocklet.LAUNCHER_BLOCKLET_STORE_URL') || 'https://store.blocklet.dev';
|
|
17
|
-
exports.BLOCKLET_STORE_URL = BLOCKLET_STORE_URL;
|
|
16
|
+
const BLOCKLET_STORE_URL = exports.BLOCKLET_STORE_URL = (0, _lodash.default)(window, 'blocklet.LAUNCHER_BLOCKLET_STORE_URL') || 'https://store.blocklet.dev';
|
|
18
17
|
function getBlockletMetaUrl(registry, did) {
|
|
19
18
|
return (0, _urlJoin.default)(registry, "/api/blocklets/".concat(did, "/blocklet.json?source=webapp"));
|
|
20
19
|
}
|
|
@@ -116,7 +115,7 @@ const getPrice = (prices, providerName) => {
|
|
|
116
115
|
return formatPrice(price, providerName);
|
|
117
116
|
};
|
|
118
117
|
exports.getPrice = getPrice;
|
|
119
|
-
const launchSession = {
|
|
118
|
+
const launchSession = exports.launchSession = {
|
|
120
119
|
load: function load(api, prefix, sessionId, url) {
|
|
121
120
|
let done = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _lodash2.default;
|
|
122
121
|
api.get((0, _urlJoin.default)(prefix, "/launches/".concat(sessionId))).then(result => {
|
|
@@ -165,5 +164,4 @@ const launchSession = {
|
|
|
165
164
|
done(err);
|
|
166
165
|
});
|
|
167
166
|
}
|
|
168
|
-
};
|
|
169
|
-
exports.launchSession = launchSession;
|
|
167
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blocklet/launcher-workflow",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.21",
|
|
4
4
|
"description": "Purchase components for Launcher UI",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -41,20 +41,20 @@
|
|
|
41
41
|
"react": ">=18.1.0"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@arcblock/did-connect": "^2.7.
|
|
45
|
-
"@arcblock/icons": "^2.7.
|
|
46
|
-
"@arcblock/license": "^2.7.
|
|
47
|
-
"@arcblock/react-hooks": "^2.7.
|
|
48
|
-
"@arcblock/ux": "^2.7.
|
|
49
|
-
"@blocklet/launcher-layout": "2.2.
|
|
50
|
-
"@blocklet/launcher-util": "2.2.
|
|
51
|
-
"@blocklet/launcher-ux": "2.2.
|
|
52
|
-
"@blocklet/payment": "^1.13.
|
|
44
|
+
"@arcblock/did-connect": "^2.7.27",
|
|
45
|
+
"@arcblock/icons": "^2.7.27",
|
|
46
|
+
"@arcblock/license": "^2.7.27",
|
|
47
|
+
"@arcblock/react-hooks": "^2.7.27",
|
|
48
|
+
"@arcblock/ux": "^2.7.27",
|
|
49
|
+
"@blocklet/launcher-layout": "2.2.21",
|
|
50
|
+
"@blocklet/launcher-util": "2.2.21",
|
|
51
|
+
"@blocklet/launcher-ux": "2.2.21",
|
|
52
|
+
"@blocklet/payment": "^1.13.14",
|
|
53
53
|
"@emotion/react": "^11.11.1",
|
|
54
54
|
"@emotion/styled": "^11.11.0",
|
|
55
|
-
"@mui/icons-material": "^5.14.
|
|
56
|
-
"@mui/material": "^5.14.
|
|
57
|
-
"@ocap/util": "^1.18.
|
|
55
|
+
"@mui/icons-material": "^5.14.12",
|
|
56
|
+
"@mui/material": "^5.14.12",
|
|
57
|
+
"@ocap/util": "^1.18.92",
|
|
58
58
|
"@splidejs/react-splide": "^0.7.12",
|
|
59
59
|
"@splidejs/splide": "^4.1.4",
|
|
60
60
|
"@splidejs/splide-extension-grid": "^0.4.1",
|
|
@@ -75,12 +75,12 @@
|
|
|
75
75
|
"url-join": "^4.0.1"
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|
|
78
|
-
"@babel/cli": "^7.
|
|
79
|
-
"@babel/core": "^7.
|
|
78
|
+
"@babel/cli": "^7.23.0",
|
|
79
|
+
"@babel/core": "^7.23.0",
|
|
80
80
|
"@babel/preset-env": "^7.22.20",
|
|
81
81
|
"@babel/preset-react": "^7.22.15",
|
|
82
82
|
"babel-plugin-inline-react-svg": "^2.0.2",
|
|
83
|
-
"glob": "^10.3.
|
|
83
|
+
"glob": "^10.3.10",
|
|
84
84
|
"jest": "^27.5.1"
|
|
85
85
|
},
|
|
86
86
|
"exports": {
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
"require": "./lib/locales/index.js"
|
|
102
102
|
}
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "53193b8e4f05e1f47962493b28ab4edb14a5d6b3"
|
|
105
105
|
}
|