Fix stl gathering, add cad urls

pkucmus · pkucmus · commit 79e57850b0bd · 2021-04-26T22:49:26.000+02:00
diff --git a/docs/addons/cartesian_idex b/docs/addons/cartesian_idex
@@ -1 +1 @@
-Subproject commit ca689b1eae2555f13cbe33bd461af89be6eff3b9
+Subproject commit 2d90e5a51830cc2a6b8e7695582e9185176c6529
diff --git a/docs/assets/render.jpg b/docs/assets/render.jpg
diff --git a/docs/box/index.md b/docs/box/index.md
@@ -9,7 +9,7 @@ hide:
 
     Please feel free to use it, it was tested before release but never on a big scale. If there's anything wrong with the feature please file an issue on [GitHub](https://github.com/EVA-3D/eva-main/issues) or let `@McAbra` know on Discord.
 
-# BOX
+# BOX <small>Your configuration</small>
 
 This is **the box** - a feature of this documentation that is meant
 to help you to figure out which parts you need to build your EVA carriage
@@ -24,14 +24,24 @@ Typically you will need a **drive**, **hotend**, **endstop** and a **bed probe**
                 <th role="columnheader">Name</th>
                 <th role="columnheader">Satisfies</th>
                 <th role="columnheader">Remove</th>
+                <th role="columnheader">CAD</th>
             </tr>
         </thead>
         <tbody>
             <tr v-for="(item, name, index) in items">{% raw %}
                 <td>{{item.type}}</td>
                 <td>{{name}}</td>
                 <td>{{item.satisfies | join}}</td>{% endraw %}
-                <td align="center"><a v-on:click="remove(name)" class="remove"><i class="fas fa-minus-circle"></i></a></td>
+                <td align="center">
+                    <a v-on:click="remove(name)" class="remove">
+                        {{ icon("fontawesome-solid-minus-circle") }}
+                    </a>
+                </td>
+                <td align="center">
+                    <a v-bind:href="item.cad_url" target="_blank">
+                        {{ icon("fontawesome-solid-file-import") }}
+                    </a>
+                </td>
             </tr>
         </tbody>
     </table>
diff --git a/docs/drives/aero b/docs/drives/aero
@@ -1 +1 @@
-Subproject commit ac3220016b4fd7c6b31fda50f053197bfca25d0b
+Subproject commit d51db2875f89eb52dd9c3bae03458f37f4e90506
diff --git a/docs/drives/bmg b/docs/drives/bmg
@@ -1 +1 @@
-Subproject commit 0af594e1f93def469a8fdb34b631b4bb1899eedf
+Subproject commit c984e1e64691c87fa68022beefe8df9648ca6bdb
diff --git a/docs/drives/bowden b/docs/drives/bowden
@@ -1 +1 @@
-Subproject commit dfaea08cf9973d0eeecca6f8746158196e13f5a2
+Subproject commit ad453ae50e5e8ea5118637a44369b179e0718527
diff --git a/docs/drives/hemera b/docs/drives/hemera
@@ -1 +1 @@
-Subproject commit fe8ccc48ae0057f934935e578e1cdd77c11879e1
+Subproject commit cc815895c92b671e64758f434a11bc75b6c5b289
diff --git a/docs/drives/lgx b/docs/drives/lgx
@@ -1 +1 @@
-Subproject commit 62fee052c193a1f4b1f1217310f1f584e3a18672
+Subproject commit 91e0f94311a34b385726aab4945a693d995d8b12
diff --git a/docs/drives/orbiter b/docs/drives/orbiter
@@ -1 +1 @@
-Subproject commit f20c47d81cdd22aac51e64367ee61b61b947f6da
+Subproject commit 032c81e04a9fe45ad0770ced2885c695731fa3d1
diff --git a/docs/drives/titan b/docs/drives/titan
@@ -1 +1 @@
-Subproject commit d22a6be9efc53f28317dd31d1cd59f2e151b38f7
+Subproject commit f29012198f4a1677a66a80195bce5604738d9c3f
diff --git a/docs/hotends/dragon/bom/Dragon.csv b/docs/hotends/dragon/bom/Dragon.csv
@@ -1,8 +1,8 @@
 Item,Quantity,Name,Material
 1,1,4010 FAN,- None -
-2,4,DIN 912 M3 20 mm,Hardened Alloy Steel
+2,2,DIN 912 M3 20 mm,Hardened Alloy Steel
 3,6,"M3  Hex nut ",Hardened Alloy Steel
