From 6f024f347fd0df5be7190b19f25a9c3c020c23b0 Mon Sep 17 00:00:00 2001 From: Tom Victor Date: Tue, 20 Feb 2024 20:00:27 +0100 Subject: [PATCH 1/2] add static files --- go.mod | 3 ++- go.sum | 4 ++++ main.go | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5c9ff77..b3654c6 100644 --- a/go.mod +++ b/go.mod @@ -16,9 +16,10 @@ require ( github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gin-contrib/static v1.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.17.0 // indirect + github.com/go-playground/validator/v10 v10.18.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect diff --git a/go.sum b/go.sum index e64f887..9ceab9d 100644 --- a/go.sum +++ b/go.sum @@ -19,6 +19,8 @@ github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKv github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-contrib/static v1.1.0 h1:MMVoe+sAwMbt1rqH91C48LAmmBn9tuVJInaT5b/64OI= +github.com/gin-contrib/static v1.1.0/go.mod h1:41ymO4uaFIGCy1kco0PBunNbvXeesKsyPR9TnVKR1BQ= github.com/gin-gonic/contrib v0.0.0-20221130124618-7e01895a63f2 h1:dyuNlYlG1faymw39NdJddnzJICy6587tiGSVioWhYoE= github.com/gin-gonic/contrib v0.0.0-20221130124618-7e01895a63f2/go.mod h1:iqneQ2Df3omzIVTkIfn7c1acsVnMGiSLn4XF5Blh3Yg= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= @@ -31,6 +33,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74= github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.18.0 h1:BvolUXjp4zuvkZ5YN5t7ebzbhlUtPsPm2S9NAZ5nl9U= +github.com/go-playground/validator/v10 v10.18.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= diff --git a/main.go b/main.go index 8ba9c0b..d638151 100644 --- a/main.go +++ b/main.go @@ -7,6 +7,7 @@ import ( "github.com/buildfromzero/skill-map/managers" "github.com/buildfromzero/skill-map/storage" "github.com/gin-contrib/cors" + "github.com/gin-contrib/static" "github.com/gin-gonic/gin" ) @@ -21,6 +22,10 @@ func main() { router.Use(cors.Default()) + router.Use(static.Serve("/", static.LocalFile("frontend/build", false))) + router.Use(static.Serve("/users", static.LocalFile("frontend/build", false))) + router.Use(static.Serve("/skills", static.LocalFile("frontend/build", false))) + userManger := managers.NewUserManager() userHandler := handlers.NewUserHandlerFrom(userManger) userHandler.RegisterUserApis(router) From de5ee05211cab7c152ba46fc097d5d96bd3be9a5 Mon Sep 17 00:00:00 2001 From: Tom Victor Date: Wed, 21 Feb 2024 15:53:24 +0100 Subject: [PATCH 2/2] update docs --- README.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e671272..b7b7a07 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,21 @@ # skill-map - ## Part 1 - Initial setup and server setup -* [YouTube Tutorial Link](https://youtu.be/pHtohACmyj8?si=JwZHSdzFwHd8uAMB) -* [Source Code Link](https://github.com/Buildfromzero/skill-map/tree/v0.0.1) - + +- [YouTube Tutorial Link](https://youtu.be/pHtohACmyj8?si=JwZHSdzFwHd8uAMB) +- [Source Code Link](https://github.com/Buildfromzero/skill-map/tree/v0.0.1) + ## Part 2 - User creation and project structure -* [YouTube Tutorial Link](https://www.youtube.com/watch?v=Bu3FZobGnHY) -* [Source Code Link](https://github.com/Buildfromzero/skill-map/tree/v0.0.2) - +- [YouTube Tutorial Link](https://www.youtube.com/watch?v=Bu3FZobGnHY) +- [Source Code Link](https://github.com/Buildfromzero/skill-map/tree/v0.0.2) + ## Part 3 - User CRUD operations and refctoring -* [YouTube Tutorial Link](https://www.youtube.com/watch?v=rvFzZmuiR6A) -* [Source Code link](https://github.com/Buildfromzero/skill-map/tree/v0.0.3) - +- [YouTube Tutorial Link](https://www.youtube.com/watch?v=rvFzZmuiR6A) +- [Source Code link](https://github.com/Buildfromzero/skill-map/tree/v0.0.3) + +## Part 4 - Frontend Integration and CORS fix + +- [YouTube Tutorial Link](https://youtu.be/nMyF2Rh1mnI?si=XCqgkgzwESBs77ek) +- [Source Code link](https://github.com/Buildfromzero/skill-map/tree/v0.0.4)