From 34b0cc4199fb030ace8517135c1a25bf16c8ff93 Mon Sep 17 00:00:00 2001 From: Hayden Hargreaves Date: Thu, 13 Nov 2025 21:38:47 -0700 Subject: [PATCH] (FEAT): Translated the first API. Auth is next... --- internal/app/server/recipe_handler_v2.go | 30 +++ internal/app/server/server.go | 9 +- internal/domain/server/routes.go | 47 ++-- web/package-lock.json | 280 +++++++++++++++++++++++ web/package.json | 1 + web/src/pages/Home.tsx | 22 +- web/src/services/recipeService.ts | 19 ++ web/src/types/api/error.ts | 16 ++ web/src/types/api/recipe.ts | 7 + 9 files changed, 405 insertions(+), 26 deletions(-) create mode 100644 internal/app/server/recipe_handler_v2.go create mode 100644 web/src/services/recipeService.ts create mode 100644 web/src/types/api/error.ts create mode 100644 web/src/types/api/recipe.ts diff --git a/internal/app/server/recipe_handler_v2.go b/internal/app/server/recipe_handler_v2.go new file mode 100644 index 0000000..986ea2c --- /dev/null +++ b/internal/app/server/recipe_handler_v2.go @@ -0,0 +1,30 @@ +package server + +import ( + "fmt" + "net/http" + + "github.com/gin-gonic/gin" +) + + +func (s *Server) GetRecipeOfTheWeekHandler(ctx *gin.Context) { + // BUG: This needs to be different + userId := 1 + + recipe, err := s.deps.RecipeService.GetRecipeOfTheWeek(&userId) + + if err != nil { + ctx.JSON(http.StatusBadRequest, gin.H{ + "status": http.StatusBadRequest, + "message": fmt.Sprintf("[ERROR] Failed to get recipe of the week. %s\n", err.Error()), + }) + return + } + + ctx.JSON(http.StatusOK, gin.H{ + "status": http.StatusOK, + "message": "[OK] Successfully retrieved recipe of the week.\n", + "recipe": recipe, + }) +} diff --git a/internal/app/server/server.go b/internal/app/server/server.go index 3e8f85f..0e1bcee 100644 --- a/internal/app/server/server.go +++ b/internal/app/server/server.go @@ -126,7 +126,8 @@ func (s *Server) Setup() *Server { s.Router.GET("/", func(ctx *gin.Context) { ctx.Redirect(http.StatusSeeOther, domain.WEB_HOME) }) // Wrap all routes with a version - router_v1 := s.Router.Group(domain.VERSION) + router_v1 := s.Router.Group(domain.VERSION_1) + router_v2 := s.Router.Group(domain.VERSION_2) // Domain specific routers router_web := router_v1.Group(domain.WEB) @@ -179,7 +180,7 @@ func (s *Server) Setup() *Server { path := ctx.Request.URL.Path // TODO: Use constants for errors? - if strings.HasPrefix(path, domain.VERSION+domain.API) { + if strings.HasPrefix(path, domain.VERSION_1+domain.API) { ctx.JSON(http.StatusNotFound, gin.H{ "status": http.StatusNotFound, "error": "API_NOT_FOUND", @@ -192,5 +193,9 @@ func (s *Server) Setup() *Server { ctx.Redirect(http.StatusSeeOther, domain.WEB_NOT_FOUND) }) + // ---- VERSION 2 ROUTES ---- // + router_api_v2 := router_v2.Group(domain.API) + router_api_v2.GET("/recipe/of-the-week", s.GetRecipeOfTheWeekHandler) + return s } diff --git a/internal/domain/server/routes.go b/internal/domain/server/routes.go index 19053ce..94c4525 100644 --- a/internal/domain/server/routes.go +++ b/internal/domain/server/routes.go @@ -1,36 +1,37 @@ package domain // Sub-routes -const VERSION = "/v1" +const VERSION_1 = "/v1" +const VERSION_2 = "/v2" const WEB = "/web" const API = "/api" const STATE = "/state" // Web prefixed routes -const WEB_LOGIN = VERSION + WEB + "/login" -const WEB_INDEX = VERSION + WEB -const WEB_HOME = VERSION + WEB + "/home" -const WEB_FAVORITES = VERSION + WEB + "/favorites" -const WEB_CREATE = VERSION + WEB + "/create" -const WEB_PROFIlE = VERSION + WEB + "/profile" -const WEB_LIST = VERSION + WEB + "/list" -const WEB_RECIPE = VERSION + WEB + "/recipe/%d" -const WEB_SEARCH = VERSION + WEB + "/search" -const WEB_NOT_FOUND = VERSION + WEB + "/404" +const WEB_LOGIN = VERSION_1 + WEB + "/login" +const WEB_INDEX = VERSION_1 + WEB +const WEB_HOME = VERSION_1 + WEB + "/home" +const WEB_FAVORITES = VERSION_1 + WEB + "/favorites" +const WEB_CREATE = VERSION_1 + WEB + "/create" +const WEB_PROFIlE = VERSION_1 + WEB + "/profile" +const WEB_LIST = VERSION_1 + WEB + "/list" +const WEB_RECIPE = VERSION_1 + WEB + "/recipe/%d" +const WEB_SEARCH = VERSION_1 + WEB + "/search" +const WEB_NOT_FOUND = VERSION_1 + WEB + "/404" // API prefixed routes -const API_AUTH_LOGIN = VERSION + API + "/auth/login" -const API_AUTH_CALLBACK = VERSION + API + "/auth/callback" -const API_AUTH_LOGOUT = VERSION + API + "/auth/logout" -const API_CREATE_RECIPE = VERSION + API + "/recipe" -const API_SEARCH_RECIPES = VERSION + API + "/recipe/search" -const API_SEARCH_FAVORITES = VERSION + API + "/recipe/search/favorites" +const API_AUTH_LOGIN = VERSION_1 + API + "/auth/login" +const API_AUTH_CALLBACK = VERSION_1 + API + "/auth/callback" +const API_AUTH_LOGOUT = VERSION_1 + API + "/auth/logout" +const API_CREATE_RECIPE = VERSION_1 + API + "/recipe" +const API_SEARCH_RECIPES = VERSION_1 + API + "/recipe/search" +const API_SEARCH_FAVORITES = VERSION_1 + API + "/recipe/search/favorites" -const API_ENGAGEMENT_VIEW = VERSION + API + "/engagement/view/%d" -const API_ENGAGEMENT_SHARE = VERSION + API + "/engagement/share/%d" -const API_ENGAGEMENT_FAVORITE = VERSION + API + "/engagement/favorite/%d" -const API_ENGAGEMENT_MAKE = VERSION + API + "/engagement/make/%d" +const API_ENGAGEMENT_VIEW = VERSION_1 + API + "/engagement/view/%d" +const API_ENGAGEMENT_SHARE = VERSION_1 + API + "/engagement/share/%d" +const API_ENGAGEMENT_FAVORITE = VERSION_1 + API + "/engagement/favorite/%d" +const API_ENGAGEMENT_MAKE = VERSION_1 + API + "/engagement/make/%d" // State prefixed routes -const STATE_TAGS_CREATE = VERSION + WEB + STATE + "/tags" -const STATE_TAGS_DELETE = VERSION + WEB + STATE + "/tags/delete" +const STATE_TAGS_CREATE = VERSION_1 + WEB + STATE + "/tags" +const STATE_TAGS_DELETE = VERSION_1 + WEB + STATE + "/tags/delete" diff --git a/web/package-lock.json b/web/package-lock.json index 8e01754..aeabb28 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "dependencies": { "@tailwindcss/vite": "^4.1.16", + "axios": "^1.13.2", "eslint-plugin-react-dom": "^2.2.4", "eslint-plugin-react-x": "^2.2.4", "react": "^19.1.1", @@ -1963,6 +1964,23 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "license": "Python-2.0" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/axios": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", + "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.4", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1997,6 +2015,19 @@ "node": ">=8" } }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -2040,6 +2071,18 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/compare-versions": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz", @@ -2105,6 +2148,15 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "license": "MIT" }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/detect-libc": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", @@ -2114,6 +2166,20 @@ "node": ">=8" } }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/enhanced-resolve": { "version": "5.18.3", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", @@ -2127,6 +2193,51 @@ "node": ">=10.13.0" } }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/esbuild": { "version": "0.25.11", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.11.tgz", @@ -2518,6 +2629,42 @@ "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "license": "ISC" }, + "node_modules/follow-redirects": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2532,6 +2679,52 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -2557,6 +2750,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -2579,6 +2784,45 @@ "node": ">=8" } }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -3004,6 +3248,15 @@ "@jridgewell/sourcemap-codec": "^1.5.5" } }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3026,6 +3279,27 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3200,6 +3474,12 @@ "node": ">= 0.8.0" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/web/package.json b/web/package.json index abd2666..407b256 100644 --- a/web/package.json +++ b/web/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.1.16", + "axios": "^1.13.2", "eslint-plugin-react-dom": "^2.2.4", "eslint-plugin-react-x": "^2.2.4", "react": "^19.1.1", diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index db9bc38..576cd14 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useEffect, useEffectEvent, useState } from "react"; import SalmonVideo from "../assets/videos/salmon_video.mp4"; import Banner from "../components/Banner"; import ROUTE_CONSTANTS from "../types/routes"; @@ -8,6 +8,8 @@ import type { Recipe } from "../types/recipe"; import RecipeCardSmall from "../components/cards/RecipeCardSmall"; import ContentCardSmall from "../components/cards/ContentCardSmall"; import RecipeSearchBar from "../components/inputs/RecipeSearchBar"; +import { GetRecipeOfTheWeek } from "../services/recipeService"; +import { isApiError, type ApiError } from "../types/api/error"; export default function Home() { const [loggedIn, isLoggedIn] = useState(false); @@ -16,6 +18,8 @@ export default function Home() { const [madeRecipes, setMadeRecipes] = useState([]); const [viewedRecipes, setViewedRecipes] = useState([]); + const [error, setError] = useState(""); + // BUG: Remove these useEffect(() => { @@ -105,6 +109,22 @@ export default function Home() { setViewedRecipes(recipes); }, []); + useEffect(() => { + async function fetch() { + const result: Recipe | ApiError = await GetRecipeOfTheWeek(); + if (isApiError(result)) { + setError(result.message); + return; + } + setRecipeOfTheWeek(result); + } + void fetch(); + }, []); + + useEffect(() => { + console.error(error); + }, [error]); + return ( <> {/* Intro Section */} diff --git a/web/src/services/recipeService.ts b/web/src/services/recipeService.ts new file mode 100644 index 0000000..c9e4690 --- /dev/null +++ b/web/src/services/recipeService.ts @@ -0,0 +1,19 @@ +import axios from "axios"; +import type { GetRecipeOfTheWeekResponse } from "../types/api/recipe"; +import type { Recipe } from "../types/recipe"; +import type { ApiError } from "../types/api/error"; + + +export async function GetRecipeOfTheWeek (): Promise { + const response = await axios.get("http://localhost:3000/v2/api/recipe/of-the-week"); + + if (response.status !== 200 || response.data.recipe === undefined) { + const err: ApiError = { + status: response.data.status, + message: response.data.message + }; + return err; + } + + return response.data.recipe; +} diff --git a/web/src/types/api/error.ts b/web/src/types/api/error.ts new file mode 100644 index 0000000..0878ac0 --- /dev/null +++ b/web/src/types/api/error.ts @@ -0,0 +1,16 @@ + +export function isApiError(obj: unknown): obj is ApiError { + return ( + typeof obj === "object" && + obj !== null && + "status" in obj && + typeof (obj as { status?: unknown }).status === "number" && + "message" in obj && + typeof (obj as { message?: unknown }).message === "string" + ); +} + +export interface ApiError { + status: number; + message: string; +} diff --git a/web/src/types/api/recipe.ts b/web/src/types/api/recipe.ts new file mode 100644 index 0000000..fda35ff --- /dev/null +++ b/web/src/types/api/recipe.ts @@ -0,0 +1,7 @@ +import type { Recipe } from "../recipe"; + +export interface GetRecipeOfTheWeekResponse { + status: number; + message: string; + recipe?: Recipe; +}