Compare commits

..

34 Commits

Author SHA1 Message Date
Egor Savkin 5b5a2cf230 Add edge counter for the options to TTL
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-28 12:09:53 +08:00
Egor Savkin a207d4662f Add HD68 cable options and fix first small cards options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-27 17:39:26 +08:00
Egor Savkin 9f5fb7606e Leave opt-out option only to the first kasli
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-26 14:44:39 +08:00
Egor Savkin b412fae177 Change ttl groups to banks and remove green leaf
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 17:49:01 +08:00
Egor Savkin b4989500ec Slightly promote new functionality and consider mono_eem modes on sampler/urukul for suservo
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 1244ac1775 Update shop bundle
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 0762572956 Fix cards state being not updated on touchables
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin a8e3bae08e Fix not-disappearing warnings and clocker clock slots
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 11aac2323d Small duplication removal
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin a705feebc2 Remove redundant notifications about connectors and AD9910
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 718a4509f4 Integrate clock/slots configuration into the calculator
Also adjust sizes

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 1b1736ea15 Fixed initial display of empty options in the options summary
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 264e583d82 Still fixing the bug
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 3a6dfef9b7 Fix scroll issue and found another bug
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin c2cf323cf4 Add groups of options and some fixes for long lists of options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 4b5ea7c1db Add external data for use per every card. Apply it for TTL and Suservo
Signed-off-by: esavkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 832a538c22 Fix tooltip showed out when options overlay was closed
Signed-off-by: esavkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 3980ece5b5 Use tips on more cards
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 4e6447c3d2 Add tooltips with hints for the user
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin a4e7fce0f4 Add icons to options titles
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 9b650b4a2c Remove MAC from options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 3454a1b4cd Reposition summary popup relative to icon respective to window width, hide on scroll
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 22372116ad Hide popups on clicking outside of them
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin a6a6d758e9 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-09-25 16:47:40 +08:00
Egor Savkin 712d8664f1 Add popover for cart summary with options data
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin bd7e39927d Make overlay appear on button click
And fix options absense for non-carrier cards

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin b2250680c9 Make the design more compact
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 2eb4bc99dd Adjust styles
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 759e41681f Fix add of useless options to JSON
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 4c64879fbc Add switchline compact design
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 6e54da2c71 Add switch and line
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 47d9af400d Fix JSON shop load
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin 7b394c8203 Make it update state
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:40 +08:00
Egor Savkin ae23c18b0c Add basic demo example
Kinda works, but buggy

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-09-25 16:47:39 +08:00
5 changed files with 12 additions and 79 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 38 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 34 KiB

File diff suppressed because one or more lines are too long

View File

@ -86,12 +86,10 @@ const copy = (
) => {
const destClone = Array.from(destination.items);
destClone.splice(droppableDestination.index, 0, ...draggableSource.map((dragged_item, _) => {
return {
...model[dragged_item],
id: uuidv4(),
}
}));
destClone.splice(droppableDestination.index, 0, {
...model[draggableSource],
id: uuidv4(),
});
return destClone;
};
@ -1681,12 +1679,10 @@ 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',
indexes: [
itemsUnfoldedList.findIndex(element => element === "eem_pwr_mod"),
itemsUnfoldedList.findIndex(element => element === "kasli")
],
index: 0,
};
const destination = {
droppableId: 'cart',
@ -2010,14 +2006,7 @@ class Shop extends React.PureComponent {
source,
destination,
} = result;
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]);
}
let dragged_item = itemsUnfoldedList[source.index];
if (!destination) {
@ -2060,7 +2049,7 @@ class Shop extends React.PureComponent {
this.state.items,
this.state.columns[source.droppableId],
this.state.columns[destination.droppableId],
dragged_items,
dragged_item,
destination,
),
},

View File

@ -1116,30 +1116,6 @@ 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',
@ -1163,34 +1139,7 @@ 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: {
@ -1225,8 +1174,7 @@ const shop_data = {
itemIds: [
'zotino',
'fastino',
'novo',
'shuttler']},
'novo']},
{ name: 'Adapters',
itemIds: [
'idc-bnc-adapter',
@ -1239,9 +1187,7 @@ const shop_data = {
'koster',
'stabilizer',
'pounder',
'thermostat-eem',
'eem_pwr_mod',
]}
'thermostat-eem']}
],
},