From 3df4c0c9c6fa4be5061acff1303dcdeecacb93ab Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 22 Mar 2021 18:30:56 +0800 Subject: [PATCH] move shop to Kasli 2.0 --- .../shop/graphic-03_kasli-with-backplane.svg | 432 ------ static/images/shop/graphic-03_kasli.svg | 1257 ++++++++++++----- static/js/shop.jsx | 9 +- static/js/shop.min.js | 7 +- static/js/shop_data.js | 68 +- 5 files changed, 890 insertions(+), 883 deletions(-) delete mode 100644 static/images/shop/graphic-03_kasli-with-backplane.svg diff --git a/static/images/shop/graphic-03_kasli-with-backplane.svg b/static/images/shop/graphic-03_kasli-with-backplane.svg deleted file mode 100644 index c175412..0000000 --- a/static/images/shop/graphic-03_kasli-with-backplane.svg +++ /dev/null @@ -1,432 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/images/shop/graphic-03_kasli.svg b/static/images/shop/graphic-03_kasli.svg index ce3896a..060a9ea 100644 --- a/static/images/shop/graphic-03_kasli.svg +++ b/static/images/shop/graphic-03_kasli.svg @@ -1,381 +1,876 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/js/shop.jsx b/static/js/shop.jsx index 7296616..2406e83 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -355,7 +355,7 @@ class Layout extends React.PureComponent {

Input the JSON description below. Should be something like:
- {JSON.stringify({"items":[{"pn":"1123"},{"pn":"2118"},{"pn":"2118"},{"pn":"2128"}],"type":"desktop"})} + {JSON.stringify({"items":[{"pn":"1124"},{"pn":"2118"},{"pn":"2118"},{"pn":"2128"}],"type":"desktop"})}

@@ -619,7 +619,6 @@ class ProductCartItem extends React.PureComponent { if (model.showProgress && data) { switch(model.type) { case 'kasli': - case 'kasli-backplane': render_progress = (

{`${data.nbrCurrentSlot}/${model.nbrSlotMax} EEM connectors used`}

@@ -2007,7 +2006,7 @@ class Shop extends React.PureComponent { // check the number of EEM connectors available for all Kasli const idxK = itemsCloned.reduce((prev, next, i) => { - if (next.type === 'kasli' || next.type === 'kasli-backplane') { + if (next.type === 'kasli') { prev.push(i); } return prev; @@ -2081,7 +2080,7 @@ class Shop extends React.PureComponent { if (itemsCloned.length > (idx + 1)) { const ddkali = itemsCloned[idx + 1]; - if (ddkali.type === 'kasli' || ddkali.type === 'kasli-backplane') { + if (ddkali.type === 'kasli') { rules[ddkali.rules.follow.type] = {...ddkali.rules.follow}; } } @@ -2110,7 +2109,7 @@ class Shop extends React.PureComponent { // check number of clock connector available const idxC = itemsCloned.reduce((prev, next, i) => { - if (next.type === 'kasli' || next.type === 'kasli-backplane' || next.type === 'clocker') { + if (next.type === 'kasli' || next.type === 'clocker') { prev.push(i); } return prev; diff --git a/static/js/shop.min.js b/static/js/shop.min.js index 7644615..6a97b03 100644 --- a/static/js/shop.min.js +++ b/static/js/shop.min.js @@ -682,7 +682,6 @@ var ProductCartItem = /*#__PURE__*/function (_React$PureComponent3) { if (model.showProgress && data) { switch (model.type) { case 'kasli': - case 'kasli-backplane': render_progress = /*#__PURE__*/React.createElement("div", { className: "k-popup-connectors" }, /*#__PURE__*/React.createElement("p", null, "".concat(data.nbrCurrentSlot, "/").concat(model.nbrSlotMax, " EEM connectors used")), /*#__PURE__*/React.createElement("p", null, "".concat(data.nbrCurrentClock, "/").concat(model.nbrClockMax, " Clock connectors used"))); @@ -2017,7 +2016,7 @@ var Shop = /*#__PURE__*/function (_React$PureComponent12) { var idxK = itemsCloned.reduce(function (prev, next, i) { - if (next.type === 'kasli' || next.type === 'kasli-backplane') { + if (next.type === 'kasli') { prev.push(i); } @@ -2097,7 +2096,7 @@ var Shop = /*#__PURE__*/function (_React$PureComponent12) { if (itemsCloned.length > idx + 1) { var ddkali = itemsCloned[idx + 1]; - if (ddkali.type === 'kasli' || ddkali.type === 'kasli-backplane') { + if (ddkali.type === 'kasli') { rules[ddkali.rules.follow.type] = _objectSpread({}, ddkali.rules.follow); } } @@ -2128,7 +2127,7 @@ var Shop = /*#__PURE__*/function (_React$PureComponent12) { var idxC = itemsCloned.reduce(function (prev, next, i) { - if (next.type === 'kasli' || next.type === 'kasli-backplane' || next.type === 'clocker') { + if (next.type === 'kasli' || next.type === 'clocker') { prev.push(i); } diff --git a/static/js/shop_data.js b/static/js/shop_data.js index c1e15cb..561fa70 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -43,14 +43,14 @@ const shop_data = { 'kasli': { id: 'kasli', name: 'Carrier', - name_number: '1123', - name_codename: 'Kasli', + name_number: '1124', + name_codename: 'Kasli 2.0', price: 3600, image: '/shop/graphic-03_kasli.svg', specs: [ 'FPGA core device, runs ARTIQ kernels, controls the EEMs.', - '3 SFP 6GB/s slots for Ethernet or DRTIO.', - '8 EEM connectors on board.', + '4 SFP 6GB/s slots for Ethernet or DRTIO.', + '12 EEM connectors on board.', '4 MMCX clock outputs.', 'Price includes bitstream generation, flashing, testing, and firmware updates for 1 year (USD 1,400.00).', ], @@ -58,7 +58,7 @@ const shop_data = { type: 'kasli', hp: 8, nbrSlotMin: 0, - nbrSlotMax: 8, + nbrSlotMax: 12, nbrCurrentSlot: 0, nbrClockMax: 4, nbrCurrentClock: 0, @@ -69,13 +69,13 @@ const shop_data = { type: 'kasli-max-slot', icon: '/shop/icon-reminder.svg', name: 'Kasli', - message: 'Add a backplane adapter to extend EEM connectors to 12 at an extra charge.', + message: 'Insufficient EEM connectors.', }, maxSlotWarning: { type: 'kasli-max-slot-warning', icon: '/shop/icon-warning.svg', name: 'Kasli', - message: 'Insufficient EEM connectors.', + message: 'Insufficient EEM connectors', }, maxClock: { type: 'kasli-max-clock', @@ -97,59 +97,6 @@ const shop_data = { }, }, }, - 'kasli-backplane': { - id: 'kasli-backplane', - name: 'Carrier', - name_number: '1123b', - name_codename: 'Kasli + BP adapter', - price: 3830, - image: '/shop/graphic-03_kasli-with-backplane.svg', - specs: [ - 'Same as above, but with adapter that provides 4 additional EEM connectors', - ], - size: 'big', - type: 'kasli-backplane', - hp: 8, - nbrSlotMin: 0, - nbrSlotMax: 12, - nbrCurrentSlot: 0, - nbrClockMax: 4, - nbrCurrentClock: 0, - slotOccupied: 1, - clockOccupied: 0, - rules: { - maxSlot: { - type: 'kasli-wb-max-slot', - icon: '/shop/icon-reminder.svg', - name: 'Kasli w/backplane', - message: 'Insufficient EEM connectors.', - }, - maxSlotWarning: { - type: 'kasli-wb-max-slot-warning', - icon: '/shop/icon-warning.svg', - name: 'Kasli', - message: 'Insufficient EEM connectors', - }, - maxClock: { - type: 'kasli-wb-max-clock', - icon: '/shop/icon-reminder.svg', - name: 'Kasli w/backplane', - message: 'Insufficient clock connectors. Kasli has at most 4 clock connections.', - }, - maxClockWarning: { - type: 'kasli-wb-max-clock-warning', - icon: '/shop/icon-warning.svg', - name: 'Kasli', - message: 'Insufficient clock connectors.', - }, - follow: { - type: 'kasli-wb-follow', - icon: '/shop/icon-reminder.svg', - name: 'Kasli w/backplane', - message: 'Due to wiring constraints, a Kasli can only connect to EEM cards immediately at its right, without crossing another Kasli.', - }, - }, - }, 'bnc-dio': { id: 'bnc-dio', name: 'BNC-TTL', @@ -642,7 +589,6 @@ const shop_data = { /* itemIds define items order - change order to suit your need */ itemIds: [ 'kasli', - 'kasli-backplane', 'bnc-dio', 'sma-dio', 'rj45-dio',