M-Labs
/
web2019
5
0
Fork 2
Code Issues 20 Pull Requests 3 Releases Wiki Activity

Add HD68 cable options and fix first small cards options 

Signed-off-by: Egor Savkin <es@m-labs.hk>
This commit is contained in:
Egor Savkin 2023-09-27 16:37:09 +08:00
parent 2480b9ad54
commit 291332eaf4
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sass/css/_shop.scss
View File

@ -533,14 +533,19 @@ button {
.form-check { .form-check {
min-height: 1rem; min-height: 1rem;
} }
&.hd68-idc, &.stabilizer, &.clocker {
width: 85px;
left: -11px; // (card width (63) - overlay width (85)) / 2
}
} }
} }
.overlay-smallcard { .overlay-smallcard {
right: -38.5px; // (card width (63) - overlay width (140)) / 2 left: -38.5px; // (card width (63) - overlay width (140)) / 2
} }
.overlay-bigcard { .overlay-bigcard {
right: -7px; // (card width (126) - overlay width (140)) / 2 left: -7px; // (card width (126) - overlay width (140)) / 2
} }
.hovered { .hovered {

3
static/js/shop.jsx
View File

@ -705,9 +705,10 @@ class ProductCartItem extends React.PureComponent {
) : (options ? (<OptionsDialogPopup ) : (options ? (<OptionsDialogPopup
options={options} options={options}
data={options_data} data={options_data}
options_class={model.options_class}
key={"popover" + index} key={"popover" + index}
id={"popover" + index} id={"popover" + index}
big={data.size === "big"} big={model.size === "big"}
target={{ target={{
construct: ((outvar, value) => { construct: ((outvar, value) => {
// console.log("construct", outvar, value, options_data); // console.log("construct", outvar, value, options_data);

6
static/js/shop_components.jsx
View File

@ -318,7 +318,7 @@ export function FilterOptions(options, data) {
return target return target
} }
export function OptionsDialogPopup({options, data, target, id, big}) { export function OptionsDialogPopup({options, data, target, id, big, options_class}) {
const [show, setShow] = useState(false); const [show, setShow] = useState(false);
const ref = useClickAway((e) => { const ref = useClickAway((e) => {
if (e.type === "mousedown") // ignore touchstart if (e.type === "mousedown") // ignore touchstart
@ -326,7 +326,7 @@ export function OptionsDialogPopup({options, data, target, id, big}) {
} }
); );
let div_classes = "overlayVariant border rounded " + (big ? "overlay-bigcard" : "overlay-smallcard") let div_classes = "overlayVariant border rounded " + (big ? "overlay-bigcard " : "overlay-smallcard ") + (options_class || "");
const handleClick = (event) => { const handleClick = (event) => {
setShow(!show); setShow(!show);
}; };
@ -444,7 +444,7 @@ export function OptionsSummaryPopup({id, options, data}) {
export function FillExtData(data, index) { export function FillExtData(data, index) {
return { return {
has_previous_carrier: data.filter((value, item_index) => index > item_index && value.name === "Carrier").length > 0, has_previous_carrier: data.filter((value, item_index) => index > item_index && value.name === "Carrier").length > 0,
has_other_dio: data.filter((value, item_index) => index !== item_index && value.name.endsWith("-TTL")).length > 0, has_other_dio: data.filter((value, item_index) => index !== item_index && value.name &&value.name.endsWith("-TTL")).length > 0,
has_dds: data.filter(((value, _) => value.name === "DDS" && (!value.options_data || !value.options_data.mono_eem))).length > 0, has_dds: data.filter(((value, _) => value.name === "DDS" && (!value.options_data || !value.options_data.mono_eem))).length > 0,
has_sampler: data.filter(((value, _) => value.name === "Sampler" && (!value.options_data || !value.options_data.mono_eem))).length > 0, has_sampler: data.filter(((value, _) => value.name === "Sampler" && (!value.options_data || !value.options_data.mono_eem))).length > 0,
} }

6
static/js/shop_data.js
View File

@ -833,6 +833,10 @@ const shop_data = {
size: 'small', size: 'small',
type: 'hd68', type: 'hd68',
hp: 4, hp: 4,
options: [
{type: "Radio", args: {title: "Cable length", outvar: "hd68_cable_len", variants: ["1 M", "2 M", "3 M"], tip: "The desired length of the HD68 cable", fallback: 1}},
],
options_class: "hd68-idc",
nbrSlotMin: 1, nbrSlotMin: 1,
nbrSlotMax: 4, nbrSlotMax: 4,
nbrCurrentSlot: 0, nbrCurrentSlot: 0,
@ -955,6 +959,7 @@ const shop_data = {
{type: "Switch", args: {title: "Ext CLK", outvar: "ext_clk"}}, {type: "Switch", args: {title: "Ext CLK", outvar: "ext_clk"}},
{type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}} {type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}}
], ],
options_class: "clocker",
size: 'small', size: 'small',
type: 'clocker', type: 'clocker',
hp: 4, hp: 4,
@ -996,6 +1001,7 @@ const shop_data = {
options: [ options: [
{type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}} {type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}}
], ],
options_class: "stabilizer",
size: 'small', size: 'small',
type: null, type: null,
hp: 4, hp: 4,