mirror of
https://github.com/ForFarmTeam/ForFarm.git
synced 2025-12-19 14:04:08 +01:00
Merge pull request #3 from ForFarmTeam/feature-farm-setup
Add Farm API for Farm setup
This commit is contained in:
commit
b3b9e82ea5
@ -11,6 +11,7 @@ require (
|
|||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/jackc/pgx/v5 v5.7.2
|
github.com/jackc/pgx/v5 v5.7.2
|
||||||
github.com/joho/godotenv v1.5.1
|
github.com/joho/godotenv v1.5.1
|
||||||
|
github.com/lib/pq v1.10.9
|
||||||
github.com/pressly/goose/v3 v3.24.1
|
github.com/pressly/goose/v3 v3.24.1
|
||||||
github.com/spf13/cobra v1.8.1
|
github.com/spf13/cobra v1.8.1
|
||||||
github.com/spf13/viper v1.19.0
|
github.com/spf13/viper v1.19.0
|
||||||
|
|||||||
@ -46,6 +46,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
|||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
|
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||||
|
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
|
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
|
||||||
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
|
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||||
|
|||||||
@ -23,6 +23,7 @@ type api struct {
|
|||||||
httpClient *http.Client
|
httpClient *http.Client
|
||||||
|
|
||||||
userRepo domain.UserRepository
|
userRepo domain.UserRepository
|
||||||
|
farmRepo domain.FarmRepository
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAPI(ctx context.Context, logger *slog.Logger, pool *pgxpool.Pool) *api {
|
func NewAPI(ctx context.Context, logger *slog.Logger, pool *pgxpool.Pool) *api {
|
||||||
@ -30,12 +31,14 @@ func NewAPI(ctx context.Context, logger *slog.Logger, pool *pgxpool.Pool) *api {
|
|||||||
client := &http.Client{}
|
client := &http.Client{}
|
||||||
|
|
||||||
userRepository := repository.NewPostgresUser(pool)
|
userRepository := repository.NewPostgresUser(pool)
|
||||||
|
farmRepository := repository.NewPostgresFarm(pool)
|
||||||
|
|
||||||
return &api{
|
return &api{
|
||||||
logger: logger,
|
logger: logger,
|
||||||
httpClient: client,
|
httpClient: client,
|
||||||
|
|
||||||
userRepo: userRepository,
|
userRepo: userRepository,
|
||||||
|
farmRepo: farmRepository,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,6 +73,7 @@ func (a *api) Routes() *chi.Mux {
|
|||||||
router.Group(func(r chi.Router) {
|
router.Group(func(r chi.Router) {
|
||||||
api.UseMiddleware(m.AuthMiddleware(api))
|
api.UseMiddleware(m.AuthMiddleware(api))
|
||||||
a.registerHelloRoutes(r, api)
|
a.registerHelloRoutes(r, api)
|
||||||
|
a.registerFarmRoutes(r, api)
|
||||||
})
|
})
|
||||||
|
|
||||||
return router
|
return router
|
||||||
|
|||||||
138
backend/internal/api/farm.go
Normal file
138
backend/internal/api/farm.go
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/danielgtaylor/huma/v2"
|
||||||
|
"github.com/forfarm/backend/internal/domain"
|
||||||
|
"github.com/go-chi/chi/v5"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (a *api) registerFarmRoutes(_ chi.Router, api huma.API) {
|
||||||
|
tags := []string{"farm"}
|
||||||
|
prefix := "/farm"
|
||||||
|
|
||||||
|
huma.Register(api, huma.Operation{
|
||||||
|
OperationID: "createFarm",
|
||||||
|
Method: http.MethodPost,
|
||||||
|
Path: prefix,
|
||||||
|
Tags: tags,
|
||||||
|
}, a.createFarmHandler)
|
||||||
|
|
||||||
|
huma.Register(api, huma.Operation{
|
||||||
|
OperationID: "getFarmsByOwner",
|
||||||
|
Method: http.MethodGet,
|
||||||
|
Path: prefix + "/owner/{owner_id}",
|
||||||
|
Tags: tags,
|
||||||
|
}, a.getFarmsByOwnerHandler)
|
||||||
|
|
||||||
|
huma.Register(api, huma.Operation{
|
||||||
|
OperationID: "getFarmByID",
|
||||||
|
Method: http.MethodGet,
|
||||||
|
Path: prefix + "/{farm_id}",
|
||||||
|
Tags: tags,
|
||||||
|
}, a.getFarmByIDHandler)
|
||||||
|
|
||||||
|
huma.Register(api, huma.Operation{
|
||||||
|
OperationID: "deleteFarm",
|
||||||
|
Method: http.MethodDelete,
|
||||||
|
Path: prefix + "/{farm_id}",
|
||||||
|
Tags: tags,
|
||||||
|
}, a.deleteFarmHandler)
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateFarmInput struct {
|
||||||
|
Header string `header:"Authorization" required:"true" example:"Bearer token"`
|
||||||
|
Body struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Lat []float64 `json:"lat"`
|
||||||
|
Lon []float64 `json:"lon"`
|
||||||
|
OwnerID string `json:"owner_id"`
|
||||||
|
PlantTypes []uuid.UUID `json:"plant_types"`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateFarmOutput struct {
|
||||||
|
Body struct {
|
||||||
|
UUID string `json:"uuid"`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *api) createFarmHandler(ctx context.Context, input *CreateFarmInput) (*CreateFarmOutput, error) {
|
||||||
|
farm := &domain.Farm{
|
||||||
|
Name: input.Body.Name,
|
||||||
|
Lat: input.Body.Lat,
|
||||||
|
Lon: input.Body.Lon,
|
||||||
|
OwnerID: input.Body.OwnerID,
|
||||||
|
PlantTypes: input.Body.PlantTypes,
|
||||||
|
}
|
||||||
|
|
||||||
|
err := a.farmRepo.CreateOrUpdate(ctx, farm)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &CreateFarmOutput{Body: struct {
|
||||||
|
UUID string `json:"uuid"`
|
||||||
|
}{UUID: farm.UUID}}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFarmsByOwnerInput struct {
|
||||||
|
Header string `header:"Authorization" required:"true" example:"Bearer token"`
|
||||||
|
OwnerID string `path:"owner_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFarmsByOwnerOutput struct {
|
||||||
|
Body []domain.Farm
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *api) getFarmsByOwnerHandler(ctx context.Context, input *GetFarmsByOwnerInput) (*GetFarmsByOwnerOutput, error) {
|
||||||
|
farms, err := a.farmRepo.GetByOwnerID(ctx, input.OwnerID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &GetFarmsByOwnerOutput{Body: farms}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFarmByIDInput struct {
|
||||||
|
Header string `header:"Authorization" required:"true" example:"Bearer token"`
|
||||||
|
FarmID string `path:"farm_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetFarmByIDOutput struct {
|
||||||
|
Body domain.Farm
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *api) getFarmByIDHandler(ctx context.Context, input *GetFarmByIDInput) (*GetFarmByIDOutput, error) {
|
||||||
|
farm, err := a.farmRepo.GetByID(ctx, input.FarmID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &GetFarmByIDOutput{Body: farm}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type DeleteFarmInput struct {
|
||||||
|
Header string `header:"Authorization" required:"true" example:"Bearer token"`
|
||||||
|
FarmID string `path:"farm_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type DeleteFarmOutput struct {
|
||||||
|
Body struct {
|
||||||
|
Message string `json:"message"`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *api) deleteFarmHandler(ctx context.Context, input *DeleteFarmInput) (*DeleteFarmOutput, error) {
|
||||||
|
err := a.farmRepo.Delete(ctx, input.FarmID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &DeleteFarmOutput{Body: struct {
|
||||||
|
Message string `json:"message"`
|
||||||
|
}{Message: "Farm deleted successfully"}}, nil
|
||||||
|
}
|
||||||
@ -2,19 +2,20 @@ package domain
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"time"
|
|
||||||
|
|
||||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Farm struct {
|
type Farm struct {
|
||||||
UUID string
|
UUID string
|
||||||
Name string
|
Name string
|
||||||
Lat float64
|
Lat []float64
|
||||||
Lon float64
|
Lon []float64
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
OwnerID string
|
OwnerID string
|
||||||
|
PlantTypes []uuid.UUID
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *Farm) Validate() error {
|
func (f *Farm) Validate() error {
|
||||||
@ -28,6 +29,7 @@ func (f *Farm) Validate() error {
|
|||||||
|
|
||||||
type FarmRepository interface {
|
type FarmRepository interface {
|
||||||
GetByID(context.Context, string) (Farm, error)
|
GetByID(context.Context, string) (Farm, error)
|
||||||
|
GetByOwnerID(context.Context, string) ([]Farm, error)
|
||||||
CreateOrUpdate(context.Context, *Farm) error
|
CreateOrUpdate(context.Context, *Farm) error
|
||||||
Delete(context.Context, string) error
|
Delete(context.Context, string) error
|
||||||
}
|
}
|
||||||
|
|||||||
51
backend/internal/domain/plant.go
Normal file
51
backend/internal/domain/plant.go
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
package domain
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Plant struct {
|
||||||
|
UUID string
|
||||||
|
Name string
|
||||||
|
Variety *string
|
||||||
|
RowSpacing *float64
|
||||||
|
OptimalTemp *float64
|
||||||
|
PlantingDepth *float64
|
||||||
|
AverageHeight *float64
|
||||||
|
LightProfileID int
|
||||||
|
SoilConditionID int
|
||||||
|
PlantingDetail *string
|
||||||
|
IsPerennial bool
|
||||||
|
DaysToEmerge *int
|
||||||
|
DaysToFlower *int
|
||||||
|
DaysToMaturity *int
|
||||||
|
HarvestWindow *int
|
||||||
|
PHValue *float64
|
||||||
|
EstimateLossRate *float64
|
||||||
|
EstimateRevenuePerHU *float64
|
||||||
|
HarvestUnitID int
|
||||||
|
WaterNeeds *float64
|
||||||
|
CreatedAt time.Time
|
||||||
|
UpdatedAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Plant) Validate() error {
|
||||||
|
return validation.ValidateStruct(p,
|
||||||
|
validation.Field(&p.UUID, validation.Required),
|
||||||
|
validation.Field(&p.Name, validation.Required),
|
||||||
|
validation.Field(&p.LightProfileID, validation.Required),
|
||||||
|
validation.Field(&p.SoilConditionID, validation.Required),
|
||||||
|
validation.Field(&p.HarvestUnitID, validation.Required),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
type PlantRepository interface {
|
||||||
|
GetByUUID(context.Context, string) (Plant, error)
|
||||||
|
GetAll(context.Context) ([]Plant, error)
|
||||||
|
Create(context.Context, *Plant) error
|
||||||
|
Update(context.Context, *Plant) error
|
||||||
|
Delete(context.Context, string) error
|
||||||
|
}
|
||||||
@ -2,11 +2,10 @@ package repository
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
|
|
||||||
"github.com/forfarm/backend/internal/domain"
|
"github.com/forfarm/backend/internal/domain"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"github.com/lib/pq"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type postgresFarmRepository struct {
|
type postgresFarmRepository struct {
|
||||||
@ -27,6 +26,7 @@ func (p *postgresFarmRepository) fetch(ctx context.Context, query string, args .
|
|||||||
var farms []domain.Farm
|
var farms []domain.Farm
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var f domain.Farm
|
var f domain.Farm
|
||||||
|
var plantTypes pq.StringArray
|
||||||
if err := rows.Scan(
|
if err := rows.Scan(
|
||||||
&f.UUID,
|
&f.UUID,
|
||||||
&f.Name,
|
&f.Name,
|
||||||
@ -35,9 +35,19 @@ func (p *postgresFarmRepository) fetch(ctx context.Context, query string, args .
|
|||||||
&f.CreatedAt,
|
&f.CreatedAt,
|
||||||
&f.UpdatedAt,
|
&f.UpdatedAt,
|
||||||
&f.OwnerID,
|
&f.OwnerID,
|
||||||
|
&plantTypes,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for _, plantTypeStr := range plantTypes {
|
||||||
|
plantTypeUUID, err := uuid.Parse(plantTypeStr)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
f.PlantTypes = append(f.PlantTypes, plantTypeUUID)
|
||||||
|
}
|
||||||
|
|
||||||
farms = append(farms, f)
|
farms = append(farms, f)
|
||||||
}
|
}
|
||||||
return farms, nil
|
return farms, nil
|
||||||
@ -45,7 +55,7 @@ func (p *postgresFarmRepository) fetch(ctx context.Context, query string, args .
|
|||||||
|
|
||||||
func (p *postgresFarmRepository) GetByID(ctx context.Context, uuid string) (domain.Farm, error) {
|
func (p *postgresFarmRepository) GetByID(ctx context.Context, uuid string) (domain.Farm, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT uuid, name, lat, lon, created_at, updated_at, owner_id
|
SELECT uuid, name, lat, lon, created_at, updated_at, owner_id, plant_types
|
||||||
FROM farms
|
FROM farms
|
||||||
WHERE uuid = $1`
|
WHERE uuid = $1`
|
||||||
|
|
||||||
@ -61,7 +71,7 @@ func (p *postgresFarmRepository) GetByID(ctx context.Context, uuid string) (doma
|
|||||||
|
|
||||||
func (p *postgresFarmRepository) GetByOwnerID(ctx context.Context, ownerID string) ([]domain.Farm, error) {
|
func (p *postgresFarmRepository) GetByOwnerID(ctx context.Context, ownerID string) ([]domain.Farm, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT uuid, name, lat, lon, created_at, updated_at, owner_id
|
SELECT uuid, name, lat, lon, created_at, updated_at, owner_id, plant_types
|
||||||
FROM farms
|
FROM farms
|
||||||
WHERE owner_id = $1`
|
WHERE owner_id = $1`
|
||||||
|
|
||||||
@ -73,15 +83,21 @@ func (p *postgresFarmRepository) CreateOrUpdate(ctx context.Context, f *domain.F
|
|||||||
f.UUID = uuid.New().String()
|
f.UUID = uuid.New().String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
plantTypes := make([]string, len(f.PlantTypes))
|
||||||
|
for i, pt := range f.PlantTypes {
|
||||||
|
plantTypes[i] = pt.String()
|
||||||
|
}
|
||||||
|
|
||||||
query := `
|
query := `
|
||||||
INSERT INTO farms (uuid, name, lat, lon, created_at, updated_at, owner_id)
|
INSERT INTO farms (uuid, name, lat, lon, created_at, updated_at, owner_id, plant_types)
|
||||||
VALUES ($1, $2, $3, $4, NOW(), NOW(), $5)
|
VALUES ($1, $2, $3, $4, NOW(), NOW(), $5, $6)
|
||||||
ON CONFLICT (uuid) DO UPDATE
|
ON CONFLICT (uuid) DO UPDATE
|
||||||
SET name = EXCLUDED.name,
|
SET name = EXCLUDED.name,
|
||||||
lat = EXCLUDED.lat,
|
lat = EXCLUDED.lat,
|
||||||
lon = EXCLUDED.lon,
|
lon = EXCLUDED.lon,
|
||||||
updated_at = NOW(),
|
updated_at = NOW(),
|
||||||
owner_id = EXCLUDED.owner_id
|
owner_id = EXCLUDED.owner_id,
|
||||||
|
plant_types = EXCLUDED.plant_types
|
||||||
RETURNING uuid, created_at, updated_at`
|
RETURNING uuid, created_at, updated_at`
|
||||||
|
|
||||||
return p.conn.QueryRow(
|
return p.conn.QueryRow(
|
||||||
@ -92,7 +108,8 @@ func (p *postgresFarmRepository) CreateOrUpdate(ctx context.Context, f *domain.F
|
|||||||
f.Lat,
|
f.Lat,
|
||||||
f.Lon,
|
f.Lon,
|
||||||
f.OwnerID,
|
f.OwnerID,
|
||||||
).Scan(&f.CreatedAt, &f.UpdatedAt)
|
pq.StringArray(plantTypes),
|
||||||
|
).Scan(&f.UUID, &f.CreatedAt, &f.UpdatedAt)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *postgresFarmRepository) Delete(ctx context.Context, uuid string) error {
|
func (p *postgresFarmRepository) Delete(ctx context.Context, uuid string) error {
|
||||||
|
|||||||
85
backend/internal/repository/postgres_plant.go
Normal file
85
backend/internal/repository/postgres_plant.go
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
package repository
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/forfarm/backend/internal/domain"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
type postgresPlantRepository struct {
|
||||||
|
conn Connection
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPostgresPlant(conn Connection) domain.PlantRepository {
|
||||||
|
return &postgresPlantRepository{conn: conn}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *postgresPlantRepository) fetch(ctx context.Context, query string, args ...interface{}) ([]domain.Plant, error) {
|
||||||
|
rows, err := p.conn.Query(ctx, query, args...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var plants []domain.Plant
|
||||||
|
for rows.Next() {
|
||||||
|
var plant domain.Plant
|
||||||
|
if err := rows.Scan(
|
||||||
|
&plant.UUID, &plant.Name, &plant.Variety,
|
||||||
|
&plant.RowSpacing, &plant.OptimalTemp, &plant.PlantingDepth,
|
||||||
|
&plant.AverageHeight, &plant.LightProfileID, &plant.SoilConditionID,
|
||||||
|
&plant.PlantingDetail, &plant.IsPerennial, &plant.DaysToEmerge,
|
||||||
|
&plant.DaysToFlower, &plant.DaysToMaturity, &plant.HarvestWindow,
|
||||||
|
&plant.PHValue, &plant.EstimateLossRate, &plant.EstimateRevenuePerHU,
|
||||||
|
&plant.HarvestUnitID, &plant.WaterNeeds, &plant.CreatedAt, &plant.UpdatedAt,
|
||||||
|
); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
plants = append(plants, plant)
|
||||||
|
}
|
||||||
|
return plants, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *postgresPlantRepository) GetByUUID(ctx context.Context, uuid string) (domain.Plant, error) {
|
||||||
|
query := `SELECT * FROM plants WHERE uuid = $1`
|
||||||
|
plants, err := p.fetch(ctx, query, uuid)
|
||||||
|
if err != nil || len(plants) == 0 {
|
||||||
|
return domain.Plant{}, domain.ErrNotFound
|
||||||
|
}
|
||||||
|
return plants[0], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *postgresPlantRepository) GetAll(ctx context.Context) ([]domain.Plant, error) {
|
||||||
|
query := `SELECT * FROM plants`
|
||||||
|
return p.fetch(ctx, query)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *postgresPlantRepository) Create(ctx context.Context, plant *domain.Plant) error {
|
||||||
|
if strings.TrimSpace(plant.UUID) == "" {
|
||||||
|
plant.UUID = uuid.New().String()
|
||||||
|
}
|
||||||
|
if err := plant.Validate(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
query := `INSERT INTO plants (uuid, name, light_profile_id, soil_condition_id, harvest_unit_id, created_at, updated_at)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, NOW(), NOW()) RETURNING created_at, updated_at`
|
||||||
|
return p.conn.QueryRow(ctx, query, plant.UUID, plant.Name, plant.LightProfileID, plant.SoilConditionID, plant.HarvestUnitID).Scan(&plant.CreatedAt, &plant.UpdatedAt)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *postgresPlantRepository) Update(ctx context.Context, plant *domain.Plant) error {
|
||||||
|
if err := plant.Validate(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
query := `UPDATE plants SET name = $2, light_profile_id = $3, soil_condition_id = $4,
|
||||||
|
harvest_unit_id = $5, updated_at = NOW() WHERE uuid = $1`
|
||||||
|
_, err := p.conn.Exec(ctx, query, plant.UUID, plant.Name, plant.LightProfileID, plant.SoilConditionID, plant.HarvestUnitID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *postgresPlantRepository) Delete(ctx context.Context, uuid string) error {
|
||||||
|
query := `DELETE FROM plants WHERE uuid = $1`
|
||||||
|
_, err := p.conn.Exec(ctx, query, uuid)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@ -34,10 +34,6 @@ func VerifyJwtToken(tokenString string, customKey ...[]byte) error {
|
|||||||
secretKey = customKey[0]
|
secretKey = customKey[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(secretKey) == 0 {
|
|
||||||
return errors.New("no secret key available")
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
|
token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
|
||||||
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
|
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
|
||||||
return nil, jwt.ErrSignatureInvalid
|
return nil, jwt.ErrSignatureInvalid
|
||||||
|
|||||||
@ -43,8 +43,9 @@ CREATE TABLE plants (
|
|||||||
CREATE TABLE farms (
|
CREATE TABLE farms (
|
||||||
uuid UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
uuid UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
name TEXT NOT NULL,
|
name TEXT NOT NULL,
|
||||||
lat DOUBLE PRECISION NOT NULL,
|
lat DOUBLE PRECISION[] NOT NULL,
|
||||||
lon DOUBLE PRECISION NOT NULL,
|
lon DOUBLE PRECISION[] NOT NULL,
|
||||||
|
plant_types UUID[],
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
owner_id UUID NOT NULL,
|
owner_id UUID NOT NULL,
|
||||||
|
|||||||
98
frontend/app/(sidebar)/farms/[farmId]/add-crop-form.tsx
Normal file
98
frontend/app/(sidebar)/farms/[farmId]/add-crop-form.tsx
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
|
import { useForm } from "react-hook-form";
|
||||||
|
import * as z from "zod";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
||||||
|
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
|
||||||
|
import { Crop } from "@/types";
|
||||||
|
import { cropFormSchema } from "@/schemas/form.schema";
|
||||||
|
|
||||||
|
interface AddCropFormProps {
|
||||||
|
onSubmit: (data: Partial<Crop>) => Promise<void>;
|
||||||
|
onCancel: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AddCropForm({ onSubmit, onCancel }: AddCropFormProps) {
|
||||||
|
const form = useForm<z.infer<typeof cropFormSchema>>({
|
||||||
|
resolver: zodResolver(cropFormSchema),
|
||||||
|
defaultValues: {
|
||||||
|
name: "",
|
||||||
|
plantedDate: "",
|
||||||
|
status: "planned",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleSubmit = (values: z.infer<typeof cropFormSchema>) => {
|
||||||
|
onSubmit({
|
||||||
|
...values,
|
||||||
|
plantedDate: new Date(values.plantedDate),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Form {...form}>
|
||||||
|
<form onSubmit={form.handleSubmit(handleSubmit)} className="space-y-6">
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="name"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>Crop Name</FormLabel>
|
||||||
|
<FormControl>
|
||||||
|
<Input placeholder="Enter crop name" {...field} />
|
||||||
|
</FormControl>
|
||||||
|
<FormMessage />
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="plantedDate"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>Planted Date</FormLabel>
|
||||||
|
<FormControl>
|
||||||
|
<Input type="date" {...field} />
|
||||||
|
</FormControl>
|
||||||
|
<FormMessage />
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="status"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>Status</FormLabel>
|
||||||
|
<Select onValueChange={field.onChange} defaultValue={field.value}>
|
||||||
|
<FormControl>
|
||||||
|
<SelectTrigger>
|
||||||
|
<SelectValue placeholder="Select crop status" />
|
||||||
|
</SelectTrigger>
|
||||||
|
</FormControl>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="planned">Planned</SelectItem>
|
||||||
|
<SelectItem value="growing">Growing</SelectItem>
|
||||||
|
<SelectItem value="harvested">Harvested</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
<FormMessage />
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div className="flex justify-end gap-2">
|
||||||
|
<Button type="button" variant="outline" onClick={onCancel}>
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
<Button type="submit">Add Crop</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</Form>
|
||||||
|
);
|
||||||
|
}
|
||||||
37
frontend/app/(sidebar)/farms/[farmId]/crop-card.tsx
Normal file
37
frontend/app/(sidebar)/farms/[farmId]/crop-card.tsx
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
import { Card, CardContent, CardHeader } from "@/components/ui/card";
|
||||||
|
import { Sprout, Calendar } from "lucide-react";
|
||||||
|
import { Crop } from "@/types";
|
||||||
|
|
||||||
|
interface CropCardProps {
|
||||||
|
crop: Crop;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CropCard({ crop }: CropCardProps) {
|
||||||
|
const statusColors = {
|
||||||
|
growing: "text-green-500",
|
||||||
|
harvested: "text-yellow-500",
|
||||||
|
planned: "text-blue-500",
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card className="w-full bg-muted/50 hover:bg-muted/80 transition-all cursor-pointer group hover:shadow-lg">
|
||||||
|
<CardHeader className="p-4 pb-2">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="h-8 w-8 rounded-full bg-primary/10 flex items-center justify-center">
|
||||||
|
<Sprout className="h-4 w-4 text-primary" />
|
||||||
|
</div>
|
||||||
|
<span className={`text-sm font-medium capitalize ${statusColors[crop.status]}`}>{crop.status}</span>
|
||||||
|
</div>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent className="p-4">
|
||||||
|
<div className="space-y-2">
|
||||||
|
<h3 className="text-lg font-medium truncate">{crop.name}</h3>
|
||||||
|
<div className="flex items-center gap-1 text-sm text-muted-foreground">
|
||||||
|
<Calendar className="h-3 w-3" />
|
||||||
|
<p>Planted: {crop.plantedDate.toLocaleDateString()}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
157
frontend/app/(sidebar)/farms/[farmId]/page.tsx
Normal file
157
frontend/app/(sidebar)/farms/[farmId]/page.tsx
Normal file
@ -0,0 +1,157 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { ArrowLeft, MapPin, Plus, Sprout } from "lucide-react";
|
||||||
|
import { Card, CardContent, CardHeader } from "@/components/ui/card";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Separator } from "@/components/ui/separator";
|
||||||
|
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from "@/components/ui/dialog";
|
||||||
|
import { AddCropForm } from "./add-crop-form";
|
||||||
|
import { CropCard } from "./crop-card";
|
||||||
|
import { Farm, Crop } from "@/types";
|
||||||
|
import React from "react";
|
||||||
|
|
||||||
|
const crops: Crop[] = [
|
||||||
|
{
|
||||||
|
id: "crop1",
|
||||||
|
farmId: "1",
|
||||||
|
name: "Monthong Durian",
|
||||||
|
plantedDate: new Date("2023-03-15"),
|
||||||
|
status: "growing",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "crop2",
|
||||||
|
farmId: "1",
|
||||||
|
name: "Chanee Durian",
|
||||||
|
plantedDate: new Date("2023-02-20"),
|
||||||
|
status: "planned",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "crop3",
|
||||||
|
farmId: "2",
|
||||||
|
name: "Kradum Durian",
|
||||||
|
plantedDate: new Date("2022-11-05"),
|
||||||
|
status: "harvested",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const farms: Farm[] = [
|
||||||
|
{
|
||||||
|
id: "1",
|
||||||
|
name: "Green Valley Farm",
|
||||||
|
location: "Bangkok",
|
||||||
|
type: "durian",
|
||||||
|
createdAt: new Date("2023-01-01"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "2",
|
||||||
|
name: "Golden Farm",
|
||||||
|
location: "Chiang Mai",
|
||||||
|
type: "mango",
|
||||||
|
createdAt: new Date("2022-12-01"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const getFarmById = (id: string): Farm | undefined => {
|
||||||
|
return farms.find((farm) => farm.id === id);
|
||||||
|
};
|
||||||
|
|
||||||
|
const getCropsByFarmId = (farmId: string): Crop[] => crops.filter((crop) => crop.farmId === farmId);
|
||||||
|
|
||||||
|
export default function FarmDetailPage({ params }: { params: Promise<{ farmId: string }> }) {
|
||||||
|
const { farmId } = React.use(params);
|
||||||
|
|
||||||
|
const router = useRouter();
|
||||||
|
const [farm] = useState<Farm | undefined>(getFarmById(farmId));
|
||||||
|
const [crops, setCrops] = useState<Crop[]>(getCropsByFarmId(farmId));
|
||||||
|
const [isDialogOpen, setIsDialogOpen] = useState(false);
|
||||||
|
|
||||||
|
const handleAddCrop = async (data: Partial<Crop>) => {
|
||||||
|
const newCrop: Crop = {
|
||||||
|
id: Math.random().toString(36).substr(2, 9),
|
||||||
|
farmId: farm!.id,
|
||||||
|
name: data.name!,
|
||||||
|
plantedDate: data.plantedDate!,
|
||||||
|
status: data.status!,
|
||||||
|
};
|
||||||
|
setCrops((prevCrops) => [...prevCrops, newCrop]);
|
||||||
|
setIsDialogOpen(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="container max-w-screen-xl p-8">
|
||||||
|
<Button variant="ghost" className="mb-4" onClick={() => router.back()}>
|
||||||
|
<ArrowLeft className="mr-2 h-4 w-4" /> Back to Farms
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div className="grid gap-6 md:grid-cols-2">
|
||||||
|
<Card className="md:col-span-2">
|
||||||
|
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<div className="h-8 w-8 rounded-full bg-primary/10 flex items-center justify-center">
|
||||||
|
<Sprout className="h-4 w-4 text-primary" />
|
||||||
|
</div>
|
||||||
|
<h1 className="text-2xl font-bold">{farm?.name ?? "Unknown Farm"}</h1>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center text-sm text-muted-foreground">
|
||||||
|
<MapPin className="mr-1 h-4 w-4" />
|
||||||
|
{farm?.location ?? "Unknown Location"}
|
||||||
|
</div>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent>
|
||||||
|
<div className="grid gap-2">
|
||||||
|
<div className="flex justify-between">
|
||||||
|
<span className="font-medium">Farm Type:</span>
|
||||||
|
<span className="text-muted-foreground">{farm?.type ?? "Unknown Type"}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-between">
|
||||||
|
<span className="font-medium">Created:</span>
|
||||||
|
<span className="text-muted-foreground">{farm?.createdAt?.toLocaleDateString() ?? "Unknown Date"}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-between">
|
||||||
|
<span className="font-medium">Total Crops:</span>
|
||||||
|
<span className="text-muted-foreground">{crops.length}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<div className="md:col-span-2">
|
||||||
|
<h2 className="text-xl font-bold mb-4">Crops</h2>
|
||||||
|
<Separator className="my-4" />
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
|
||||||
|
<Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
|
||||||
|
<Card
|
||||||
|
className="w-full bg-muted/50 hover:bg-muted/80 transition-all cursor-pointer group hover:shadow-lg"
|
||||||
|
onClick={() => setIsDialogOpen(true)}>
|
||||||
|
<CardContent className="p-6">
|
||||||
|
<div className="flex flex-col gap-6">
|
||||||
|
<div className="h-8 w-8 rounded-full bg-primary/10 flex items-center justify-center group-hover:bg-primary/20 transition-colors">
|
||||||
|
<Plus className="h-5 w-5 text-primary" />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<h3 className="text-xl font-medium">Add Crop</h3>
|
||||||
|
<p className="text-sm text-muted-foreground">Plant a new crop</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
<DialogContent className="sm:max-w-[425px]">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Add New Crop</DialogTitle>
|
||||||
|
<DialogDescription>Fill out the form to add a new crop to your farm.</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<AddCropForm onSubmit={handleAddCrop} onCancel={() => setIsDialogOpen(false)} />
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
{crops.map((crop) => (
|
||||||
|
<CropCard key={crop.id} crop={crop} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
93
frontend/app/(sidebar)/farms/add-farm-form.tsx
Normal file
93
frontend/app/(sidebar)/farms/add-farm-form.tsx
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
|
import { useForm } from "react-hook-form";
|
||||||
|
import * as z from "zod";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
||||||
|
import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
|
||||||
|
import type { Farm } from "@/types";
|
||||||
|
import { farmFormSchema } from "@/schemas/form.schema";
|
||||||
|
|
||||||
|
interface AddFarmFormProps {
|
||||||
|
onSubmit: (data: Partial<Farm>) => Promise<void>;
|
||||||
|
onCancel: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AddFarmForm({ onSubmit, onCancel }: AddFarmFormProps) {
|
||||||
|
const form = useForm<z.infer<typeof farmFormSchema>>({
|
||||||
|
resolver: zodResolver(farmFormSchema),
|
||||||
|
defaultValues: {
|
||||||
|
name: "",
|
||||||
|
location: "",
|
||||||
|
type: "",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Form {...form}>
|
||||||
|
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="name"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>Farm Name</FormLabel>
|
||||||
|
<FormControl>
|
||||||
|
<Input placeholder="Enter farm name" {...field} />
|
||||||
|
</FormControl>
|
||||||
|
<FormDescription>This is your farm's display name.</FormDescription>
|
||||||
|
<FormMessage />
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="location"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>Location</FormLabel>
|
||||||
|
<FormControl>
|
||||||
|
<Input placeholder="Enter farm location" {...field} />
|
||||||
|
</FormControl>
|
||||||
|
<FormMessage />
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="type"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>Farm Type</FormLabel>
|
||||||
|
<Select onValueChange={field.onChange} defaultValue={field.value}>
|
||||||
|
<FormControl>
|
||||||
|
<SelectTrigger>
|
||||||
|
<SelectValue placeholder="Select farm type" />
|
||||||
|
</SelectTrigger>
|
||||||
|
</FormControl>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="durian">Durian</SelectItem>
|
||||||
|
<SelectItem value="mango">Mango</SelectItem>
|
||||||
|
<SelectItem value="rice">Rice</SelectItem>
|
||||||
|
<SelectItem value="other">Other</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
<FormMessage />
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div className="flex justify-end gap-2">
|
||||||
|
<Button type="button" variant="outline" onClick={onCancel}>
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
<Button type="submit">Create Farm</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</Form>
|
||||||
|
);
|
||||||
|
}
|
||||||
61
frontend/app/(sidebar)/farms/farm-card.tsx
Normal file
61
frontend/app/(sidebar)/farms/farm-card.tsx
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
import { Card, CardContent, CardHeader } from "@/components/ui/card";
|
||||||
|
import { MapPin, Sprout, Plus } from "lucide-react";
|
||||||
|
import type { Farm } from "@/types";
|
||||||
|
|
||||||
|
export interface FarmCardProps {
|
||||||
|
variant: "farm" | "add";
|
||||||
|
farm?: Farm;
|
||||||
|
onClick?: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FarmCard({ variant, farm, onClick }: FarmCardProps) {
|
||||||
|
const cardClasses =
|
||||||
|
"w-full max-w-[240px] bg-muted/50 hover:bg-muted/80 transition-all cursor-pointer group hover:shadow-lg";
|
||||||
|
|
||||||
|
if (variant === "add") {
|
||||||
|
return (
|
||||||
|
<Card className={cardClasses} onClick={onClick}>
|
||||||
|
<CardContent className="p-6">
|
||||||
|
<div className="flex flex-col gap-6">
|
||||||
|
<div className="h-8 w-8 rounded-full bg-primary/10 flex items-center justify-center group-hover:bg-primary/20 transition-colors">
|
||||||
|
<Plus className="h-5 w-5 text-primary" />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<h3 className="text-xl font-medium">Setup</h3>
|
||||||
|
<p className="text-sm text-muted-foreground">Setup new farm</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (variant === "farm" && farm) {
|
||||||
|
return (
|
||||||
|
<Card className={cardClasses} onClick={onClick}>
|
||||||
|
<CardHeader className="p-4 pb-0">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="h-8 w-8 rounded-full bg-primary/10 flex items-center justify-center">
|
||||||
|
<Sprout className="h-4 w-4 text-primary" />
|
||||||
|
</div>
|
||||||
|
<span className="text-sm font-medium text-primary">{farm.type}</span>
|
||||||
|
</div>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent className="p-4">
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div>
|
||||||
|
<h3 className="text-xl font-medium truncate">{farm.name}</h3>
|
||||||
|
<div className="flex items-center gap-1 mt-1 text-muted-foreground">
|
||||||
|
<MapPin className="h-3 w-3" />
|
||||||
|
<p className="text-sm">{farm.location}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="text-xs text-muted-foreground">Created {farm.createdAt.toLocaleDateString()}</div>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
78
frontend/app/(sidebar)/farms/page.tsx
Normal file
78
frontend/app/(sidebar)/farms/page.tsx
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from "@/components/ui/dialog";
|
||||||
|
import { Separator } from "@/components/ui/separator";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { Search } from "lucide-react";
|
||||||
|
import { FarmCard } from "./farm-card";
|
||||||
|
import { AddFarmForm } from "./add-farm-form";
|
||||||
|
import type { Farm } from "@/types";
|
||||||
|
|
||||||
|
export default function FarmSetupPage() {
|
||||||
|
const [isDialogOpen, setIsDialogOpen] = useState(false);
|
||||||
|
const [searchQuery, setSearchQuery] = useState("");
|
||||||
|
const [farms, setFarms] = useState<Farm[]>([
|
||||||
|
{
|
||||||
|
id: "1",
|
||||||
|
name: "Green Valley Farm",
|
||||||
|
location: "Bangkok",
|
||||||
|
type: "durian",
|
||||||
|
createdAt: new Date(),
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const handleAddFarm = async (data: Partial<Farm>) => {
|
||||||
|
const newFarm: Farm = {
|
||||||
|
id: Math.random().toString(36).substr(2, 9),
|
||||||
|
name: data.name!,
|
||||||
|
location: data.location!,
|
||||||
|
type: data.type!,
|
||||||
|
createdAt: new Date(),
|
||||||
|
};
|
||||||
|
setFarms([...farms, newFarm]);
|
||||||
|
setIsDialogOpen(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const filteredFarms = farms.filter(
|
||||||
|
(farm) =>
|
||||||
|
farm.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
|
||||||
|
farm.location.toLowerCase().includes(searchQuery.toLowerCase()) ||
|
||||||
|
farm.type.toLowerCase().includes(searchQuery.toLowerCase())
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="container max-w-screen-xl p-8">
|
||||||
|
<div className="flex justify-between items-center">
|
||||||
|
<h1 className="text-3xl font-bold">Farms</h1>
|
||||||
|
<div className="relative w-64">
|
||||||
|
<Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
|
||||||
|
<Input
|
||||||
|
placeholder="Search farms..."
|
||||||
|
className="pl-8"
|
||||||
|
value={searchQuery}
|
||||||
|
onChange={(e) => setSearchQuery(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Separator className="my-4" />
|
||||||
|
|
||||||
|
<div className="grid grid-cols-5 gap-4">
|
||||||
|
<Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
|
||||||
|
<FarmCard variant="add" onClick={() => setIsDialogOpen(true)} />
|
||||||
|
<DialogContent className="sm:max-w-[425px]">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Setup New Farm</DialogTitle>
|
||||||
|
<DialogDescription>Fill out the form to configure your new farm.</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<AddFarmForm onSubmit={handleAddFarm} onCancel={() => setIsDialogOpen(false)} />
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
{filteredFarms.map((farm) => (
|
||||||
|
<FarmCard key={farm.id} variant="farm" farm={farm} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -14,24 +14,13 @@ const GoogleMapWithDrawing = () => {
|
|||||||
const [map, setMap] = useState<google.maps.Map | null>(null);
|
const [map, setMap] = useState<google.maps.Map | null>(null);
|
||||||
|
|
||||||
// Handles drawing complete
|
// Handles drawing complete
|
||||||
const onDrawingComplete = useCallback(
|
const onDrawingComplete = useCallback((overlay: google.maps.drawing.OverlayCompleteEvent) => {
|
||||||
(overlay: google.maps.drawing.OverlayCompleteEvent) => {
|
|
||||||
console.log("Drawing complete:", overlay);
|
console.log("Drawing complete:", overlay);
|
||||||
},
|
}, []);
|
||||||
[]
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<LoadScript
|
<LoadScript googleMapsApiKey={process.env.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY!} libraries={["drawing"]}>
|
||||||
googleMapsApiKey={process.env.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY!}
|
<GoogleMap mapContainerStyle={containerStyle} center={center} zoom={10} onLoad={(map) => setMap(map)}>
|
||||||
libraries={["drawing"]}
|
|
||||||
>
|
|
||||||
<GoogleMap
|
|
||||||
mapContainerStyle={containerStyle}
|
|
||||||
center={center}
|
|
||||||
zoom={10}
|
|
||||||
onLoad={(map) => setMap(map)}
|
|
||||||
>
|
|
||||||
{map && (
|
{map && (
|
||||||
<DrawingManager
|
<DrawingManager
|
||||||
onOverlayComplete={onDrawingComplete}
|
onOverlayComplete={onDrawingComplete}
|
||||||
@ -3,7 +3,7 @@
|
|||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
import { useForm } from "react-hook-form";
|
import { useForm } from "react-hook-form";
|
||||||
|
|
||||||
import { signInSchema } from "@/schema/authSchema";
|
import { signInSchema } from "@/schemas/auth.schema";
|
||||||
|
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { Label } from "@/components/ui/label";
|
import { Label } from "@/components/ui/label";
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import { Input } from "@/components/ui/input";
|
|||||||
import { Label } from "@/components/ui/label";
|
import { Label } from "@/components/ui/label";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
|
||||||
import { signUpSchema } from "@/schema/authSchema";
|
import { signUpSchema } from "@/schemas/auth.schema";
|
||||||
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import Image from "next/image";
|
import Image from "next/image";
|
||||||
|
|||||||
76
frontend/components/ui/card.tsx
Normal file
76
frontend/components/ui/card.tsx
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
import * as React from "react"
|
||||||
|
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const Card = React.forwardRef<
|
||||||
|
HTMLDivElement,
|
||||||
|
React.HTMLAttributes<HTMLDivElement>
|
||||||
|
>(({ className, ...props }, ref) => (
|
||||||
|
<div
|
||||||
|
ref={ref}
|
||||||
|
className={cn(
|
||||||
|
"rounded-xl border bg-card text-card-foreground shadow",
|
||||||
|
className
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
Card.displayName = "Card"
|
||||||
|
|
||||||
|
const CardHeader = React.forwardRef<
|
||||||
|
HTMLDivElement,
|
||||||
|
React.HTMLAttributes<HTMLDivElement>
|
||||||
|
>(({ className, ...props }, ref) => (
|
||||||
|
<div
|
||||||
|
ref={ref}
|
||||||
|
className={cn("flex flex-col space-y-1.5 p-6", className)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
CardHeader.displayName = "CardHeader"
|
||||||
|
|
||||||
|
const CardTitle = React.forwardRef<
|
||||||
|
HTMLDivElement,
|
||||||
|
React.HTMLAttributes<HTMLDivElement>
|
||||||
|
>(({ className, ...props }, ref) => (
|
||||||
|
<div
|
||||||
|
ref={ref}
|
||||||
|
className={cn("font-semibold leading-none tracking-tight", className)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
CardTitle.displayName = "CardTitle"
|
||||||
|
|
||||||
|
const CardDescription = React.forwardRef<
|
||||||
|
HTMLDivElement,
|
||||||
|
React.HTMLAttributes<HTMLDivElement>
|
||||||
|
>(({ className, ...props }, ref) => (
|
||||||
|
<div
|
||||||
|
ref={ref}
|
||||||
|
className={cn("text-sm text-muted-foreground", className)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
CardDescription.displayName = "CardDescription"
|
||||||
|
|
||||||
|
const CardContent = React.forwardRef<
|
||||||
|
HTMLDivElement,
|
||||||
|
React.HTMLAttributes<HTMLDivElement>
|
||||||
|
>(({ className, ...props }, ref) => (
|
||||||
|
<div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
|
||||||
|
))
|
||||||
|
CardContent.displayName = "CardContent"
|
||||||
|
|
||||||
|
const CardFooter = React.forwardRef<
|
||||||
|
HTMLDivElement,
|
||||||
|
React.HTMLAttributes<HTMLDivElement>
|
||||||
|
>(({ className, ...props }, ref) => (
|
||||||
|
<div
|
||||||
|
ref={ref}
|
||||||
|
className={cn("flex items-center p-6 pt-0", className)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
CardFooter.displayName = "CardFooter"
|
||||||
|
|
||||||
|
export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
|
||||||
15
frontend/schemas/form.schema.ts
Normal file
15
frontend/schemas/form.schema.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import * as z from "zod";
|
||||||
|
|
||||||
|
export const farmFormSchema = z.object({
|
||||||
|
name: z.string().min(2, "Farm name must be at least 2 characters"),
|
||||||
|
location: z.string().min(2, "Location must be at least 2 characters"),
|
||||||
|
type: z.string().min(1, "Please select a farm type"),
|
||||||
|
});
|
||||||
|
|
||||||
|
export const cropFormSchema = z.object({
|
||||||
|
name: z.string().min(2, "Crop name must be at least 2 characters"),
|
||||||
|
plantedDate: z.string().refine((val) => !Number.isNaN(Date.parse(val)), {
|
||||||
|
message: "Please enter a valid date",
|
||||||
|
}),
|
||||||
|
status: z.enum(["growing", "harvested", "planned"]),
|
||||||
|
});
|
||||||
15
frontend/types.ts
Normal file
15
frontend/types.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
export interface Crop {
|
||||||
|
id: string;
|
||||||
|
farmId: string;
|
||||||
|
name: string;
|
||||||
|
plantedDate: Date;
|
||||||
|
status: "growing" | "harvested" | "planned";
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Farm {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
location: string;
|
||||||
|
type: string;
|
||||||
|
createdAt: Date;
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user