Compare commits

..

38 Commits

Author SHA1 Message Date
Egor Savkin d3a5ee8a3d Add edge counter for the options to TTL
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 7e7905e522 Add HD68 cable options and fix first small cards options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 67a6e772f3 Leave opt-out option only to the first kasli
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 893ca829e1 Change ttl groups to banks and remove green leaf
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 9da249aa95 Slightly promote new functionality and consider mono_eem modes on sampler/urukul for suservo
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 44bed4a4e1 Update shop bundle
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 0126a663ea Fix cards state being not updated on touchables
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 2fee470e11 Fix not-disappearing warnings and clocker clock slots
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 4c584efdf3 Small duplication removal
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 631e1dd6b1 Remove redundant notifications about connectors and AD9910
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 248fd9782e Integrate clock/slots configuration into the calculator
Also adjust sizes

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin eddf408f26 Fixed initial display of empty options in the options summary
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 9cdf563d26 Still fixing the bug
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 4838f50b60 Fix scroll issue and found another bug
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 3d8f82fcd6 Add groups of options and some fixes for long lists of options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 65f896f517 Add external data for use per every card. Apply it for TTL and Suservo
Signed-off-by: esavkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin ba054ee2a2 Fix tooltip showed out when options overlay was closed
Signed-off-by: esavkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin c95ce76b00 Use tips on more cards
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin c57a27f762 Add tooltips with hints for the user
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 55492c5090 Add icons to options titles
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin a6994416d0 Remove MAC from options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin a92ec4289c Reposition summary popup relative to icon respective to window width, hide on scroll
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin fa406b7d49 Hide popups on clicking outside of them
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 8483d101d6 Update bundle file
Add custom options to more cards

Minor design adjustments: add margin-left to icon and optimize the icon

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 45c5b388aa Add popover for cart summary with options data
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin e5c3c0bada Make overlay appear on button click
And fix options absense for non-carrier cards

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin ef64c3ce6c Make the design more compact
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin adac15f803 Adjust styles
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 019a6f384b Fix add of useless options to JSON
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 02f8e916a7 Add switchline compact design
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 577fc6520c Add switch and line
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 0e556c270a Fix JSON shop load
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin a6f131e781 Make it update state
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 2eb2c37178 Add basic demo example
Kinda works, but buggy

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin da74bb1d8d Add Shuttler to the shop (#98)
Closes #95

Reviewed-on: #98
Co-authored-by: Egor Savkin <es@m-labs.hk>
Co-committed-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:01:26 +08:00
Sebastien Bourdeauducq 320665c3bd cleanup 2023-10-10 17:53:25 +08:00
Sebastien Bourdeauducq a6faaecb8b clarify external PSU 2023-10-10 17:51:18 +08:00
Egor Savkin 393fc8e3c9 Add EEM power module to the shop
Co-authored-by: Egor Savkin <es@m-labs.hk>
Co-committed-by: Egor Savkin <es@m-labs.hk>
2023-10-10 17:34:52 +08:00
5 changed files with 79 additions and 12 deletions

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 38 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 34 KiB

File diff suppressed because one or more lines are too long

View File

@ -86,10 +86,12 @@ const copy = (
) => {
const destClone = Array.from(destination.items);
destClone.splice(droppableDestination.index, 0, {
...model[draggableSource],
id: uuidv4(),
});
destClone.splice(droppableDestination.index, 0, ...draggableSource.map((dragged_item, _) => {
return {
...model[dragged_item],
id: uuidv4(),
}
}));
return destClone;
};
@ -1679,10 +1681,12 @@ class Shop extends React.PureComponent {
}
componentDidMount() {
// index 0 is a Kasli, we place it as a default conf on the crate.
const source = {
droppableId: 'backlog',
index: 0,
indexes: [
itemsUnfoldedList.findIndex(element => element === "eem_pwr_mod"),
itemsUnfoldedList.findIndex(element => element === "kasli")
],
};
const destination = {
droppableId: 'cart',
@ -2006,7 +2010,14 @@ class Shop extends React.PureComponent {
source,
destination,
} = result;
let dragged_item = itemsUnfoldedList[source.index];
let dragged_items = [];
if (source.indexes) {
source.indexes.forEach((card_index, _) => {
dragged_items.push(itemsUnfoldedList[card_index]);
})
} else if (source.index) {
dragged_items.push(itemsUnfoldedList[source.index]);
}
if (!destination) {
@ -2049,7 +2060,7 @@ class Shop extends React.PureComponent {
this.state.items,
this.state.columns[source.droppableId],
this.state.columns[destination.droppableId],
dragged_item,
dragged_items,
destination,
),
},

View File

@ -1116,6 +1116,30 @@ const shop_data = {
slotOccupied: 1,
clockOccupied: 0
},
'shuttler': {
id: 'shuttler',
name: 'DAC',
name_number: '5716',
name_codename: 'Shuttler',
price: 8500,
image: '/shop/graphic-03_Shuttler.svg',
specs: [
'16-ch, 125 MSPS DAC in FMC form factor, with remote analog front end board.',
'High dc resolution (~18 bits) for trap electrode bias.',
'~15 MHz analog bandwidth.',
'AD9117 DACs (14 bits @ 125 MSPS, <1 LSB DNL).',
'Differential analog output (+/-5 V differential) via COTS connector with shielded impedance-matched pairs (mini-SAS HD).',
'Included remote analog front-end (AFE) board converts differential signals on mini-SAS HD cables to single-ended, with additional gain/filtering as desired.',
],
size: 'big',
type: null,
hp: 8,
nbrSlotMin: 0,
nbrSlotMax: 0,
nbrClockMax: 0,
slotOccupied: 0,
clockOccupied: 0,
},
'pounder': {
id: 'pounder',
name: 'PDH lock generator',
@ -1139,7 +1163,34 @@ const shop_data = {
nbrClockMax: 0,
slotOccupied: 1,
clockOccupied: 1,
}
},
'eem_pwr_mod': {
id: 'eem_pwr_mod',
name: 'EEM AC Power Module',
name_number: '1106',
name_codename: '',
price: 750,
image: '/shop/graphic-03_eem_pwr_mod.svg',
specs: [
"EEM AC power module.",
"400W with forced cooling (25CFM), 200W with free air convection.",
"Universal input.",
"IEC inlet on front panel.",
"EMC filter.",
"LED current indicator.",
"6 rear side outputs.",
"Mains circuit protected with steel cover.",
"Optional - external power brick will be shipped free of charge if removed."
],
size: 'big',
type: null,
hp: 8,
nbrSlotMin: 0,
nbrSlotMax: 0,
nbrClockMax: 0,
slotOccupied: 0,
clockOccupied: 0,
},
},
columns: {
@ -1174,7 +1225,8 @@ const shop_data = {
itemIds: [
'zotino',
'fastino',
'novo']},
'novo',
'shuttler']},
{ name: 'Adapters',
itemIds: [
'idc-bnc-adapter',
@ -1187,7 +1239,9 @@ const shop_data = {
'koster',
'stabilizer',
'pounder',
'thermostat-eem']}
'thermostat-eem',
'eem_pwr_mod',
]}
],
},