diff --git a/src/frontend/src/views/DefaultView.vue b/src/frontend/src/views/DefaultView.vue index 5d756ec..7c8ca92 100644 --- a/src/frontend/src/views/DefaultView.vue +++ b/src/frontend/src/views/DefaultView.vue @@ -40,27 +40,3 @@ function apiData(){ - - - - \ No newline at end of file diff --git a/src/server/auth/auth.go b/src/server/auth/auth.go index c37b798..588ba38 100644 --- a/src/server/auth/auth.go +++ b/src/server/auth/auth.go @@ -10,10 +10,9 @@ import ( ) type RegisterInput struct { - Email string `json:"email" validate:"required,email"` - Password string `json:"password" validate:"required"` - Name string `json:"name" validate:"required"` - Directorate int `json:"directorate" validate:"required"` + Email string `json:"email" validate:"required,email"` + Password string `json:"password" validate:"required"` + Name string `json:"name" validate:"required"` } type LoginInput struct { @@ -74,13 +73,13 @@ func Register(c *gin.Context, pg *gorm.DB) { hashedPassword := HashPassword(input.Password) u := db.User{ - Email: input.Email, - Password: hashedPassword, - Name: input.Name, - DirectorateRefer: input.Directorate, + Email: input.Email, + Password: hashedPassword, + Name: input.Name, } - u.SaveUser(pg, &u) + user, _ := u.SaveUser(pg, &u) + println(user) token, _ := GenerateToken(uint(u.ID), u.Role) diff --git a/src/server/db/setupPostgres.go b/src/server/db/setupPostgres.go index f03730d..b693844 100644 --- a/src/server/db/setupPostgres.go +++ b/src/server/db/setupPostgres.go @@ -1,6 +1,8 @@ package db import ( + "fmt" + "gorm.io/driver/postgres" "gorm.io/gorm" ) @@ -54,21 +56,67 @@ type Sensor struct { CoordY float32 } -func SetupPostgres() *gorm.DB { +func SetupPostgres() (*gorm.DB, error) { dsn := "host=postgres user=username password=password dbname=postgres port=5432 sslmode=disable TimeZone=America/Sao_Paulo" db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) if err != nil { - panic("failed to connect database") + return nil, err + } + + err = db.AutoMigrate(&Sensor{}) + if err != nil { + return nil, err + } + err = db.AutoMigrate(&Props{}) + if err != nil { + return nil, err + } + err = db.AutoMigrate(&Elements{}) + if err != nil { + return nil, err + } + err = db.AutoMigrate(&Layout{}) + if err != nil { + return nil, err + } + err = db.AutoMigrate(&Directorate{}) + if err != nil { + return nil, err + } + err = db.AutoMigrate(&User{}) + if err != nil { + return nil, err + } + + directorate := Directorate{ + ID: 1, + Directorate: "Default", + } + db.Create(&directorate) + + props := Props{ + ID: 1, + Value: "w-full", + } + db.Create(&props) + + elements := [2]Elements{ + { + ID: 1, + Name: "MainChart", + PropsRefer: 1, + }, + { + ID: 2, + Name: "HeatMap", + PropsRefer: 1, + }, } + db.Create(&elements) - db.AutoMigrate(&Sensor{}) - db.AutoMigrate(&Props{}) - db.AutoMigrate(&Elements{}) - db.AutoMigrate(&Layout{}) - db.AutoMigrate(&Directorate{}) - db.AutoMigrate(&User{}) + fmt.Println("Inicialização do banco de dados concluída") - return db + return db, nil }