From c98f093e28fe0d79e1a1c29bc77aadfe6e427ea9 Mon Sep 17 00:00:00 2001 From: Alder Whiteford Date: Fri, 8 Dec 2023 11:03:12 -0500 Subject: [PATCH] Formatting Fixes --- .metals/metals.log | 2 +- .vscode/settings.json | 2 +- backend/schema/schema.go | 2 +- .../src/components/Jobs/JobInfoGridCell.tsx | 2 +- frontend/src/components/Jobs/JobStatusTag.tsx | 2 +- .../Jobs/ProducerJobs/JobViewProducer.tsx | 22 +++++++++---------- go.mod | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.metals/metals.log b/.metals/metals.log index dc8bf19..9d9a779 100644 --- a/.metals/metals.log +++ b/.metals/metals.log @@ -1,3 +1,3 @@ 2023.12.08 09:05:29 INFO Started: Metals version 1.1.0 in folders '/Users/alderwhiteford/Code Projects/voxeti' for client Visual Studio Code 1.84.2. 2023.12.08 09:05:39 WARN Build server is not auto-connectable. -2023.12.08 09:05:39 WARN no build tool detected in workspace '/Users/alderwhiteford/Code Projects/voxeti'. The most common cause for this problem is that the editor was opened in the wrong working directory, for example if you use sbt then the workspace directory should contain build.sbt. +2023.12.08 09:05:39 WARN no build tool detected in workspace '/Users/alderwhiteford/Code Projects/voxeti'. The most common cause for this problem is that the editor was opened in the wrong working directory, for example if you use sbt then the workspace directory should contain build.sbt. diff --git a/.vscode/settings.json b/.vscode/settings.json index e72490f..b36e70a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,4 +2,4 @@ "files.watcherExclude": { "**/target": true } -} \ No newline at end of file +} diff --git a/backend/schema/schema.go b/backend/schema/schema.go index ad0cfd2..29a53d6 100644 --- a/backend/schema/schema.go +++ b/backend/schema/schema.go @@ -41,7 +41,7 @@ type Job struct { Price int `bson:"price,omitempty" json:"price"` Shipping int `bson:"shipping,omitempty" json:"shipping"` Taxes int `bson:"taxes,omitempty" json:"taxes"` - Tracking string `bson:"tracking,omitempty" json:"tracking"` + Tracking string `bson:"tracking,omitempty" json:"tracking"` Color string `bson:"color,omitempty" json:"color"` Filament FilamentType `bson:"filament,omitempty" json:"filament"` LayerHeight float64 `bson:"layerHeight,omitempty" json:"layerHeight"` diff --git a/frontend/src/components/Jobs/JobInfoGridCell.tsx b/frontend/src/components/Jobs/JobInfoGridCell.tsx index 2845731..d1a69c0 100644 --- a/frontend/src/components/Jobs/JobInfoGridCell.tsx +++ b/frontend/src/components/Jobs/JobInfoGridCell.tsx @@ -16,4 +16,4 @@ const GridItem = ({ title, children } : GridItemProps) => { ) } -export { GridItem } \ No newline at end of file +export { GridItem } diff --git a/frontend/src/components/Jobs/JobStatusTag.tsx b/frontend/src/components/Jobs/JobStatusTag.tsx index 86a1ca4..07ee163 100644 --- a/frontend/src/components/Jobs/JobStatusTag.tsx +++ b/frontend/src/components/Jobs/JobStatusTag.tsx @@ -19,4 +19,4 @@ export default function JobStatusTag({ status } : JobStatusTagProps) { {infoMappings[status].title} ) -} \ No newline at end of file +} diff --git a/frontend/src/components/Jobs/ProducerJobs/JobViewProducer.tsx b/frontend/src/components/Jobs/ProducerJobs/JobViewProducer.tsx index b83baa5..e633a0b 100644 --- a/frontend/src/components/Jobs/ProducerJobs/JobViewProducer.tsx +++ b/frontend/src/components/Jobs/ProducerJobs/JobViewProducer.tsx @@ -129,7 +129,7 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) { const statusNum = statusOrder[status] const complete = (statusNum < statusOrder[jobState as JobStatus]) || (status === 'INSHIPPING' && (tracking || job?.tracking)) const incomplete = statusNum > statusOrder[jobState as JobStatus] - + return (

@@ -147,8 +147,8 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) { disabled={incomplete || status === 'COMPLETE'} > {(loading && jobState === status) - ? - : complete + ? + : complete ? <> Completed @@ -242,7 +242,7 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) { {job?.shippingAddress.city}, {job?.shippingAddress.state} ) - + return (
@@ -263,12 +263,12 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) {
{jobState === 'ACCEPTED' ? - : trackingOpen + : trackingOpen ? : <> } - - -