From 4aa6d1feddeaf27cf88e3de31cdeaabbc0e85b3c Mon Sep 17 00:00:00 2001 From: darius Date: Wed, 13 Mar 2024 13:28:06 +0100 Subject: [PATCH] reformat van backend naar fullstack --- .../{docker-image.yml => Deploy-docker.yml} | 10 ++++---- .../{portfolio-backend.iml => portfolio.iml} | 0 api/handler/mainHandler.go | 25 ------------------- {api => backend/api}/handler/errorHandlers.go | 0 backend/api/handler/mainHandler.go | 11 ++++++++ .../api}/handler/projectHandler.go | 0 {api => backend/api}/handler/userHandler.go | 4 +-- {database => backend/database}/database.go | 2 +- {database => backend/database}/ent/client.go | 8 +++--- {database => backend/database}/ent/ent.go | 6 ++--- .../database}/ent/enttest/enttest.go | 6 ++--- .../database}/ent/generate.go | 0 .../database}/ent/hook/hook.go | 2 +- .../database}/ent/migrate/migrate.go | 0 .../database}/ent/migrate/schema.go | 0 .../database}/ent/mutation.go | 8 +++--- .../database}/ent/predicate/predicate.go | 0 {database => backend/database}/ent/project.go | 4 +-- .../database}/ent/project/project.go | 0 .../database}/ent/project/where.go | 2 +- .../database}/ent/project_create.go | 4 +-- .../database}/ent/project_delete.go | 4 +-- .../database}/ent/project_query.go | 6 ++--- .../database}/ent/project_update.go | 6 ++--- {database => backend/database}/ent/runtime.go | 4 +-- .../database}/ent/runtime/runtime.go | 2 +- .../database}/ent/schema/project.go | 0 .../database}/ent/schema/team.go | 0 .../database}/ent/schema/user.go | 0 {database => backend/database}/ent/team.go | 2 +- .../database}/ent/team/team.go | 0 .../database}/ent/team/where.go | 2 +- .../database}/ent/team_create.go | 6 ++--- .../database}/ent/team_delete.go | 4 +-- .../database}/ent/team_query.go | 8 +++--- .../database}/ent/team_update.go | 8 +++--- {database => backend/database}/ent/tx.go | 0 {database => backend/database}/ent/user.go | 2 +- .../database}/ent/user/user.go | 0 .../database}/ent/user/where.go | 2 +- .../database}/ent/user_create.go | 4 +-- .../database}/ent/user_delete.go | 4 +-- .../database}/ent/user_query.go | 6 ++--- .../database}/ent/user_update.go | 6 ++--- .../database}/query/userQuery.go | 6 ++--- go.mod | 2 +- main.go | 4 +-- 47 files changed, 83 insertions(+), 97 deletions(-) rename .github/workflows/{docker-image.yml => Deploy-docker.yml} (79%) rename .idea/{portfolio-backend.iml => portfolio.iml} (100%) delete mode 100644 api/handler/mainHandler.go rename {api => backend/api}/handler/errorHandlers.go (100%) create mode 100644 backend/api/handler/mainHandler.go rename {api => backend/api}/handler/projectHandler.go (100%) rename {api => backend/api}/handler/userHandler.go (91%) rename {database => backend/database}/database.go (94%) rename {database => backend/database}/ent/client.go (99%) rename {database => backend/database}/ent/ent.go (99%) rename {database => backend/database}/ent/enttest/enttest.go (93%) rename {database => backend/database}/ent/generate.go (100%) rename {database => backend/database}/ent/hook/hook.go (99%) rename {database => backend/database}/ent/migrate/migrate.go (100%) rename {database => backend/database}/ent/migrate/schema.go (100%) rename {database => backend/database}/ent/mutation.go (99%) rename {database => backend/database}/ent/predicate/predicate.go (100%) rename {database => backend/database}/ent/project.go (98%) rename {database => backend/database}/ent/project/project.go (100%) rename {database => backend/database}/ent/project/where.go (99%) rename {database => backend/database}/ent/project_create.go (98%) rename {database => backend/database}/ent/project_delete.go (96%) rename {database => backend/database}/ent/project_query.go (99%) rename {database => backend/database}/ent/project_update.go (98%) rename {database => backend/database}/ent/runtime.go (86%) rename {database => backend/database}/ent/runtime/runtime.go (80%) rename {database => backend/database}/ent/schema/project.go (100%) rename {database => backend/database}/ent/schema/team.go (100%) rename {database => backend/database}/ent/schema/user.go (100%) rename {database => backend/database}/ent/team.go (99%) rename {database => backend/database}/ent/team/team.go (100%) rename {database => backend/database}/ent/team/where.go (99%) rename {database => backend/database}/ent/team_create.go (98%) rename {database => backend/database}/ent/team_delete.go (96%) rename {database => backend/database}/ent/team_query.go (99%) rename {database => backend/database}/ent/team_update.go (98%) rename {database => backend/database}/ent/tx.go (100%) rename {database => backend/database}/ent/user.go (99%) rename {database => backend/database}/ent/user/user.go (100%) rename {database => backend/database}/ent/user/where.go (99%) rename {database => backend/database}/ent/user_create.go (98%) rename {database => backend/database}/ent/user_delete.go (96%) rename {database => backend/database}/ent/user_query.go (99%) rename {database => backend/database}/ent/user_update.go (98%) rename {database => backend/database}/query/userQuery.go (85%) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/Deploy-docker.yml similarity index 79% rename from .github/workflows/docker-image.yml rename to .github/workflows/Deploy-docker.yml index a4ccf53..577d885 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/Deploy-docker.yml @@ -1,4 +1,4 @@ -name: build and run backend +name: build and deploy portfolio on: push: @@ -21,9 +21,9 @@ jobs: - name: Docker login run: docker login docker.kleinwizard.nl -u Darius -p ${{ secrets.DOCKER_PASSWORD }} - name: Build the Docker image - run: docker build . --file Dockerfile --tag docker.kleinwizard.nl/portfolio-backend:latest + run: docker build . --file Dockerfile --tag docker.kleinwizard.nl/portfolio:latest - name: Docker push - run: docker push docker.kleinwizard.nl/portfolio-backend:latest + run: docker push docker.kleinwizard.nl/portfolio:latest publish: @@ -38,6 +38,6 @@ jobs: - name: Docker login run: docker login docker.kleinwizard.nl -u Darius -p ${{ secrets.DOCKER_PASSWORD }} - name: Docker pull - run: docker pull docker.kleinwizard.nl/portfolio-backend + run: docker pull docker.kleinwizard.nl/portfolio - name: Docker run - run: docker run --rm -d -p 4002:4002 --name portfolioApi docker.kleinwizard.nl/portfolio-backend + run: docker run --rm -d -p 4002:4002 --name portfolioApi docker.kleinwizard.nl/portfolio diff --git a/.idea/portfolio-backend.iml b/.idea/portfolio.iml similarity index 100% rename from .idea/portfolio-backend.iml rename to .idea/portfolio.iml diff --git a/api/handler/mainHandler.go b/api/handler/mainHandler.go deleted file mode 100644 index 006c31a..0000000 --- a/api/handler/mainHandler.go +++ /dev/null @@ -1,25 +0,0 @@ -package handler - -import "net/http" - -func CatchAllHandler(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusGone) - _, err := w.Write([]byte("Bad endpoint")) - if err != nil { - InternalServerErrorHandler(w, r) - } -} - -func TestHandler(w http.ResponseWriter, r *http.Request) { - _, err := w.Write([]byte("test")) - if err != nil { - InternalServerErrorHandler(w, r) - } -} - -func Test2Handler(w http.ResponseWriter, r *http.Request) { - _, err := w.Write([]byte("test2")) - if err != nil { - InternalServerErrorHandler(w, r) - } -} diff --git a/api/handler/errorHandlers.go b/backend/api/handler/errorHandlers.go similarity index 100% rename from api/handler/errorHandlers.go rename to backend/api/handler/errorHandlers.go diff --git a/backend/api/handler/mainHandler.go b/backend/api/handler/mainHandler.go new file mode 100644 index 0000000..6b3ebf0 --- /dev/null +++ b/backend/api/handler/mainHandler.go @@ -0,0 +1,11 @@ +package handler + +import "net/http" + +func CatchAllHandler(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusGone) + _, err := w.Write([]byte("Bad endpoint")) + if err != nil { + InternalServerErrorHandler(w, r) + } +} diff --git a/api/handler/projectHandler.go b/backend/api/handler/projectHandler.go similarity index 100% rename from api/handler/projectHandler.go rename to backend/api/handler/projectHandler.go diff --git a/api/handler/userHandler.go b/backend/api/handler/userHandler.go similarity index 91% rename from api/handler/userHandler.go rename to backend/api/handler/userHandler.go index 9dc2506..de5094f 100644 --- a/api/handler/userHandler.go +++ b/backend/api/handler/userHandler.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "net/http" - "portfolio-backend/database/ent" - "portfolio-backend/database/query" + "portfolio/backend/database/ent" + "portfolio/backend/database/query" "strconv" ) diff --git a/database/database.go b/backend/database/database.go similarity index 94% rename from database/database.go rename to backend/database/database.go index 76ea172..5afa1b6 100644 --- a/database/database.go +++ b/backend/database/database.go @@ -5,7 +5,7 @@ import ( "github.com/joho/godotenv" "log" "os" - "portfolio-backend/database/ent" + "portfolio/backend/database/ent" _ "github.com/go-sql-driver/mysql" ) diff --git a/database/ent/client.go b/backend/database/ent/client.go similarity index 99% rename from database/ent/client.go rename to backend/database/ent/client.go index 45a4b11..73c876f 100644 --- a/database/ent/client.go +++ b/backend/database/ent/client.go @@ -9,11 +9,11 @@ import ( "log" "reflect" - "portfolio-backend/database/ent/migrate" + "portfolio/backend/database/ent/migrate" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "entgo.io/ent" "entgo.io/ent/dialect" diff --git a/database/ent/ent.go b/backend/database/ent/ent.go similarity index 99% rename from database/ent/ent.go rename to backend/database/ent/ent.go index eb6f3ca..eedd443 100644 --- a/database/ent/ent.go +++ b/backend/database/ent/ent.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "reflect" "sync" diff --git a/database/ent/enttest/enttest.go b/backend/database/ent/enttest/enttest.go similarity index 93% rename from database/ent/enttest/enttest.go rename to backend/database/ent/enttest/enttest.go index 8aea551..de627f9 100644 --- a/database/ent/enttest/enttest.go +++ b/backend/database/ent/enttest/enttest.go @@ -4,11 +4,11 @@ package enttest import ( "context" - "portfolio-backend/database/ent" + "portfolio/backend/database/ent" // required by schema hooks. - _ "portfolio-backend/database/ent/runtime" + _ "portfolio/backend/database/ent/runtime" - "portfolio-backend/database/ent/migrate" + "portfolio/backend/database/ent/migrate" "entgo.io/ent/dialect/sql/schema" ) diff --git a/database/ent/generate.go b/backend/database/ent/generate.go similarity index 100% rename from database/ent/generate.go rename to backend/database/ent/generate.go diff --git a/database/ent/hook/hook.go b/backend/database/ent/hook/hook.go similarity index 99% rename from database/ent/hook/hook.go rename to backend/database/ent/hook/hook.go index 56eaa66..88010fc 100644 --- a/database/ent/hook/hook.go +++ b/backend/database/ent/hook/hook.go @@ -5,7 +5,7 @@ package hook import ( "context" "fmt" - "portfolio-backend/database/ent" + "portfolio/backend/database/ent" ) // The ProjectFunc type is an adapter to allow the use of ordinary diff --git a/database/ent/migrate/migrate.go b/backend/database/ent/migrate/migrate.go similarity index 100% rename from database/ent/migrate/migrate.go rename to backend/database/ent/migrate/migrate.go diff --git a/database/ent/migrate/schema.go b/backend/database/ent/migrate/schema.go similarity index 100% rename from database/ent/migrate/schema.go rename to backend/database/ent/migrate/schema.go diff --git a/database/ent/mutation.go b/backend/database/ent/mutation.go similarity index 99% rename from database/ent/mutation.go rename to backend/database/ent/mutation.go index c2913e8..f542828 100644 --- a/database/ent/mutation.go +++ b/backend/database/ent/mutation.go @@ -6,10 +6,10 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "sync" "entgo.io/ent" diff --git a/database/ent/predicate/predicate.go b/backend/database/ent/predicate/predicate.go similarity index 100% rename from database/ent/predicate/predicate.go rename to backend/database/ent/predicate/predicate.go diff --git a/database/ent/project.go b/backend/database/ent/project.go similarity index 98% rename from database/ent/project.go rename to backend/database/ent/project.go index a9ca534..3a39202 100644 --- a/database/ent/project.go +++ b/backend/database/ent/project.go @@ -4,8 +4,8 @@ package ent import ( "fmt" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" "strings" "entgo.io/ent" diff --git a/database/ent/project/project.go b/backend/database/ent/project/project.go similarity index 100% rename from database/ent/project/project.go rename to backend/database/ent/project/project.go diff --git a/database/ent/project/where.go b/backend/database/ent/project/where.go similarity index 99% rename from database/ent/project/where.go rename to backend/database/ent/project/where.go index 946fb3a..02fa3de 100644 --- a/database/ent/project/where.go +++ b/backend/database/ent/project/where.go @@ -3,7 +3,7 @@ package project import ( - "portfolio-backend/database/ent/predicate" + "portfolio/backend/database/ent/predicate" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/project_create.go b/backend/database/ent/project_create.go similarity index 98% rename from database/ent/project_create.go rename to backend/database/ent/project_create.go index 452be84..3c6e345 100644 --- a/database/ent/project_create.go +++ b/backend/database/ent/project_create.go @@ -6,8 +6,8 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" diff --git a/database/ent/project_delete.go b/backend/database/ent/project_delete.go similarity index 96% rename from database/ent/project_delete.go rename to backend/database/ent/project_delete.go index 80118ea..62ed726 100644 --- a/database/ent/project_delete.go +++ b/backend/database/ent/project_delete.go @@ -4,8 +4,8 @@ package ent import ( "context" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/project" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/project" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/project_query.go b/backend/database/ent/project_query.go similarity index 99% rename from database/ent/project_query.go rename to backend/database/ent/project_query.go index 6a34782..09e708e 100644 --- a/database/ent/project_query.go +++ b/backend/database/ent/project_query.go @@ -6,9 +6,9 @@ import ( "context" "fmt" "math" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/project_update.go b/backend/database/ent/project_update.go similarity index 98% rename from database/ent/project_update.go rename to backend/database/ent/project_update.go index 8f9690f..409aff9 100644 --- a/database/ent/project_update.go +++ b/backend/database/ent/project_update.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/runtime.go b/backend/database/ent/runtime.go similarity index 86% rename from database/ent/runtime.go rename to backend/database/ent/runtime.go index 0a81043..85fddb7 100644 --- a/database/ent/runtime.go +++ b/backend/database/ent/runtime.go @@ -3,8 +3,8 @@ package ent import ( - "portfolio-backend/database/ent/schema" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/schema" + "portfolio/backend/database/ent/user" ) // The init function reads all schema descriptors with runtime code diff --git a/database/ent/runtime/runtime.go b/backend/database/ent/runtime/runtime.go similarity index 80% rename from database/ent/runtime/runtime.go rename to backend/database/ent/runtime/runtime.go index a14c7ef..2faaba5 100644 --- a/database/ent/runtime/runtime.go +++ b/backend/database/ent/runtime/runtime.go @@ -2,7 +2,7 @@ package runtime -// The schema-stitching logic is generated in portfolio-backend/database/ent/runtime.go +// The schema-stitching logic is generated in portfolio/backend/database/ent/runtime.go const ( Version = "v0.13.0" // Version of ent codegen. diff --git a/database/ent/schema/project.go b/backend/database/ent/schema/project.go similarity index 100% rename from database/ent/schema/project.go rename to backend/database/ent/schema/project.go diff --git a/database/ent/schema/team.go b/backend/database/ent/schema/team.go similarity index 100% rename from database/ent/schema/team.go rename to backend/database/ent/schema/team.go diff --git a/database/ent/schema/user.go b/backend/database/ent/schema/user.go similarity index 100% rename from database/ent/schema/user.go rename to backend/database/ent/schema/user.go diff --git a/database/ent/team.go b/backend/database/ent/team.go similarity index 99% rename from database/ent/team.go rename to backend/database/ent/team.go index 98d7c00..9e55f01 100644 --- a/database/ent/team.go +++ b/backend/database/ent/team.go @@ -4,7 +4,7 @@ package ent import ( "fmt" - "portfolio-backend/database/ent/team" + "portfolio/backend/database/ent/team" "strings" "entgo.io/ent" diff --git a/database/ent/team/team.go b/backend/database/ent/team/team.go similarity index 100% rename from database/ent/team/team.go rename to backend/database/ent/team/team.go diff --git a/database/ent/team/where.go b/backend/database/ent/team/where.go similarity index 99% rename from database/ent/team/where.go rename to backend/database/ent/team/where.go index 7932f1f..5194934 100644 --- a/database/ent/team/where.go +++ b/backend/database/ent/team/where.go @@ -3,7 +3,7 @@ package team import ( - "portfolio-backend/database/ent/predicate" + "portfolio/backend/database/ent/predicate" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/team_create.go b/backend/database/ent/team_create.go similarity index 98% rename from database/ent/team_create.go rename to backend/database/ent/team_create.go index 4b78967..8f94ebc 100644 --- a/database/ent/team_create.go +++ b/backend/database/ent/team_create.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" diff --git a/database/ent/team_delete.go b/backend/database/ent/team_delete.go similarity index 96% rename from database/ent/team_delete.go rename to backend/database/ent/team_delete.go index 190572b..4ec3d90 100644 --- a/database/ent/team_delete.go +++ b/backend/database/ent/team_delete.go @@ -4,8 +4,8 @@ package ent import ( "context" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/team" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/team" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/team_query.go b/backend/database/ent/team_query.go similarity index 99% rename from database/ent/team_query.go rename to backend/database/ent/team_query.go index 21406fa..48f277b 100644 --- a/database/ent/team_query.go +++ b/backend/database/ent/team_query.go @@ -7,10 +7,10 @@ import ( "database/sql/driver" "fmt" "math" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/team_update.go b/backend/database/ent/team_update.go similarity index 98% rename from database/ent/team_update.go rename to backend/database/ent/team_update.go index 986d7f2..a34b677 100644 --- a/database/ent/team_update.go +++ b/backend/database/ent/team_update.go @@ -6,10 +6,10 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/project" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/project" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/tx.go b/backend/database/ent/tx.go similarity index 100% rename from database/ent/tx.go rename to backend/database/ent/tx.go diff --git a/database/ent/user.go b/backend/database/ent/user.go similarity index 99% rename from database/ent/user.go rename to backend/database/ent/user.go index 5741312..6b1d779 100644 --- a/database/ent/user.go +++ b/backend/database/ent/user.go @@ -4,7 +4,7 @@ package ent import ( "fmt" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/user" "strings" "entgo.io/ent" diff --git a/database/ent/user/user.go b/backend/database/ent/user/user.go similarity index 100% rename from database/ent/user/user.go rename to backend/database/ent/user/user.go diff --git a/database/ent/user/where.go b/backend/database/ent/user/where.go similarity index 99% rename from database/ent/user/where.go rename to backend/database/ent/user/where.go index 9b4ae6c..84f265d 100644 --- a/database/ent/user/where.go +++ b/backend/database/ent/user/where.go @@ -3,7 +3,7 @@ package user import ( - "portfolio-backend/database/ent/predicate" + "portfolio/backend/database/ent/predicate" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/user_create.go b/backend/database/ent/user_create.go similarity index 98% rename from database/ent/user_create.go rename to backend/database/ent/user_create.go index 4279492..8325b6f 100644 --- a/database/ent/user_create.go +++ b/backend/database/ent/user_create.go @@ -6,8 +6,8 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" diff --git a/database/ent/user_delete.go b/backend/database/ent/user_delete.go similarity index 96% rename from database/ent/user_delete.go rename to backend/database/ent/user_delete.go index 7c3ae9d..dff98c9 100644 --- a/database/ent/user_delete.go +++ b/backend/database/ent/user_delete.go @@ -4,8 +4,8 @@ package ent import ( "context" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/user_query.go b/backend/database/ent/user_query.go similarity index 99% rename from database/ent/user_query.go rename to backend/database/ent/user_query.go index 7eaff23..b55ee69 100644 --- a/database/ent/user_query.go +++ b/backend/database/ent/user_query.go @@ -7,9 +7,9 @@ import ( "database/sql/driver" "fmt" "math" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/ent/user_update.go b/backend/database/ent/user_update.go similarity index 98% rename from database/ent/user_update.go rename to backend/database/ent/user_update.go index fdab1a1..aaaaf68 100644 --- a/database/ent/user_update.go +++ b/backend/database/ent/user_update.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "portfolio-backend/database/ent/predicate" - "portfolio-backend/database/ent/team" - "portfolio-backend/database/ent/user" + "portfolio/backend/database/ent/predicate" + "portfolio/backend/database/ent/team" + "portfolio/backend/database/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" diff --git a/database/query/userQuery.go b/backend/database/query/userQuery.go similarity index 85% rename from database/query/userQuery.go rename to backend/database/query/userQuery.go index fda36dd..518001c 100644 --- a/database/query/userQuery.go +++ b/backend/database/query/userQuery.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "log" - "portfolio-backend/database" - "portfolio-backend/database/ent" - "portfolio-backend/database/ent/user" + "portfolio/backend/database" + "portfolio/backend/database/ent" + "portfolio/backend/database/ent/user" ) func GetUser(ctx context.Context, id int) (*ent.User, error) { diff --git a/go.mod b/go.mod index 205a5d8..90307a9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module portfolio-backend +module portfolio go 1.22 diff --git a/main.go b/main.go index 7abfe13..8b032da 100644 --- a/main.go +++ b/main.go @@ -2,8 +2,8 @@ package main import ( "net/http" - "portfolio-backend/api/handler" - "portfolio-backend/database" + "portfolio/backend/api/handler" + "portfolio/backend/database" ) func main() {