diff --git a/api/Dockerfile b/api/Dockerfile index 7f9a59a..3167a95 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -4,7 +4,7 @@ FROM golang:latest # Set the working directory to /app WORKDIR . # Copy the current directory contents into the container at /app -COPY .. . +COPY . . # Download and install any required dependencies RUN go mod download @@ -19,4 +19,4 @@ RUN go generate ./database/ent EXPOSE 4002 # Define the command to run the app when the container starts -CMD ["./portfolio"] \ No newline at end of file +CMD ["./portfolio_api"] \ No newline at end of file diff --git a/api/api/apiRoutes.go b/api/api/apiRoutes.go index 5ba8f1c..d3dd25f 100644 --- a/api/api/apiRoutes.go +++ b/api/api/apiRoutes.go @@ -2,7 +2,7 @@ package api import ( "net/http" - "portfolio/api/handler" + "portfolio_api/api/handler" ) func ApiRoutes(mux **http.ServeMux) { diff --git a/api/api/handler/authHandler.go b/api/api/handler/authHandler.go index 1720e57..08fa251 100644 --- a/api/api/handler/authHandler.go +++ b/api/api/handler/authHandler.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" "net/http" - "portfolio/database/ent" - "portfolio/database/ent/user" - "portfolio/database/query" - "portfolio/service/bcrypt" + "portfolio_api/database/ent" + "portfolio_api/database/ent/user" + "portfolio_api/database/query" + "portfolio_api/service/bcrypt" ) func Login(w http.ResponseWriter, r *http.Request) { diff --git a/api/api/handler/userHandler.go b/api/api/handler/userHandler.go index c3fa915..46baab1 100644 --- a/api/api/handler/userHandler.go +++ b/api/api/handler/userHandler.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" "net/http" - "portfolio/database/ent" - "portfolio/database/ent/user" - "portfolio/database/query" - "portfolio/service/validate" + "portfolio_api/database/ent" + "portfolio_api/database/ent/user" + "portfolio_api/database/query" + "portfolio_api/service/validate" "strconv" ) diff --git a/api/api/webHandler/projectpageHandler.go b/api/api/webHandler/projectpageHandler.go index a60221a..4394770 100644 --- a/api/api/webHandler/projectpageHandler.go +++ b/api/api/webHandler/projectpageHandler.go @@ -3,7 +3,7 @@ package webHandler import ( "html/template" "net/http" - "portfolio/types" + "portfolio_api/types" ) func InitProjectpage(w http.ResponseWriter, r *http.Request) { diff --git a/api/api/webRoutes.go b/api/api/webRoutes.go index 51e52ee..9f47950 100644 --- a/api/api/webRoutes.go +++ b/api/api/webRoutes.go @@ -2,7 +2,7 @@ package api import ( "net/http" - "portfolio/api/webHandler" + "portfolio_api/api/webHandler" ) func WebRoutes(mux **http.ServeMux) { diff --git a/api/database/database.go b/api/database/database.go index e42c20c..4572692 100644 --- a/api/database/database.go +++ b/api/database/database.go @@ -4,7 +4,7 @@ import ( "context" "log" "os" - "portfolio/database/ent" + "portfolio_api/database/ent" _ "github.com/go-sql-driver/mysql" ) diff --git a/api/database/ent/client.go b/api/database/ent/client.go index 92fd80f..367f790 100644 --- a/api/database/ent/client.go +++ b/api/database/ent/client.go @@ -9,11 +9,11 @@ import ( "log" "reflect" - "portfolio/database/ent/migrate" + "portfolio_api/database/ent/migrate" - "portfolio/database/ent/project" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "entgo.io/ent" "entgo.io/ent/dialect" diff --git a/api/database/ent/ent.go b/api/database/ent/ent.go index 2abb050..d2b465a 100644 --- a/api/database/ent/ent.go +++ b/api/database/ent/ent.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/project" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "reflect" "sync" diff --git a/api/database/ent/enttest/enttest.go b/api/database/ent/enttest/enttest.go index 2a174da..8d17e90 100644 --- a/api/database/ent/enttest/enttest.go +++ b/api/database/ent/enttest/enttest.go @@ -4,11 +4,11 @@ package enttest import ( "context" - "portfolio/database/ent" + "portfolio_api/database/ent" // required by schema hooks. - _ "portfolio/database/ent/runtime" + _ "portfolio_api/database/ent/runtime" - "portfolio/database/ent/migrate" + "portfolio_api/database/ent/migrate" "entgo.io/ent/dialect/sql/schema" ) diff --git a/api/database/ent/hook/hook.go b/api/database/ent/hook/hook.go index da8a03a..b1b1b2e 100644 --- a/api/database/ent/hook/hook.go +++ b/api/database/ent/hook/hook.go @@ -5,7 +5,7 @@ package hook import ( "context" "fmt" - "portfolio/database/ent" + "portfolio_api/database/ent" ) // The ProjectFunc type is an adapter to allow the use of ordinary diff --git a/api/database/ent/mutation.go b/api/database/ent/mutation.go index 52457af..80b4147 100644 --- a/api/database/ent/mutation.go +++ b/api/database/ent/mutation.go @@ -6,10 +6,10 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/predicate" - "portfolio/database/ent/project" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "sync" "entgo.io/ent" diff --git a/api/database/ent/project.go b/api/database/ent/project.go index 3a61870..c980ed6 100644 --- a/api/database/ent/project.go +++ b/api/database/ent/project.go @@ -4,8 +4,8 @@ package ent import ( "fmt" - "portfolio/database/ent/project" - "portfolio/database/ent/team" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" "strings" "entgo.io/ent" diff --git a/api/database/ent/project/where.go b/api/database/ent/project/where.go index 5952c71..fb5457a 100644 --- a/api/database/ent/project/where.go +++ b/api/database/ent/project/where.go @@ -3,7 +3,7 @@ package project import ( - "portfolio/database/ent/predicate" + "portfolio_api/database/ent/predicate" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/project_create.go b/api/database/ent/project_create.go index ccfdd5d..9d60d69 100644 --- a/api/database/ent/project_create.go +++ b/api/database/ent/project_create.go @@ -6,8 +6,8 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/project" - "portfolio/database/ent/team" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" diff --git a/api/database/ent/project_delete.go b/api/database/ent/project_delete.go index 9767d18..a677223 100644 --- a/api/database/ent/project_delete.go +++ b/api/database/ent/project_delete.go @@ -4,8 +4,8 @@ package ent import ( "context" - "portfolio/database/ent/predicate" - "portfolio/database/ent/project" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/project" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/project_query.go b/api/database/ent/project_query.go index 90c3973..ffad626 100644 --- a/api/database/ent/project_query.go +++ b/api/database/ent/project_query.go @@ -6,9 +6,9 @@ import ( "context" "fmt" "math" - "portfolio/database/ent/predicate" - "portfolio/database/ent/project" - "portfolio/database/ent/team" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/project_update.go b/api/database/ent/project_update.go index 8a4d106..49b4b72 100644 --- a/api/database/ent/project_update.go +++ b/api/database/ent/project_update.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/predicate" - "portfolio/database/ent/project" - "portfolio/database/ent/team" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/team.go b/api/database/ent/team.go index 7065b97..dbc2571 100644 --- a/api/database/ent/team.go +++ b/api/database/ent/team.go @@ -4,7 +4,7 @@ package ent import ( "fmt" - "portfolio/database/ent/team" + "portfolio_api/database/ent/team" "strings" "entgo.io/ent" diff --git a/api/database/ent/team/where.go b/api/database/ent/team/where.go index 2afd533..1ad8bc9 100644 --- a/api/database/ent/team/where.go +++ b/api/database/ent/team/where.go @@ -3,7 +3,7 @@ package team import ( - "portfolio/database/ent/predicate" + "portfolio_api/database/ent/predicate" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/team_create.go b/api/database/ent/team_create.go index aa0215f..9d74ddd 100644 --- a/api/database/ent/team_create.go +++ b/api/database/ent/team_create.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/project" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" diff --git a/api/database/ent/team_delete.go b/api/database/ent/team_delete.go index 60426f8..6a4e441 100644 --- a/api/database/ent/team_delete.go +++ b/api/database/ent/team_delete.go @@ -4,8 +4,8 @@ package ent import ( "context" - "portfolio/database/ent/predicate" - "portfolio/database/ent/team" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/team" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/team_query.go b/api/database/ent/team_query.go index 6677676..662808f 100644 --- a/api/database/ent/team_query.go +++ b/api/database/ent/team_query.go @@ -7,10 +7,10 @@ import ( "database/sql/driver" "fmt" "math" - "portfolio/database/ent/predicate" - "portfolio/database/ent/project" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/team_update.go b/api/database/ent/team_update.go index cc73b63..00ff46f 100644 --- a/api/database/ent/team_update.go +++ b/api/database/ent/team_update.go @@ -6,10 +6,10 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/predicate" - "portfolio/database/ent/project" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/project" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/user.go b/api/database/ent/user.go index 2e21fd0..4188b61 100644 --- a/api/database/ent/user.go +++ b/api/database/ent/user.go @@ -4,7 +4,7 @@ package ent import ( "fmt" - "portfolio/database/ent/user" + "portfolio_api/database/ent/user" "strings" "entgo.io/ent" diff --git a/api/database/ent/user/where.go b/api/database/ent/user/where.go index ce3e0ac..be89974 100644 --- a/api/database/ent/user/where.go +++ b/api/database/ent/user/where.go @@ -3,7 +3,7 @@ package user import ( - "portfolio/database/ent/predicate" + "portfolio_api/database/ent/predicate" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/user_create.go b/api/database/ent/user_create.go index 9fd5373..aad8a04 100644 --- a/api/database/ent/user_create.go +++ b/api/database/ent/user_create.go @@ -6,8 +6,8 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" diff --git a/api/database/ent/user_delete.go b/api/database/ent/user_delete.go index a9db6d2..ac3dce8 100644 --- a/api/database/ent/user_delete.go +++ b/api/database/ent/user_delete.go @@ -4,8 +4,8 @@ package ent import ( "context" - "portfolio/database/ent/predicate" - "portfolio/database/ent/user" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/user_query.go b/api/database/ent/user_query.go index 3c72800..daeffeb 100644 --- a/api/database/ent/user_query.go +++ b/api/database/ent/user_query.go @@ -7,9 +7,9 @@ import ( "database/sql/driver" "fmt" "math" - "portfolio/database/ent/predicate" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/ent/user_update.go b/api/database/ent/user_update.go index 102082f..8a9cc36 100644 --- a/api/database/ent/user_update.go +++ b/api/database/ent/user_update.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio/database/ent/predicate" - "portfolio/database/ent/team" - "portfolio/database/ent/user" + "portfolio_api/database/ent/predicate" + "portfolio_api/database/ent/team" + "portfolio_api/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/api/database/query/authQuery.go b/api/database/query/authQuery.go index d6b5b55..5273522 100644 --- a/api/database/query/authQuery.go +++ b/api/database/query/authQuery.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "log" - "portfolio/database" - "portfolio/database/ent" - "portfolio/database/ent/user" + "portfolio_api/database" + "portfolio_api/database/ent" + "portfolio_api/database/ent/user" ) func GetLogin(ctx context.Context, name string) (*ent.User, error) { diff --git a/api/database/query/userQuery.go b/api/database/query/userQuery.go index 813e0be..8e5592f 100644 --- a/api/database/query/userQuery.go +++ b/api/database/query/userQuery.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "log" - "portfolio/database" - "portfolio/database/ent" - "portfolio/database/ent/user" + "portfolio_api/database" + "portfolio_api/database/ent" + "portfolio_api/database/ent/user" ) func GetUser(ctx context.Context, id int) (*ent.User, error) { diff --git a/api/go.mod b/api/go.mod index 0ebe29f..553fc81 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module portfolio +module portfolio_api go 1.22 diff --git a/api/main.go b/api/main.go index b20fa96..adb26a4 100644 --- a/api/main.go +++ b/api/main.go @@ -4,8 +4,8 @@ import ( "github.com/joho/godotenv" "log" "net/http" - api2 "portfolio/api" - "portfolio/database" + api2 "portfolio_api/api" + "portfolio_api/database" ) func main() { @@ -15,7 +15,7 @@ func main() { log.Fatalf(".env not found: %v", err) return } - print("test") + // Create a new request multiplexer // Take incoming requests and dispatch them to the matching webHandler mux := http.NewServeMux() diff --git a/api/service/validate/validateUser.go b/api/service/validate/validateUser.go index e994f5c..9d6983c 100644 --- a/api/service/validate/validateUser.go +++ b/api/service/validate/validateUser.go @@ -1,7 +1,7 @@ package validate import ( - "portfolio/database/ent" + "portfolio_api/database/ent" ) func UserIsValid(u *ent.User) bool {