-4,2,DIN 912 M3 25 mm,Hardened Alloy Steel
+4,4,DIN 912 M3 25 mm,Hardened Alloy Steel
 5,2,DIN 912 M3 10 mm,Hardened Alloy Steel
 6,1,Dragon hotend,- None -
 7,1,dragon_face,PETG
diff --git a/docs/hotends/mosquito/bom/Mosquito.csv b/docs/hotends/mosquito/bom/Mosquito.csv
@@ -1,10 +1,10 @@
 Item,Quantity,Name,Material
-1,2,DIN 912 M3 25 mm,Hardened Alloy Steel
+1,4,DIN 912 M3 25 mm,Hardened Alloy Steel
 2,2,DIN 912 M2.5 12 mm,Hardened Alloy Steel
 3,2,DIN 912 M3 10 mm,Hardened Alloy Steel
 4,6,"M3  Hex nut ",Hardened Alloy Steel
 5,1,mosquito_face,PETG
-6,4,DIN 912 M3 20 mm,Hardened Alloy Steel
+6,2,DIN 912 M3 20 mm,Hardened Alloy Steel
 7,1,4010 FAN,- None -
 8,1,mosquito_support,PETG
 9,1,DIN 912 M3 8 mm,Hardened Alloy Steel
diff --git a/docs/js/extra.js b/docs/js/extra.js
@@ -210,14 +210,7 @@ var boxLink = new Vue({
 
 Vue.component('add-bom-button', {
     props: ['name'],
-    template: `
-    <a 
-        class="md-button md-button--primary add-to-box"
-        v-bind:class="{ 'in-the-box': inBox }"
-        v-on:click="add()"
-    >{{ inBox ? 'In the box' : 'Add to box' }} <span class="twemoji"><i class="fas fa-box-open"></i></span>
-    </a>
-    `,
+    template: "#add-to-box-template",
     beforeCreate() { this.$store.commit('initialiseStore');},
     computed: {
         inBox () {
@@ -227,7 +220,7 @@ Vue.component('add-bom-button', {
     methods: {
         add () {
             var item = {};
-            item[this.name] = JSON.parse(this.$slots.default[0].text)
+            item[this.name] = JSON.parse(atob(this.$slots.default[0].text));
             this.$store.commit('add', item);
         },
     },
diff --git a/eva-docs-builder b/eva-docs-builder
@@ -1 +1 @@
-Subproject commit b506e53392865d35e9d52c38aa04966891abf5fe
+Subproject commit 36023e530b52fba3585019765685df3da81032a2
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -44,8 +44,8 @@ extra_css:
 extra_javascript:
   - https://cdn.jsdelivr.net/npm/es6-promise@4/dist/es6-promise.auto.js
   - https://unpkg.com/vuex@2.0.0
-  - https://cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.min.js
-  - https://kit.fontawesome.com/6a81610f0a.js" crossorigin="anonymous
+  # - https://cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.min.js
+  - https://cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.js
   - https://cdn.scaleflex.it/plugins/js-cloudimage-360-view/2.4.1/js-cloudimage-360-view.min.js
   - https://cdnjs.cloudflare.com/ajax/libs/tablesort/5.2.1/tablesort.min.js
   - js/extra.js
diff --git a/overrides/main.html b/overrides/main.html
@@ -27,6 +27,20 @@
 {% block scripts %}
 <script>window.CI360 = { notInitOnLoad: true }</script>
 <script>const docsVersion = "{{ config.version }}";</script>
+
+<script type="text/x-template" id="add-to-box-template">{% raw %}
+  <a 
+  class="md-button md-button--primary add-to-box"
+  v-bind:class="{ 'in-the-box': inBox }"
+  v-on:click="add()"
+  >
+  {{ inBox ? 'In the box' : 'Add to box' }}{% endraw %}
+    <span class="twemoji">
+      {% include ".icons/fontawesome/solid/box-open.svg" %}
+    </span>
+  </a>
+</script>
+
 {{ super() }}
 
 <!-- Global site tag (gtag.js) - Google Analytics -->
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,6 +15,7 @@ mkdocs-exclude = "^1.0.2"
 mkdocs-material = "^7.0.4"
 pydantic = "^1.8.1"
 python-slugify = "^4.0.1"
+msgpack = "^1.0.2"
 
 [tool.poetry.dev-dependencies]
 ipython = "^7.19.0"
diff --git a/submodules.sh b/submodules.sh
@@ -28,5 +28,6 @@ for i in "${submodules[@]}"; do
     git add .
     git commit -m "$1" || true
     git push origin main
+    # git reset --hard HEAD
     cd $path
 done
