From 8cbc707f88736d9e6667d76998a26607a4c8cdbc Mon Sep 17 00:00:00 2001 From: sovanna Date: Mon, 2 Mar 2020 21:57:38 +0900 Subject: [PATCH] feat(issue21): Uses consistent name --- static/images/shop/graphic-03_BNC-TTL.svg | 596 ++++++++++++++++++ static/images/shop/graphic-03_Clocker.svg | 356 +++++++++++ static/images/shop/graphic-03_Grabber.svg | 216 +++++++ static/images/shop/graphic-03_HD68.svg | 220 +++++++ .../shop/graphic-03_IDC-BNC-adapter.svg | 444 +++++++++++++ static/images/shop/graphic-03_LVDS.svg | 546 ++++++++++++++++ static/images/shop/graphic-03_Mirny.svg | 331 ++++++++++ static/images/shop/graphic-03_SMA-TTL.svg | 479 ++++++++++++++ static/images/shop/graphic-03_Sampler.svg | 588 +++++++++++++++++ static/images/shop/graphic-03_Stabilizer.svg | 412 ++++++++++++ static/images/shop/graphic-03_Urukul.svg | 291 +++++++++ static/images/shop/graphic-03_Zotino.svg | 251 ++++++++ .../shop/graphic-03_kasli-with-backplane.svg | 432 +++++++++++++ static/images/shop/graphic-03_kasli.svg | 381 +++++++++++ static/js/shop.jsx | 14 +- static/js/shop_data.js | 82 ++- 16 files changed, 5608 insertions(+), 31 deletions(-) create mode 100644 static/images/shop/graphic-03_BNC-TTL.svg create mode 100644 static/images/shop/graphic-03_Clocker.svg create mode 100644 static/images/shop/graphic-03_Grabber.svg create mode 100644 static/images/shop/graphic-03_HD68.svg create mode 100644 static/images/shop/graphic-03_IDC-BNC-adapter.svg create mode 100644 static/images/shop/graphic-03_LVDS.svg create mode 100644 static/images/shop/graphic-03_Mirny.svg create mode 100644 static/images/shop/graphic-03_SMA-TTL.svg create mode 100644 static/images/shop/graphic-03_Sampler.svg create mode 100644 static/images/shop/graphic-03_Stabilizer.svg create mode 100644 static/images/shop/graphic-03_Urukul.svg create mode 100644 static/images/shop/graphic-03_Zotino.svg create mode 100644 static/images/shop/graphic-03_kasli-with-backplane.svg create mode 100644 static/images/shop/graphic-03_kasli.svg diff --git a/static/images/shop/graphic-03_BNC-TTL.svg b/static/images/shop/graphic-03_BNC-TTL.svg new file mode 100644 index 00000000..bb1b5ea1 --- /dev/null +++ b/static/images/shop/graphic-03_BNC-TTL.svg @@ -0,0 +1,596 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_Clocker.svg b/static/images/shop/graphic-03_Clocker.svg new file mode 100644 index 00000000..2b4cf5a9 --- /dev/null +++ b/static/images/shop/graphic-03_Clocker.svg @@ -0,0 +1,356 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_Grabber.svg b/static/images/shop/graphic-03_Grabber.svg new file mode 100644 index 00000000..52fae137 --- /dev/null +++ b/static/images/shop/graphic-03_Grabber.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_HD68.svg b/static/images/shop/graphic-03_HD68.svg new file mode 100644 index 00000000..4d771cd2 --- /dev/null +++ b/static/images/shop/graphic-03_HD68.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_IDC-BNC-adapter.svg b/static/images/shop/graphic-03_IDC-BNC-adapter.svg new file mode 100644 index 00000000..76cdf832 --- /dev/null +++ b/static/images/shop/graphic-03_IDC-BNC-adapter.svg @@ -0,0 +1,444 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_LVDS.svg b/static/images/shop/graphic-03_LVDS.svg new file mode 100644 index 00000000..8777e90a --- /dev/null +++ b/static/images/shop/graphic-03_LVDS.svg @@ -0,0 +1,546 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_Mirny.svg b/static/images/shop/graphic-03_Mirny.svg new file mode 100644 index 00000000..a5438c77 --- /dev/null +++ b/static/images/shop/graphic-03_Mirny.svg @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4456 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_SMA-TTL.svg b/static/images/shop/graphic-03_SMA-TTL.svg new file mode 100644 index 00000000..ae6ff499 --- /dev/null +++ b/static/images/shop/graphic-03_SMA-TTL.svg @@ -0,0 +1,479 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_Sampler.svg b/static/images/shop/graphic-03_Sampler.svg new file mode 100644 index 00000000..0873dded --- /dev/null +++ b/static/images/shop/graphic-03_Sampler.svg @@ -0,0 +1,588 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_Stabilizer.svg b/static/images/shop/graphic-03_Stabilizer.svg new file mode 100644 index 00000000..7b10c07c --- /dev/null +++ b/static/images/shop/graphic-03_Stabilizer.svg @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_Urukul.svg b/static/images/shop/graphic-03_Urukul.svg new file mode 100644 index 00000000..e010ca3d --- /dev/null +++ b/static/images/shop/graphic-03_Urukul.svg @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_Zotino.svg b/static/images/shop/graphic-03_Zotino.svg new file mode 100644 index 00000000..5f93256b --- /dev/null +++ b/static/images/shop/graphic-03_Zotino.svg @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_kasli-with-backplane.svg b/static/images/shop/graphic-03_kasli-with-backplane.svg new file mode 100644 index 00000000..c1754127 --- /dev/null +++ b/static/images/shop/graphic-03_kasli-with-backplane.svg @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/shop/graphic-03_kasli.svg b/static/images/shop/graphic-03_kasli.svg new file mode 100644 index 00000000..ce3896a4 --- /dev/null +++ b/static/images/shop/graphic-03_kasli.svg @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/js/shop.jsx b/static/js/shop.jsx index 6d64af81..27f5f928 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -193,6 +193,7 @@ class ProductItem extends React.PureComponent { id: PropTypes.string.isRequired, index: PropTypes.number.isRequired, name: PropTypes.string.isRequired, + name_codename: PropTypes.string, price: PropTypes.number.isRequired, currency: PropTypes.string.isRequired, image: PropTypes.string.isRequired, @@ -218,6 +219,7 @@ class ProductItem extends React.PureComponent { id, index, name, + name_codename, price, currency, image, @@ -236,7 +238,10 @@ class ProductItem extends React.PureComponent {
-

{name}

+

{name}

+ {name_codename ? ( +

{name_codename}

+ ) : null }
{`${currency} ${formatMoney(price)}`}
@@ -461,7 +466,7 @@ class ProductCartItem extends React.PureComponent { )}
-
{model.name}
+
{model.name_number}
-
{item.name}
+
{`${item.name_number} ${item.name}`}
@@ -1095,7 +1100,8 @@ class Backlog extends React.PureComponent { key={item.id} id={item.id} index={index} - name={item.name} + name={`${item.name_number} ${item.name}`} + name_codename={item.name_codename} price={item.price} currency={currency} image={`/images/${item.image}`} diff --git a/static/js/shop_data.js b/static/js/shop_data.js index 3f01e409..cf224a6b 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -40,9 +40,11 @@ const shop_data = { /* keys are also ids, avoid changing them */ 'kasli': { id: 'kasli', - name: 'Kasli', + name: 'Processor', + name_number: '1123', + name_codename: 'Kasli', price: 3600, - image: '/shop/graphic-02_kasli.svg', + 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.', @@ -95,9 +97,11 @@ const shop_data = { }, 'kasli-backplane': { id: 'kasli-backplane', - name: 'Kasli + BP adapter', + name: 'Processor', + name_number: '1123', + name_codename: 'Kasli', price: 3830, - image: '/shop/graphic-02_kasli-with-backplane.svg', + image: '/shop/graphic-03_kasli-with-backplane.svg', specs: [ 'Same as above, but with adapter that provides 4 additional EEM connectors', ], @@ -146,9 +150,11 @@ const shop_data = { }, 'bnc-dio': { id: 'bnc-dio', - name: 'BNC-DIO', + name: 'BNC-TTL', + name_number: '2118', + name_codename: '', price: 450, - image: '/shop/graphic-02_BNC-DIO.svg', + image: '/shop/graphic-03_BNC-TTL.svg', specs: [ 'Two banks of four digital channels each, with BNC connectors.', 'Each bank with individual ground isolation.', @@ -177,9 +183,11 @@ const shop_data = { }, 'sma-dio': { id: 'sma-dio', - name: 'SMA-DIO', + name: 'SMA-TTL', + name_number: '2128', + name_codename: '', price: 400, - image: '/shop/graphic-02_SMA-DIO.svg', + image: '/shop/graphic-03_SMA-TTL.svg', specs: [ 'Same as above, but with SMA connectors.' ], @@ -202,9 +210,11 @@ const shop_data = { }, 'rj45-dio': { id: 'rj45-dio', - name: 'RJ45-DIO', + name: 'LVDS-TTL', + name_number: '2245', + name_codename: '', price: 390, - image: '/shop/graphic-02_RJ45-DIO.svg', + image: '/shop/graphic-03_LVDS.svg', specs: [ 'Supplies 16 LVDS pairs via 4 front-panel RJ45 connectors.', 'Each RJ45 supplies 4 LVDS DIOs.', @@ -230,10 +240,12 @@ const shop_data = { }, }, 'urukul': { - id: 'urukul', - name: 'Urukul', + id: 'urukul', + name: 'DDS', + name_number: '4410', + name_codename: 'Urukul', price: 2350, - image: '/shop/graphic-02_Urukul.svg', + image: '/shop/graphic-03_Urukul.svg', specs: [ '4 channel 1GS/s DDS.', 'Output frequency (-3 dB): <1 to >400 MHz.', @@ -275,9 +287,11 @@ const shop_data = { }, 'zotino': { id: 'zotino', - name: 'Zotino', + name: 'DAC', + name_number: '5432', + name_codename: 'Zotino', price: 1600, - image: '/shop/graphic-02_zotino.svg', + image: '/shop/graphic-03_zotino.svg', specs: [ '32-channel DAC.', '16-bit resolution.', @@ -318,9 +332,11 @@ const shop_data = { }, 'idc-bnc-adapter': { id: 'idc-bnc-adapter', - name: 'IDC-BNC', + name: 'BNC-IDC', + name_number: '5518', + name_codename: '', price: 160, - image: '/shop/graphic-02_IDC-BNC-adapter.svg', + image: '/shop/graphic-03_IDC-BNC-adapter.svg', specs: [ 'Breaks out analog signals from Zotino or HD68-IDC to BNC connectors.', 'Each card provides 8 channels.', @@ -346,8 +362,10 @@ const shop_data = { 'hd68-idc-adapter': { id:'hd68-idc-adapter', name: 'HD68-IDC', + name_number: '5568', + name_codename: '', price: 150, - image: '/shop/graphic-02_HD68.svg', + image: '/shop/graphic-03_HD68.svg', specs: [ 'Connects an external HD68 cable to IDC-BNC, IDC-SMA or IDC-MCX cards.', ], @@ -383,9 +401,11 @@ const shop_data = { }, 'novo': { id: 'novo', - name: 'Novo', + name: 'Sampler', + name_number: '5108', + name_codename: '', price: 1600, - image: '/shop/graphic-02_Novo.svg', + image: '/shop/graphic-03_Sampler.svg', specs: [ '8-channel ADC.', '16-bit resolution.', @@ -420,9 +440,11 @@ const shop_data = { }, 'koster': { id: 'koster', - name: 'Koster', + name: 'Grabber', + name_number: '6302', + name_codename: '', price: 550, - image: '/shop/graphic-02_Koster.svg', + image: '/shop/graphic-03_Grabber.svg', specs: [ 'Camera input interface card.', 'Supports some EMCCD cameras.', @@ -456,8 +478,10 @@ const shop_data = { 'clocker': { id: 'clocker', name: 'Clocker', + name_number: '7210', + name_codename: '', price: 525, - image: '/shop/graphic-02_Clocker.svg', + image: '/shop/graphic-03_Clocker.svg', specs: [ 'Distribute a low jitter clock signal among cards.', '2 inputs.', @@ -490,9 +514,11 @@ const shop_data = { }, 'stabilizer': { id: 'stabilizer', - name: 'Stabilizer', + name: 'DSP', + name_number: '8452', + name_codename: 'Stabilizer', price: 2000, - image: '/shop/graphic-02_Stabilizer.svg', + image: '/shop/graphic-03_Stabilizer.svg', specs: [ 'CPU-based dual-channel fast servo.', '400MHz STM32H743ZIT6.', @@ -512,9 +538,11 @@ const shop_data = { }, 'mirny': { id: 'mirny', - name: 'Mirny', + name: 'Synthesizer', + name_number: '4456 ', + name_codename: 'Mirny', price: 2660, - image: '/shop/graphic-02_Mirny.svg', + image: '/shop/graphic-03_Mirny.svg', specs: [ '4-channel Wide-band PLL/VCO-based microwave frequency synthesiser.', '53 MHz to >4 GHz.',