@blocklet/launcher-workflow 2.0.7 → 2.0.9

package/lib/checkout.js

@@ -5,29 +5,31 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _urlJoin = _interopRequireDefault(require("url-join"));
-var _reactRouterDom = require("react-router-dom");
-var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _button = _interopRequireDefault(require("@blocklet/launcher-ux/lib/button"));
 var _constant = require("@blocklet/launcher-util/lib/constant");
+var _button = _interopRequireDefault(require("@blocklet/launcher-ux/lib/button"));
 var _useMobile = _interopRequireDefault(require("@blocklet/launcher-ux/lib/use-mobile"));
 var _payment = _interopRequireDefault(require("@did-pay/react/lib/payment"));
+var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Grid = _interopRequireDefault(require("@mui/material/Grid"));
 var _Skeleton = _interopRequireDefault(require("@mui/material/Skeleton"));
+var _reactRouterDom = require("react-router-dom");
+var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
+var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
+var _urlJoin = _interopRequireDefault(require("url-join"));
+var _confirm = _interopRequireDefault(require("@arcblock/ux/lib/Dialog/confirm"));
+var _agreement = _interopRequireDefault(require("./components/agreement"));
+var _checkbox = _interopRequireDefault(require("./components/checkbox"));
 var _layout = _interopRequireDefault(require("./components/layout"));
-var _header = _interopRequireDefault(require("./components/layout/header"));
 var _body = _interopRequireDefault(require("./components/layout/body"));
 var _footer = _interopRequireDefault(require("./components/layout/footer"));
-var _checkbox = _interopRequireDefault(require("./components/checkbox"));
+var _header = _interopRequireDefault(require("./components/layout/header"));
 var _locale = require("./contexts/locale");
 var _request = _interopRequireDefault(require("./contexts/request"));
-var _query = _interopRequireDefault(require("./hooks/query"));
 var _session = require("./contexts/session");
-var _util = require("./util");
-var _agreement = _interopRequireDefault(require("./components/agreement"));
 var _workflow = require("./contexts/workflow");
