Skip to content

Commit 338e546

Browse files
committed
Fix ship logic
1 parent e0330b7 commit 338e546

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

src/routes/dashboard/projects/[id]/ship/+page.svelte

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
let editorUploadFile = $state(null);
1919
let modelFile = $state(null);
2020
let submitAsClub = $state(
21-
END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip) && data.clubMembership
21+
END_DATE <= new Date() &&
22+
(data.project.status === 'building' || data.lastIsClubsShip) &&
23+
data.clubMembership
2224
? true
2325
: false
2426
);
@@ -190,17 +192,23 @@
190192
<div class="themed-box flex flex-col gap-2 p-3">
191193
<label
192194
class="flex items-center gap-2"
193-
class:opacity-50={END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip)}
194-
class:cursor-pointer={!(END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip))}
195-
class:cursor-not-allowed={END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip)}
195+
class:opacity-50={END_DATE <= new Date() &&
196+
(data.project.status === 'building' || data.lastIsClubsShip)}
197+
class:cursor-pointer={!(
198+
END_DATE <= new Date() &&
199+
(data.project.status === 'building' || data.lastIsClubsShip)
200+
)}
201+
class:cursor-not-allowed={END_DATE <= new Date() &&
202+
(data.project.status === 'building' || data.lastIsClubsShip)}
196203
>
197204
<input
198205
type="radio"
199206
name="submission_type"
200207
value="individual"
201208
checked={!submitAsClub}
202209
onchange={() => (submitAsClub = false)}
203-
disabled={END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip)}
210+
disabled={END_DATE <= new Date() &&
211+
(data.project.status === 'building' || data.lastIsClubsShip)}
204212
class="radio"
205213
/>
206214
<span>Individual submission</span>
@@ -289,7 +297,9 @@
289297
!printablesUrl ||
290298
!hasEditorFile ||
291299
!modelFile ||
292-
(!submitAsClub && END_DATE <= new Date())}
300+
(END_DATE <= new Date() &&
301+
!submitAsClub &&
302+
(data.project.status === 'building' || data.lastIsClubsShip))}
293303
>
294304
<Ship />
295305
Ship

0 commit comments

Comments
 (0)