1
0
Fork 0

Compare commits

...

3 Commits

5 changed files with 26 additions and 21 deletions

File diff suppressed because one or more lines are too long

View File

@ -44,7 +44,7 @@ export function ProductItem({card_index}) {
<section className="productItem">
<div className="content">
<h3 style={{'marginBottom': card.name_codename ? '5px' : '20px'}}>{card.name}</h3>
<h3 style={{'marginBottom': card.name_codename ? '5px' : '20px'}}>{card.name_number} {card.name}</h3>
{card.name_codename ? (
<p>{card.name_codename}</p>
) : null}

View File

@ -62,7 +62,7 @@ export function Shop() {
the card; many of the options can be adjusted even after the card has been shipped.
If you have any issues with this ordering system, or if you need other configurations,
email us directly anytime at <a href="mailto:sales@m-labs.hk">sales@m-labs.hk</a>.
The price is estimated and must be confirmed by a quote.
The price excludes shipping, is estimated, and must be confirmed by a quote.
</p>
)}
/>
@ -71,4 +71,4 @@ export function Shop() {
</DragDropContext>
);
}
}

View File

@ -79,12 +79,17 @@ export function ShowJSON() {
placeholder="There should be description of the crate"/>
<div className="d-flex flex-column flex-sm-row justify-content-end">
<a type="button"
onClick={() => {copyToClipboard(description)}}
className={"btn btn-sm m-0 mb-1 mt-2 mb-sm-0 me-sm-2 " + copyButtonStates[copiedState].style}
>
{ copyButtonStates[copiedState].content }
</a>
{window.isSecureContext && (
<a type="button"
onClick={() => {
copyToClipboard(description)
}}
className={"btn btn-sm m-0 mb-1 mt-2 mb-sm-0 me-sm-2 " + copyButtonStates[copiedState].style}
>
{copyButtonStates[copiedState].content}
</a>
)}
<a type="button" onClick={closeDescription}
className="btn btn-sm btn-outline-primary m-0 mb-1 mt-2 mb-sm-0 me-sm-2">Close</a>
</div>

View File

@ -50,11 +50,11 @@ const shop_data = {
options: [
{"type": "Group", items:[
{type: "Switch", args: {
title: "Include optional Intel® NUC mini-computer with pre-installed ARTIQ software",
title: "Optional pre-installed NUC mini-computer",
outvar: "nuc",
tip: "OS: latest stable NixOS with Gnome or KDE with pre-installed ARTIQ software. " +
"Hardware (other choices available): Intel® NUC 13 Pro Kit NUC13ANKi7, i7-1360P CPU, " +
"32GB RAM from reputable vendor, 1TB M.2 NVM Express SSD from reputable vendor.",
tip: "Pre-installed NixOS desktop with ARTIQ and other scientific software. " +
"Hardware: Intel® NUC 13 Pro Kit NUC13ANKi7, i7-1360P CPU, " +
"32GB RAM, 1TB NVMe. Other options contact us.",
fallback: true,
}},
{
@ -64,7 +64,7 @@ const shop_data = {
{
type: "Radio",
args: {
title: "Desktop Environment",
title: "Desktop Environment:",
outvar: "nuc_desktop",
variants: ["Gnome", "KDE"],
fallback: 0,
@ -72,13 +72,13 @@ const shop_data = {
}
},
{type: "Line", args: {title: "Additional software to be pre-installed", outvar: "software", fallback: "",
tip: "Pre-install additional software, if needed."}},
tip: "Most software from nixpkgs can be pre-installed."}},
{"if": [
{"var": "ext_data.has_crate"},
{type: "Switch", args: {
title: "Include promotional USB stick",
title: "Promotional USB stick",
outvar: "include_usb_stick_nuc",
tip: "Choose if you need a USB stick with device database and other relevant files. Alternative is to to receive them via other electronic means (e.g. email or cloud).",
tip: "Branded USB stick with device database and other relevant files. Files can also be emailed to you.",
fallback: false,
}}
]},
@ -99,7 +99,7 @@ const shop_data = {
{
type: "Radio",
args: {
title: "Shipping options",
title: "Shipping options:",
outvar: "shipping",
variants: [
"Incoterms 2020 FCA",
@ -122,7 +122,7 @@ const shop_data = {
]},
{"if": [
{"==": [{"var": "shipping"}, "Prepay and add shipping (only available to credit customers)"]},
[{type: "Radio", args: {title: "In case of additional customs fees",
[{type: "Radio", args: {title: "In case of additional customs fees:",
outvar: "prepay_fees_handling", fallback: 0,
variants: [
"Add to your final invoice",
@ -135,7 +135,7 @@ const shop_data = {
],
prices: [{
"if": [{"var": "nuc"}, {title: "Include optional pre-installed Intel® NUC mini-computer", price: 1300, disable_patch: {"nuc": false}, id: "nuc"}],
"if": [{"var": "nuc"}, {title: "Pre-installed NUC mini-computer", price: 1300, disable_patch: {"nuc": false}, id: "nuc"}],
}],
shippingSummary: [
{type: "Label", args: {