Merge branch 'main' into home-page-button-updates

GenerateNU · Dec 8, 2023 · 8a8322d · 8a8322d
2 parents 911ca35 + 1e20e6f
commit 8a8322d
Show file tree

Hide file tree

Showing 71 changed files with 10,788 additions and 5,786 deletions.
diff --git a/Makefile b/Makefile
@@ -18,6 +18,11 @@ backend-dev: db-dev
 backend-dev-reset: db-dev
 	wgo -exit clear :: go run -tags dev . -db mongodb://administrator:[email protected]:27017 -reset
 
+# Start the backend dev server but connect to cloud database
+.PHONY: backend-dev-cloud
+backend-dev-cloud:
+	wgo -exit clear :: go run -tags dev . -db mongodb+srv://administrator:[email protected]/?retryWrites=true&w=majority
+
 # Start the dev database
 .PHONY: db-dev
 db-dev:

diff --git a/backend/schema/schema.go b/backend/schema/schema.go
@@ -41,6 +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"`
 	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/package.json b/frontend/package.json
@@ -17,6 +17,7 @@
     "@mui/icons-material": "^5.14.14",
     "@mui/material": "^5.14.13",
     "@radix-ui/react-slot": "^1.0.2",
+    "@react-google-maps/api": "^2.19.2",
     "@react-oauth/google": "^0.11.1",
     "@reduxjs/toolkit": "^1.9.7",
     "@stripe/react-stripe-js": "^2.4.0",