Add AFWS item to the shop

Signed-off-by: Egor Savkin <es@m-labs.hk>

README.md

@@ -12,14 +12,12 @@ Clone the project:
 
 Install Zola.
 
-Start with targeting `m-labs.hk` domain:
+Start:
 
   ```
   zola serve
   ```
 
-Environmental variable `DOMAINNAME` can be specified to [substitute links on the website](#domain-handling).
-
 To build the .bundle.js from .jsx files:
 
   ```
@@ -30,11 +28,3 @@ To build the .bundle.js from .jsx files:
 
 Development builds are also available. `npm run build-dev` to re/build once, or `npm run start-dev` for incremental
 continuous builds as source files change.
-
-## Domain handling
-
-Environmental variable `DOMAINNAME` controls only the following links on the website:
-* email `mailto:` links
-* hook for the RFQ server (`window.API_RFQ`) variable
-
-If absent, `DOMAINNAME` defaults to `m-labs.hk`.

content/about-us/clubmate.md

@@ -18,4 +18,4 @@ Selling drinks is not our main business and only a service we do to other Club M
 * In case of any dispute, the seller is always right.
 
 
-Contact: {{ email(address="sb") }}
+Contact: [sb@m-labs.hk](mailto:sb@m-labs.hk)

content/about-us/jobs.md

@@ -83,5 +83,5 @@ Now is your chance to work on top-notch science and technology projects that get
 
 
 {% layout_centered_content() %}
-##### Contact us at {{ email(address="jobs") }} or [jobs@m-labs.ph](mailto:jobs@m-labs.ph)!
+##### Contact us at [jobs@m-labs.hk](mailto:jobs@m-labs.hk) or [jobs@m-labs.ph](mailto:jobs@m-labs.ph)!
 {% end %}

content/experiment-control/control-loops.md

@@ -62,7 +62,7 @@ The <a href="https://github.com/quartiq/stabilizer" target="_blank" rel="noopene
 
   <div class="col-12 col-md-4">
     <p>
-      To purchase this controller, email {{ email(address="sales") }}. We also offer firmware customizations and development of new features. Note that features that are not implemented in the open source code above (e.g. control from Kasli) are not supported unless purchased separately.
+      To purchase this controller, email <a href="mailto:sales@m-labs.hk">sales@m-labs.hk</a>. We also offer firmware customizations and development of new features. Note that features that are not implemented in the open source code above (e.g. control from Kasli) are not supported unless purchased separately.
     </p>
   </div>
 

content/experiment-control/funding.md

@@ -19,7 +19,7 @@ ARTIQ and the related components that we are developing ([Migen/MiSoC](/gateware
 
 {% layout_funding(position="center", title="Sponsors") %}
 
-We acknowledge support from our partners below. Please get in touch ({{ email(address="sales") }}) if you also want to move ARTIQ forward!
+We acknowledge support from our partners below. Please get in touch ([sales@m-labs.hk](mailto:sales@m-labs.hk)) if you also want to move ARTIQ forward!
 
 {% end %}
 

content/experiment-control/resources.md

@@ -114,7 +114,7 @@ template = "page.html"
 
 **Sinara hardware purchases, ports to your hardware, feature development, technical support, bugfixing**
 
-contact {{ email(address="sales") }}
+contact [sales@m-labs.hk](mailto:sales@m-labs.hk)
 
 We welcome inquiries from research groups of all sizes.<br>[See what has been funded before](/experiment-control/funding)
 
@@ -237,6 +237,6 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
 </div>
 
 {% layout_div(css="col-12 text-center") %}
-Want your project listed here? Write to {{ email(address="sb") }}.
+Want your project listed here? Write to [sb@m-labs.hk](mailto:sb@m-labs.hk).
 
 {% end %}

content/experiment-control/sinara-core.md

@@ -14,7 +14,7 @@ The first ARTIQ core devices used hardware built in-house by physicists (based o
 
 The Sinara hardware is in active development, and the latest information is available <a href="https://github.com/sinara-hw" target="_blank" rel="noopener noreferrer">on the wiki of each project's page</a>. Most of the hardware engineering is done at the <a href="https://www.ise.pw.edu.pl/" target="_blank" rel="noopener noreferrer">Institute for Electronics Systems</a> at the Warsaw University of Technology.
 
-Kasli and EEMs can be ordered now. We can deliver a rack-mountable crate that contains all the cards, is fully tested, and is ready to be connected to your experiment and computer network. Use our [web-based configuration and ordering tool](../place-order), or contact {{ email(address="sales") }} with your requirements, and we will establish a quote.
+Kasli and EEMs can be ordered now. We can deliver a rack-mountable crate that contains all the cards, is fully tested, and is ready to be connected to your experiment and computer network. Use our [web-based configuration and ordering tool](../place-order), or contact <a href="mailto:sales@m-labs.hk">sales@m-labs.hk</a> with your requirements, and we will establish a quote.
 
 {% end %}
 
@@ -297,7 +297,7 @@ The 4624 AWG "Phaser" is a quad channel 1.25 GS/s RF generator card with dual IQ
 
 We can deliver a rack-mountable crate that contains all the cards, is fully tested, and is ready to be connected to your experiment and computer network. The lead time can be as short as a few working days and we will provide assistance to help you set up your new equipment with ARTIQ via the online helpdesk. Using our AFWS tool, you can keep the firmware of your M-Labs devices up-to-date easily, and benefit from the new features we continuously develop into ARTIQ.
 
-Use our [web-based configuration and ordering tool](../place-order), or contact <{{ email(address="sales") }} with your requirements, and we will establish a quote.
+Use our [web-based configuration and ordering tool](../place-order), or contact <a href="mailto:sales@m-labs.hk">sales@m-labs.hk</a> with your requirements, and we will establish a quote.
 
 {% end %}
 

content/other/mixxeo.md

@@ -30,7 +30,7 @@ Built on the <a href="/gateware/migen/">MiSoC and Migen</a> technologies that or
 
 The Mixxeo supported mixing from two DVI or HDMI sources up to 720p60, with crossfade, fade to black and potentially other effects with a latency of less than two frames.
 
-<b>Status (Aug 2014)</b> - Main board and gateware have been <a href="/images/mixxeo_result.jpg">mostly functional</a> for a while, mechanical design and manufacturing for the case/mechatronics are progressing slowly. If you have the skills and would like to help out, email {{ email(address="sb") }} or the mailing list.
+<b>Status (Aug 2014)</b> - Main board and gateware have been <a href="/images/mixxeo_result.jpg">mostly functional</a> for a while, mechanical design and manufacturing for the case/mechatronics are progressing slowly. If you have the skills and would like to help out, email [sb@m-labs.hk](mailto:sb@m-labs.hk) or the mailing list.
 
 <center><img src="/images/mixxeo_menu.png"><br /><br /><img src="/images/mixxeo_board.jpg" class="picimg"></center>
 

content/software/smoltcp.md

@@ -26,6 +26,6 @@ smoltcp achieves <a href="https://github.com/smoltcp-rs/smoltcp#examplesbenchmar
 
 The source code is available <a href="https://github.com/smoltcp-rs/smoltcp" rel="noopener noreferrer">on GitHub</a>.
 
-**Commercial support for smoltcp is available.** Email {{ email(address="sales") }}.
+**Commercial support for smoltcp is available.** Email [sales@m-labs.hk](mailto:sales@m-labs.hk).
 
 {% end %}

static/js/shop/Domained.jsx

@@ -1,13 +0,0 @@
-import React from "react";
-import {DOMAIN} from "./utils";
-
-
-export function DomainedEmail({address}) {
-    const target = `${address}@${DOMAIN}`;
-    return <a href={"mailto:" + target}>{target}</a>
-}
-
-export const DomainedRFQMessages = {
-    OK: <>We've received your request and will be in contact soon.</>,
-    ERROR: <>We cannot receive your request. Try using the export by coping the configuration and send it to us at <DomainedEmail address="sales"/></>
-}

static/js/shop/Shop.jsx

@@ -9,7 +9,6 @@ import {Layout} from "./Layout";
 import {Catalog} from "./Catalog";
 import {OrderPanel} from "./OrderPanel";
 import {useShopStore} from "./shop_store";
-import {DomainedEmail} from "./Domained";
 
 /**
  * Component that renders the entire shop
@@ -62,7 +61,7 @@ export function Shop() {
                                 the combination would look like. Configure the card settings by tapping on the top of
                                 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 <DomainedEmail address="sales"/>.
+                                email us directly anytime at <a href="mailto:sales@m-labs.hk">sales@m-labs.hk</a>.
                                 The price excludes shipping, is estimated, and must be confirmed by a quote.
                             </p>
                         )}

static/js/shop/shop_store.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import {createWithEqualityFn} from "zustand/traditional";
-import {DATA as shared_data, itemsUnfoldedList, API_RFQ} from "./utils";
+import {data as shared_data, itemsUnfoldedList} from "./utils";
 import {FillExtCrateData, FillExtOrderData} from "./options/utils";
 import {v4 as uuidv4} from "uuid";
 import {FillResources} from "./count_resources";
@@ -10,7 +10,6 @@ import {TriggerCrateWarnings, TriggerWarnings} from "./warnings";
 import {Validation, validateEmail, validateNote, validateJSONInput} from "./validate";
 import {CratesToJSON, JSONToCrates} from "./json_porter";
 import {ProcessOptionsToData} from "./options/Options";
-import {DomainedRFQMessages} from "./Domained";
 
 
 const cards_to_pn_map = (cards) => {
@@ -233,7 +232,7 @@ const useSubmitForm = ((set, get) => ({
         status: Validation.OK,
         message: ""
     },
-    API_RFQ: API_RFQ,
+    API_RFQ: shared_data.API_RFQ,
     email: {
         value: "",
         error: null
@@ -311,18 +310,18 @@ const useSubmitForm = ((set, get) => ({
             if (response.status !== 200) {
                 throw Error("Response status is not OK: " + response.status + ".\n" + response);
             }
-            get().finishSubmitForm({status: Validation.OK, message: DomainedRFQMessages.OK})
+            get().finishSubmitForm({status: Validation.OK, message: "We've received your request and will be in contact soon."})
         }, reason => {
             console.error("Request rejected, reason:", reason)
             get().finishSubmitForm({
                 status: Validation.Invalid,
-                message: DomainedRFQMessages.ERROR
+                message: "We cannot receive your request. Try using the export by coping the configuration and send it to us at sales@m-labs.hk"
             })
         }).catch(err => {
             console.error("Request failed, reason:", err)
             get().finishSubmitForm({
                 status: Validation.Invalid,
-                message: DomainedRFQMessages.ERROR
+                message: "We cannot receive your request. Try using the export by coping the configuration and send it to us at sales@m-labs.hk"
             })
         })
     },

static/js/shop/utils.js

@@ -1,9 +1,7 @@
 'use strict';
 
-export const DATA = window.shop_data;
+export const data = window.shop_data;
-export const DOMAIN = window.DOMAIN;
+export const itemsUnfoldedList = Array.from(data.columns.catalog.categories.map(groupId => groupId.itemIds).flat());
-export const API_RFQ = window.API_RFQ;
-export const itemsUnfoldedList = Array.from(DATA.columns.catalog.categories.map(groupId => groupId.itemIds).flat());
 
 export const productStyle = (style, snapshot, removeAnim, hovered, selected, cart=false) => {
     const custom = {

static/js/shop_data.js

@@ -1,4 +1,6 @@
 const shop_data = {
+
+  API_RFQ: 'https://hooks.m-labs.hk/rfq',
   currency: 'USD',
 
   crateModes: {

templates/_base.html

@@ -43,7 +43,6 @@
     <link href="{{ get_url(path='favicon.ico', cachebust=true) }}" rel="icon" type="image/x-icon">
 
     {% block styles %}{% endblock %}
-
   </head>
 
   <body>

templates/includes/footer_contact_direction.html

@@ -5,7 +5,7 @@
     <h5 class="pb-3">Sales inquiries</h5>
 
     <p>
-      To purchase ARTIQ Sinara hardware, software and gateware development services, or to enter a technical support agreement, write to <a href="mailto:sales@{{get_env(name="DOMAINNAME", default="m-labs.hk")}}">sales@{{get_env(name="DOMAINNAME", default="m-labs.hk")}}</a>.
+      To purchase ARTIQ Sinara hardware, software and gateware development services, or to enter a technical support agreement, write to <a href="mailto:sales@m-labs.hk">sales@m-labs.hk</a>.
     </p>
 
   </div>
@@ -15,7 +15,7 @@
     <h5 class="pb-3">Commercial technical support</h5>
 
     <p>
-      If you need help setting up ARTIQ hardware purchased from us, or if you have a commercial technical support agreement with us, email us anytime at <a href="mailto:helpdesk@{{get_env(name="DOMAINNAME", default="m-labs.hk")}}">helpdesk@{{get_env(name="DOMAINNAME", default="m-labs.hk")}}</a>.
+      If you need help setting up ARTIQ hardware purchased from us, or if you have a commercial technical support agreement with us, email us anytime at <a href="mailto:helpdesk@m-labs.hk">helpdesk@m-labs.hk</a>.
     </p>
 
     <h5 class="pb-3">Community support</h5>

templates/page-place-order.html

@@ -46,11 +46,6 @@
   <!-- Load Data -->
   <script src="{{ get_url(path='js/shop_data.js', cachebust=true) }}"></script>
 
-  <script>
-    window.DOMAIN = "{{get_env(name="DOMAINNAME", default="m-labs.hk")}}";
-    window.API_RFQ = `https://hooks.${window.DOMAIN}/rfq`;
-  </script>
-
   <!-- Load our React component. -->
   <!-- <script type="text/babel" src="{{ get_url(path='js/shop.jsx', cachebust=true) }}"></script> -->
   <script src="{{ get_url(path='js/shop.bundle.js', cachebust=true) }}"></script>

templates/shortcodes/email.html

@@ -1 +0,0 @@
-<a href="mailto:{{address}}@{{get_env(name="DOMAINNAME", default="m-labs.hk")}}">{{address}}@{{get_env(name="DOMAINNAME", default="m-labs.hk")}}</a>