From 7b0e09aa1ce323eda4e069780d9a808b81b593c8 Mon Sep 17 00:00:00 2001
From: Aaron <aaronklinker1@gmail.com>
Date: Fri, 5 Apr 2024 10:50:49 -0500
Subject: [PATCH] feat: Add extra space to settings tab

---
 bun.lockb                               | Bin 437424 -> 437424 bytes
 package.json                            |   1 +
 web/components/SettingsTab.vue          |  22 +++++++++++++++++++++-
 web/composables/useBladeWidth.ts        |   3 ++-
 web/composables/useCutlistConfig.ts     |   2 ++
 web/composables/useExtraSpace.ts        |  10 ++++++++++
 web/composables/useExtraSpaceSetting.ts |   8 ++++++++
 7 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 web/composables/useExtraSpace.ts
 create mode 100644 web/composables/useExtraSpaceSetting.ts

diff --git a/bun.lockb b/bun.lockb
index be3af4857b169d8e0b126629e1a0b71b27f53797..304a9eee8524f7d8b45e6cd05b6a5d0023360da2 100755
GIT binary patch
delta 39
tcmdmRQ)<IasfHHD7N!>FEiCmF?2K`idM0|t?QIn-K+L+mt%6O<1OO%14VC}^

delta 39
pcmdmRQ)<IasfHHD7N!>FEiCmF>`V+`(B4+T0>rG_+bY<!OaKkc3_Sn<

diff --git a/package.json b/package.json
index d274a3a..3e0730d 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   ],
   "scripts": {
     "dev": "bun --cwd web dev",
+    "build": "bun --cwd npm build",
     "check": "bun --cwd npm check && bun --cwd web check",
     "prepare": "simple-git-hooks"
   },
diff --git a/web/components/SettingsTab.vue b/web/components/SettingsTab.vue
index a65bb07..afd99b1 100644
--- a/web/components/SettingsTab.vue
+++ b/web/components/SettingsTab.vue
@@ -1,8 +1,24 @@
 <script lang="ts" setup>
+import { Distance } from '@aklinker1/cutlist';
+
 const optimize = useOptimizeForSetting();
 const bladeWidth = useBladeWidthSetting();
 const distanceUnit = useDistanceUnit();
 const showPartNumbers = useShowPartNumbers();
+const extraSpace = useExtraSpaceSetting();
+
+// Convert values when units change
+watch(distanceUnit, (newUnit, oldUnit) => {
+  if (!newUnit || !oldUnit) return;
+
+  console.log(newUnit, oldUnit);
+  const convertValue = (value: Ref<string | number>) => {
+    const dist = new Distance(value.value + oldUnit);
+    value.value = dist[newUnit];
+  };
+  convertValue(bladeWidth);
+  convertValue(extraSpace);
+});
 </script>
 
 <template>
@@ -11,10 +27,14 @@ const showPartNumbers = useShowPartNumbers();
       <USelect v-model="distanceUnit" :options="['in', 'm', 'mm']" />
     </UFormGroup>
 
-    <UFormGroup label="Blade width (in):">
+    <UFormGroup :label="`Blade width (${distanceUnit}):`">
       <UInput v-model="bladeWidth" type="number" />
     </UFormGroup>
 
+    <UFormGroup :label="`Extra space (${distanceUnit}):`">
+      <UInput v-model="extraSpace" type="number" />
+    </UFormGroup>
+
     <UFormGroup label="Optimize for:">
       <USelect v-model="optimize" :options="['Cuts', 'Space']" />
     </UFormGroup>
diff --git a/web/composables/useBladeWidth.ts b/web/composables/useBladeWidth.ts
index 884e70d..3048a5a 100644
--- a/web/composables/useBladeWidth.ts
+++ b/web/composables/useBladeWidth.ts
@@ -5,5 +5,6 @@ import { Distance } from '@aklinker1/cutlist';
  */
 export default function () {
   const bladeWidth = useBladeWidthSetting();
-  return computed(() => new Distance(bladeWidth.value + 'in').m);
+  const unit = useDistanceUnit();
+  return computed(() => new Distance(bladeWidth.value + unit.value).m);
 }
diff --git a/web/composables/useCutlistConfig.ts b/web/composables/useCutlistConfig.ts
index bd7a035..457bec6 100644
--- a/web/composables/useCutlistConfig.ts
+++ b/web/composables/useCutlistConfig.ts
@@ -3,9 +3,11 @@ import type { Config } from '@aklinker1/cutlist';
 export default createSharedComposable(() => {
   const bladeWidth = useBladeWidth();
   const optimize = useOptimizeFor();
+  const extraSpace = useExtraSpace();
 
   return computed<Config>(() => ({
     bladeWidth: bladeWidth.value,
     optimize: optimize.value,
+    extraSpace: extraSpace.value,
   }));
 });
diff --git a/web/composables/useExtraSpace.ts b/web/composables/useExtraSpace.ts
new file mode 100644
index 0000000..8e93a84
--- /dev/null
+++ b/web/composables/useExtraSpace.ts
@@ -0,0 +1,10 @@
+import { Distance } from '@aklinker1/cutlist';
+
+/**
+ * Returns the extra space in standard units based off the settings.
+ */
+export default function () {
+  const extraSpace = useExtraSpaceSetting();
+  const unit = useDistanceUnit();
+  return computed(() => new Distance(extraSpace.value + unit.value).m);
+}
diff --git a/web/composables/useExtraSpaceSetting.ts b/web/composables/useExtraSpaceSetting.ts
new file mode 100644
index 0000000..14548a6
--- /dev/null
+++ b/web/composables/useExtraSpaceSetting.ts
@@ -0,0 +1,8 @@
+/**
+ * Stores the preference from the settings page directly. Unless you're on the
+ * settings page, you should probably use `useExtraSpace` instead for the
+ * standardized value.
+ */
+export default createGlobalState(() =>
+  useLocalStorage('@cutlist/extra-space', '0'),
+);