Formatting Fixes

GenerateNU · Dec 8, 2023 · c98f093 · c98f093
1 parent 16ffd3f
commit c98f093
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git 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
@@ -2,4 +2,4 @@
   "files.watcherExclude": {
     "**/target": true
   }
-}
+}
diff --git 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
@@ -16,4 +16,4 @@ const GridItem = ({ title, children } : GridItemProps) => {
   )
 }
 
-export { GridItem }
+export { GridItem }
diff --git 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}
       </div>
   )
-}
+}
diff --git 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 (
       <section className='pt-10 pb-10 flex flex-col md:flex-row justify-between md:items-center gap-y-5'>
         <h2 className='text-md'>
@@ -147,8 +147,8 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) {
           disabled={incomplete || status === 'COMPLETE'}
         >
           {(loading && jobState === status)
-            ? <CircularProgress /> 
-            : complete 
+            ? <CircularProgress />
+            : complete
               ? <>
                   Completed
                   <CheckIcon sx={{ marginLeft: '10px'}}/>
@@ -242,7 +242,7 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) {
       {job?.shippingAddress.city}, {job?.shippingAddress.state}
     </>
   )
-  
+
   return (
     <div>
       <div className='text-2xl mt-10 mb-10 flex flex-col md:flex-row gap-x-2'>
@@ -263,12 +263,12 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) {
       <div className='relative'>
         {jobState === 'ACCEPTED' ?
           <JobConfirmModal />
-          : trackingOpen 
+          : trackingOpen
             ? <JobTrackingNumberModal />
             : <></>
         }
-        <ActionBar 
-          title='1. Print' 
+        <ActionBar
+          title='1. Print'
           description='Print the requested items.'
           buttonText='Mark Complete'
           status={'INPROGRESS'}
@@ -277,8 +277,8 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) {
         <Divider
           className='!m-0'
         />
-        <ActionBar 
-          title='2. Ship' 
+        <ActionBar
+          title='2. Ship'
           description='Package the items and drop them off at post office.'
           status='INSHIPPING'
           buttonText='Add Tracking'
@@ -287,8 +287,8 @@ export default function JobViewProducer({ jobId } : JobViewProducerProps) {
         <Divider
           className='!m-0'
         />
-        <ActionBar 
-          title='3. Deliver' 
+        <ActionBar
+          title='3. Deliver'
           buttonText='Complete'
           description='Your work is done! When this order has been delivered, the job will automatically be marked complete.'
           status='COMPLETE'

diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/labstack/echo/v4 v4.11.1
 	github.com/pterm/pterm v0.12.66
 	github.com/stretchr/testify v1.8.4
+	github.com/stripe/stripe-go/v76 v76.5.0
 	go.mongodb.org/mongo-driver v1.12.1
 	golang.org/x/crypto v0.13.0
 	googlemaps.github.io/maps v1.5.0
@@ -29,7 +30,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/stripe/stripe-go/v76 v76.5.0 // indirect
 	github.com/sagikazarmark/locafero v0.3.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ @@
       "files.watcherExclude": {
         "**/target": true
       }
-    }
+    }