+var _query = _interopRequireDefault(require("./hooks/query"));
+var _util = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -81,10 +83,13 @@ function CheckoutPage() {
   const {
     session
   } = (0, _session.useSessionContext)();
-  const [paying, setPaying] = (0, _react.useState)(false);
   const [showAgreement, setShowAgreement] = (0, _react.useState)(false);
   const [showPayment, setShowPayment] = (0, _react.useState)(false);
   const [agree, setAgree] = (0, _react.useState)(false);
+  const [showPaidDialog, setShowPaidDialog] = (0, _useSetState.default)({
+    open: false,
+    nftId: ''
+  });
   const navigate = (0, _reactRouterDom.useNavigate)();
   const {
     create
@@ -98,7 +103,8 @@ function CheckoutPage() {
   } = (0, _useMobile.default)();
   const {
     routerPrefix,
-    didPayPrefix
+    didPayPrefix,
+    embed
   } = (0, _workflow.useWorkflowContext)();
   const api = create({
     baseURL: didPayPrefix
@@ -138,7 +144,6 @@ function CheckoutPage() {
       setShowPayment(true);
       return;
     }
-    setPaying(true);
     if (!(session !== null && session !== void 0 && session.user)) {
       const paymentTokenURL = (0, _urlJoin.default)(didPayPrefix, "/did/purchase/token?productId=".concat(planId, "&paymentMethodId=").concat(paymentMethod._id));
       const {
@@ -154,24 +159,32 @@ function CheckoutPage() {
       });
     }
   };
-  const handleCancelPay = () => setPaying(false);
+  const handleCancelPay = () => setShowPayment(false);
   const handlePaid = async _ref => {
     let {
       nftId
     } = _ref;
     const nftState = await (0, _util.getAsset)(window.blocklet.CHAIN_HOST, nftId);
     if ((nftState.tags || []).includes(_constant.NFT_TYPE_SERVERLESS)) {
+      if (!embed) {
+        setShowPaidDialog({
+          open: true,
+          nftId
+        });
+        setShowPayment(false);
+        return;
+      }
       searchParams.set('launchType', 'serverless');
     }
     navigate({
       pathname: (0, _urlJoin.default)(routerPrefix, "/launch/".concat(nftId)),
       search: searchParams.toString()
     });
-    setPaying(false);
+    setShowPayment(false);
   };
   const handlePayFailed = () => {
     // TODO: Toast 错误
-    setPaying(false);
+    setShowPayment(false);
   };
   const calculateTotalPayment = prices => {
     if (!paymentMethod) {
@@ -297,15 +310,15 @@ function CheckoutPage() {
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "actions",
         children: [isMobile && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
-          loading: paying,
+          loading: showPayment,
           className: "button-previous",
           variant: "outlined",
           onClick: () => navigate(-1),
           children: t('common.previous')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
-          loading: paying,
+          loading: showPayment,
           className: "button-pay",
-          disabled: paying || showPayment || !planId || !paymentMethod || !agree,
+          disabled: showPayment || !planId || !paymentMethod || !agree,
           variant: "contained",
           onClick: handlePay,
           children: t('common.pay')
@@ -319,6 +332,29 @@ function CheckoutPage() {
       onComplete: handlePaid,
       onFailed: handlePayFailed,
       onCancel: handleCancelPay
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
+      open: showPaidDialog.open,
+      disableEscapeKeyDown: true,
+      title: t('purchase.serverlessDialog.title'),
+      confirmButton: {
+        text: t('purchase.serverlessDialog.redirectToStoreButton')
+      },
+      PaperProps: {
+        style: {
+          maxWidth: 1200,
+          minWidth: isMobile ? undefined : 600
+        }
+      },
+      onCancel: () => setShowPaidDialog(false),
+      showCancelButton: false,
+      onConfirm: () => {
+        const url = new URL(_util.BLOCKLET_STORE_URL);
+        url.searchParams.set('launcher_nft_id', showPaidDialog.nftId);
+        window.location = url.href;
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        children: t('purchase.serverlessDialog.purchaseServerlessSuccess')
+      })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {
       open: showAgreement,
       title: t('common.agreement'),

package/lib/locales/en.js

@@ -5,7 +5,7 @@ module.exports = {
     agreeTo: 'Agree to the',
     agreement: 'Agreement',
     paymentMethod: 'Payment Method',
-    serverType: 'Blocklet Server Type',
+    serverType: 'Blocklet Space Type',
     paying: 'Paying',
     name: 'Name',
     description: 'Description',
@@ -30,12 +30,9 @@ module.exports = {
     footer: 'Agree to the EULA and continue'
   },
   prepare: {
-    title: 'Naming Blocklet Server',
-    subTitle: 'Please enter server name and description, they will appear in your server passport',
     serverless: {
-      title: 'Preparing Instance',
       preparing: 'Preparing...',
-      prepared: 'Instance ready, redirecting...',
+      prepared: 'The Blocklet Space is ready, redirecting...',
       prepareFailed: 'Prepare for instance failure!'
     }
   },
@@ -43,12 +40,12 @@ module.exports = {
     pageTitle: 'Prepare Space',
     invalidFftId: 'Invalid Purchase NFT ID',
     launchApp: 'Launch Application',
-    launching: 'Your Blocklet Server is being baked, please be patient, it usually takes about 5 minutes',
-    launched: 'Your Blocklet Server is up and running',
-    launchSuccess: 'Blocklet Server is successfully launched',
-    loadStatusFailed: 'Failed to load Blocklet Server status',
-    waitingForLaunching: 'Your Blocklet Server launch request is being processed, please be patient, it usually takes about 5 minutes',
-    accessServer: 'Access Blocklet Server',
+    launching: 'Your Blocklet Space is being baked, please be patient, it usually takes about 5 minutes',
+    launched: 'Your Blocklet Space is up and running',
+    launchSuccess: 'Blocklet Space is successfully launched',
+    loadStatusFailed: 'Failed to load Blocklet Space status',
+    waitingForLaunching: 'Your Blocklet Space launch request is being processed, please be patient, it usually takes about 5 minutes',
+    accessServer: 'Access Blocklet Space',
     waiting: {
       starting: 'Starting Server Instance',
       securing: 'Securing Server Network',
@@ -57,7 +54,7 @@ module.exports = {
       done: 'Server is Ready'
     },
     dialog: {
-      title: 'Launch Blocklet Server',
+      title: 'Launch Blocklet Space',
       scan: 'Scan following QRCode with your DID Wallet',
       confirm: 'Confirm on your DID Wallet',
       success: 'Launching'
@@ -65,7 +62,7 @@ module.exports = {
     error: {
       launchFailed: 'Launch Space Failed',
       launchFailedDescription: 'You can retry by clicking the button below',
-      notFound: 'No Blocklet Server being started',
+      notFound: 'No Blocklet Space being started',
       notFoundDescription: 'You can launch the Space by clicking the button below'
     }
   },
@@ -78,7 +75,7 @@ module.exports = {
   },
   redeem: {
     title: 'Redeem Space',
-    subTitle: 'Name the blocklet server you are going to redeem, the name will exist on server passport',
+    subTitle: 'Name the Blocklet Space you are going to redeem, the name will exist on server passport',
     dialog: {
       title: 'Redeem Space',
       scan: 'Scan the QR code below with your DID wallet to complete redeem',
@@ -88,8 +85,8 @@ module.exports = {
   },
   launchPrepare: {
     formError: {
-      nameExceed: 'Blocklet Server name cannot exceed {length}',
-      descriptionExceed: 'Blocklet Server description cannot exceed {length}'
+      nameExceed: 'Blocklet Space name cannot exceed {length}',
+      descriptionExceed: 'Blocklet Space description cannot exceed {length}'
     },
     error: {
       loginFirst: 'Please login first'
@@ -100,7 +97,7 @@ module.exports = {
     selectSpaceHint: 'Already have dedicated space? Click here to select >',
     morePlanPrompt: 'Flip the page to see more plans',
     dialog: {
-      title: 'Purchase Blocklet Server NFT',
+      title: 'Purchase Blocklet Space NFT',
       scan: 'Scan the QR code below with your DID wallet to complete purchase',
       confirm: 'Confirm on your DID Wallet',
       success: 'Purchase Success'

package/lib/locales/zh.js

@@ -5,7 +5,7 @@ module.exports = {
     agreeTo: '同意',
     agreement: '用户协议',
     paymentMethod: '支付方式',
-    serverType: '节点信息',
+    serverType: '空间信息',
     paying: '支付中',
     name: '名称',
     description: '描述',
@@ -26,47 +26,44 @@ module.exports = {
     space: '空间'
   },
   license: {
-    title: '节点用户协议',
+    title: '空间用户协议',
     footer: '同意协议并继续'
   },
   prepare: {
-    title: '命名节点',
-    subTitle: '请输入要创建的节点名称和描述，它们将显示在您的节点通行证中',
     serverless: {
-      title: '正在准备实例',
-      preparing: '准备实例中...',
-      prepared: '已准备好实例，跳转中...',
-      prepareFailed: '准备实例失败!'
+      preparing: '准备中...',
+      prepared: '已准备好应用空间，跳转中...',
+      prepareFailed: '准备空间失败!'
     }
   },
   launch: {
     pageTitle: '准备空间',
     invalidFftId: '无效的购买凭证',
     launchApp: '启动应用',
-    launching: '节点正在启动中, 大约需要 5 分钟',
-    launched: '节点已启动',
-    launchSuccess: '创建节点成功',
-    loadStatusFailed: '加载实例状态失败',
-    waitingForLaunching: '节点正在启动中，大约需要 5 分钟',
-    accessServer: '访问节点',
+    launching: '空间正在启动中, 大约需要 5 分钟',
+    launched: '空间已启动',
+    launchSuccess: '创建空间成功',
+    loadStatusFailed: '加载空间状态失败',
+    waitingForLaunching: '空间正在启动中，大约需要 5 分钟',
+    accessServer: '访问空间',
     waiting: {
-      starting: '启动节点实例',
-      securing: '确保节点的网络安全',
-      prepare: '准备好节点存储',
-      waiting: '等待节点就绪',
-      done: '节点已准备就绪'
+      starting: '启动空间',
+      securing: '确保空间的网络安全',
+      prepare: '准备好空间存储',
+      waiting: '等待空间就绪',
+      done: '空间已准备就绪'
     },
     dialog: {
-      title: '创建节点',
+      title: '创建空间',
       scan: '用您的 DID 钱包扫描下面的二维码',
       confirm: '在您的 DID 钱包上确认',
       success: '正在启动'
     },
     error: {
-      launchFailed: '节点空间失败',
+      launchFailed: '空间空间失败',
       launchFailedDescription: '您可以点击下面按钮重试',
       notFound: '没有正在启动的空间',
-      notFoundDescription: '您可以点击下面按钮启动节点'
+      notFoundDescription: '您可以点击下面按钮启动空间'
     }
   },
   start: {
@@ -77,10 +74,10 @@ module.exports = {
     }
   },
   redeem: {
-    title: '启动节点',
-    subTitle: '为你的节点起个名字吧，节点名字将会打印在节点通行证上',
+    title: '启动空间',
+    subTitle: '为你的空间起个名字吧，空间名字将会打印在空间通行证上',
     dialog: {
-      title: '兑换节点',
+      title: '兑换空间',
       scan: '用您的 DID 钱包扫描下面的二维码，提供 NFT',
       confirm: '在您的 DID 钱包上确认',
       success: '兑换成功'
@@ -88,8 +85,8 @@ module.exports = {
   },
   launchPrepare: {
     formError: {
-      nameExceed: '节点名称不能超过 {length}',
-      descriptionExceed: '节点描述不能超过 {length}'
+      nameExceed: '空间名称不能超过 {length}',
+      descriptionExceed: '空间描述不能超过 {length}'
     },
     error: {
       loginFirst: '请先登录'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -36,24 +36,24 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.5.14",
-    "@arcblock/icons": "^2.5.14",
-    "@arcblock/license": "^2.5.14",
-    "@arcblock/ux": "^2.5.14",
-    "@blocklet/launcher-layout": "2.0.7",
-    "@blocklet/launcher-util": "2.0.7",
-    "@blocklet/launcher-ux": "2.0.7",
-    "@did-pay/react": "^1.9.44",
+    "@arcblock/did-connect": "^2.5.15",
+    "@arcblock/icons": "^2.5.15",
+    "@arcblock/license": "^2.5.15",
+    "@arcblock/ux": "^2.5.15",
+    "@blocklet/launcher-layout": "2.0.9",
+    "@blocklet/launcher-util": "2.0.9",
+    "@blocklet/launcher-ux": "2.0.9",
+    "@did-pay/react": "^1.9.45",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@mui/icons-material": "^5.11.11",
-    "@mui/material": "^5.11.13",
-    "@ocap/util": "^1.18.62",
+    "@mui/material": "^5.11.14",
+    "@ocap/util": "^1.18.64",
     "@splidejs/react-splide": "^0.7.12",
     "@splidejs/splide": "^4.1.4",
     "@splidejs/splide-extension-grid": "^0.4.1",
     "@stripe/react-stripe-js": "^1.16.5",
-    "@stripe/stripe-js": "^1.50.0",
+    "@stripe/stripe-js": "^1.52.0",
     "axios": "^0.26.1",
     "flat": "^5.0.2",
     "js-cookie": "^3.0.1",
@@ -72,5 +72,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^2.0.2"
   },
-  "gitHead": "196e46ae137199f0846db77155784754deb323dc"
+  "gitHead": "32e02f98e10966f0f79d72f64bd85f1fc696b001"
 }