From efc9e3e3b4cb44ef733c0a3e5a2d1e21a0925a0d Mon Sep 17 00:00:00 2001
From: spectralo <arthur.hardy@mageekbox.net>
Date: Wed, 13 Nov 2024 19:15:49 +0100
Subject: [PATCH 1/3] This should fix it ?

---
 bun.lockb                                   | Bin 261272 -> 261280 bytes
 src/app/harbor/shipyard/edit-ship-form.tsx  |  31 +++++++++++++++++++-
 src/app/harbor/shipyard/new-update-form.tsx |   8 +++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/bun.lockb b/bun.lockb
index ac490576c1433a8bac3c310ec7c1a2adc034f6e1..7d866aebcb8d144778287d6a26cbf23092889aac 100755
GIT binary patch
delta 822
zcmXw%OHWf#6ot<@<<+7Tipaw#^?`<T(upP{I?xy;N^E=~4k1xXi}6KCh{5=rR!s;;
zt0ssebi}~iF>?npbLbB+CJveTZCLDd^{)M`bN4yDx9>Ky%bVFZmwe~5(yNmHUJ4`S
zk#oU0@0{C%taf^^>)9gCo!6QaeXrPPTrY?2Qx_C9gY$|minY-Hw0o#AnAujeAy$fA
z(~P*H<!Peh$m*(C27h9UICo8~o&Jp2^*CuG#ue=bPip!Nu?|>HY(gvxo5vfz8P{yY
zEk#|RBHn(`ZLyp!YvPN#Bi4;yutiik`U)ea71?8}<87CU*k1giSXIm(<&xM;ylf-x
z((-ZrsG;Z{S9?PP=n1})>wU3(_+2{LgZSA-JXExwsKNp5#Xb@{fY0KsX2k~aD>k31
z#ea-wo+E0C>1r74&qE*6+D(U11Le^|JY8ioJC8*}=o8ALr(#F(-_Swy9A<kQL#yZr
zdJ*3;BKK0!FMBN1pIZD|3x^W=A8r0)vNjvqeb0Lm+xr8ujco8rT(5=Rfo1Gh=?m9B
zJHAytVNj+oU9^`$EhfGmPWo2G$=TOow2}EetUpH~SsG4F`E;?c4cZc4NX3o+*hyLv

delta 825
zcmXw%OHUL*6osp5MCd^r2JjsP;|nAqLZS(YE_8)2CYbm@jR~%XX<y-`Mo}?wr>Kds
za1@_0MqIfdz4jl-jvwIOxG}QxyLi0mGkxm2HK)3(`t4F-W~uO`-`7o*9+doiDfE_m
z4+rPGbFKwh{U3wfnq}hL5zWalUMF@mek+IO1IN{>0k^5uFSe5Lcl!@jf|;#F3t}f?
zahQmcnx4?wi>ywG<?;KLiF2pL>KPvrI}?X2Vo<FH@Q~8aimiq<iJcQGz;5CVpO0TH
zqO4XCv<Gi5G%VJHA6&r?RS|2(Pue6ZjlM#}CADnZrt!AQWwEvRXJS{xY%8COU5x`4
zag8CD+kmQSjc~UU+KBGp8@Z2)ZNjh8la0l97BQ~YW?B^<&<=J&Yzw}Cx4JIYihpnU
z)Q$Lyh#K1(ACok++H<&Dnz;>MMQ!MIJeacBBrPtt1I;3<yPCce{{?MD_r!MLKcnqv
zDn2Emcweo>)PkJ*k<F*!XI;Y!{7du-&1N6RLcQ;?)h+S^nnRzE#l6wknDrX%g{eP}
zvftw&zdmWV^PnDP$#mH7YyE}puI{d$?AYVbSIsYW*oVOM-P!Ao+(n<Xcm4w|OFDCL
F;V*2hTFn3e

diff --git a/src/app/harbor/shipyard/edit-ship-form.tsx b/src/app/harbor/shipyard/edit-ship-form.tsx
index 625f74d3..bbf249bf 100644
--- a/src/app/harbor/shipyard/edit-ship-form.tsx
+++ b/src/app/harbor/shipyard/edit-ship-form.tsx
@@ -4,6 +4,16 @@ import type { Ship } from '@/app/utils/data'
 import { useToast } from '@/hooks/use-toast'
 import Icon from '@hackclub/icons'
 import { useState } from 'react'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+  DialogClose,
+  DialogFooter,
+} from '@/components/ui/dialog'
 
 const editMessages = [
   'Orpheus hopes you know that she put a lot of effort into recording your changes~',
@@ -196,7 +206,26 @@ export default function EditShipForm({
           disabled={deleting}
         >
           {deleting ? <Icon glyph="more" /> : <Icon glyph="forbidden" />}
-          Delete Ship
+          <Dialog>
+            <DialogTrigger>Delete Ship</DialogTrigger>
+            <DialogContent>
+              <DialogHeader>
+                <DialogTitle>Are you absolutely sure?</DialogTitle>
+                <DialogDescription>
+                  This action cannot be undone.
+                </DialogDescription>
+                <DialogFooter>
+                  <Button
+                    type="submit"
+                    variant="secondary"
+                    onClick={handleDelete}
+                  >
+                    I'm sure! Delete it.
+                  </Button>
+                </DialogFooter>
+              </DialogHeader>
+            </DialogContent>
+          </Dialog>
         </Button>
       </div>
     </form>
diff --git a/src/app/harbor/shipyard/new-update-form.tsx b/src/app/harbor/shipyard/new-update-form.tsx
index 4247a9f9..f5bf4e60 100644
--- a/src/app/harbor/shipyard/new-update-form.tsx
+++ b/src/app/harbor/shipyard/new-update-form.tsx
@@ -2,6 +2,14 @@
 import { createShipUpdate } from './ship-utils'
 import type { Ship } from '@/app/utils/data'
 import { Button } from '@/components/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@/components/ui/dialog'
 import JSConfetti from 'js-confetti'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { getWakaSessions } from '@/app/utils/waka'

From 66cd7e1e367f04c53861dce2de0e429361dff03f Mon Sep 17 00:00:00 2001
From: spectralo <arthur.hardy@mageekbox.net>
Date: Wed, 13 Nov 2024 19:55:38 +0100
Subject: [PATCH 2/3] Im too dumb :skull:

---
 src/app/harbor/shipyard/edit-ship-form.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/harbor/shipyard/edit-ship-form.tsx b/src/app/harbor/shipyard/edit-ship-form.tsx
index bbf249bf..20b34fbc 100644
--- a/src/app/harbor/shipyard/edit-ship-form.tsx
+++ b/src/app/harbor/shipyard/edit-ship-form.tsx
@@ -202,7 +202,6 @@ export default function EditShipForm({
 
         <Button
           className={`${buttonVariants({ variant: 'destructive' })} ml-auto`}
-          onClick={handleDelete}
           disabled={deleting}
         >
           {deleting ? <Icon glyph="more" /> : <Icon glyph="forbidden" />}

From 245a5f8cb26f9c7c45a6649cda495f624eb4f19f Mon Sep 17 00:00:00 2001
From: spectralo <arthur.hardy@mageekbox.net>
Date: Wed, 13 Nov 2024 21:53:39 +0100
Subject: [PATCH 3/3] this should work now

---
 src/app/harbor/shipyard/edit-ship-form.tsx | 54 +++++++++++-----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/app/harbor/shipyard/edit-ship-form.tsx b/src/app/harbor/shipyard/edit-ship-form.tsx
index 20b34fbc..8bdf77bb 100644
--- a/src/app/harbor/shipyard/edit-ship-form.tsx
+++ b/src/app/harbor/shipyard/edit-ship-form.tsx
@@ -200,32 +200,34 @@ export default function EditShipForm({
           Save edits
         </Button>
 
-        <Button
-          className={`${buttonVariants({ variant: 'destructive' })} ml-auto`}
-          disabled={deleting}
-        >
-          {deleting ? <Icon glyph="more" /> : <Icon glyph="forbidden" />}
-          <Dialog>
-            <DialogTrigger>Delete Ship</DialogTrigger>
-            <DialogContent>
-              <DialogHeader>
-                <DialogTitle>Are you absolutely sure?</DialogTitle>
-                <DialogDescription>
-                  This action cannot be undone.
-                </DialogDescription>
-                <DialogFooter>
-                  <Button
-                    type="submit"
-                    variant="secondary"
-                    onClick={handleDelete}
-                  >
-                    I'm sure! Delete it.
-                  </Button>
-                </DialogFooter>
-              </DialogHeader>
-            </DialogContent>
-          </Dialog>
-        </Button>
+        <Dialog>
+          <DialogTrigger>
+            <Button
+              className={`${buttonVariants({ variant: 'destructive' })} ml-auto`}
+              disabled={deleting}
+            >
+              {deleting ? <Icon glyph="more" /> : <Icon glyph="forbidden" />}
+              Delete ship
+            </Button>
+          </DialogTrigger>
+          <DialogContent>
+            <DialogHeader>
+              <DialogTitle>Are you absolutely sure?</DialogTitle>
+              <DialogDescription>
+                This action cannot be undone.
+              </DialogDescription>
+              <DialogFooter>
+                <Button
+                  type="submit"
+                  variant="secondary"
+                  onClick={handleDelete}
+                >
+                  I'm sure! Delete it.
+                </Button>
+              </DialogFooter>
+            </DialogHeader>
+          </DialogContent>
+        </Dialog>
       </div>
     </form>
   )