From 8d8935c04509cc5fbecbd84ba27e06311875eb8c Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Wed, 2 Oct 2024 18:01:30 -0400 Subject: [PATCH] feat(nebula): create Home model for home page --- Makefile | 2 +- pkg/nebula/models/Home.pkl.go | 8 ++++++++ pkg/nebula/models/Models.pkl.go | 4 +--- pkg/nebula/models/init.pkl.go | 1 + pkg/nebula/nebula.pkl | 5 +++++ pkg/nebula/pages/home.go | 3 ++- pkl/uiux.pkl | 8 ++++++-- x/vault/keeper/genesis.go | 6 +----- 8 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 pkg/nebula/models/Home.pkl.go diff --git a/Makefile b/Makefile index 5ac1204ec..18c16bd0e 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ endif install: go.sum go install -mod=readonly $(BUILD_FLAGS) ./cmd/sonrd - go install -mod=readonly $(BUILD_FLAGS) ./cmd/motr + go install -mod=readonly $(BUILD_FLAGS) ./cmd/hway ######################################## ### Tools & dependencies diff --git a/pkg/nebula/models/Home.pkl.go b/pkg/nebula/models/Home.pkl.go new file mode 100644 index 000000000..5b6bb46e8 --- /dev/null +++ b/pkg/nebula/models/Home.pkl.go @@ -0,0 +1,8 @@ +// Code generated from Pkl module `models`. DO NOT EDIT. +package models + +type Home struct { + Hero *Hero `pkl:"hero"` + + Stats *Stats `pkl:"stats"` +} diff --git a/pkg/nebula/models/Models.pkl.go b/pkg/nebula/models/Models.pkl.go index ec4718cd5..e8869e623 100644 --- a/pkg/nebula/models/Models.pkl.go +++ b/pkg/nebula/models/Models.pkl.go @@ -8,9 +8,7 @@ import ( ) type Models struct { - Hero *Hero `pkl:"hero"` - - Stats *Stats `pkl:"stats"` + Home *Home `pkl:"home"` } // LoadFromPath loads the pkl module at the given path and evaluates it into a Models diff --git a/pkg/nebula/models/init.pkl.go b/pkg/nebula/models/init.pkl.go index 9be2c6ac5..d1b320a15 100644 --- a/pkg/nebula/models/init.pkl.go +++ b/pkg/nebula/models/init.pkl.go @@ -5,6 +5,7 @@ import "github.com/apple/pkl-go/pkl" func init() { pkl.RegisterMapping("models", Models{}) + pkl.RegisterMapping("models#Home", Home{}) pkl.RegisterMapping("models#Hero", Hero{}) pkl.RegisterMapping("models#Button", Button{}) pkl.RegisterMapping("models#Image", Image{}) diff --git a/pkg/nebula/nebula.pkl b/pkg/nebula/nebula.pkl index df048aed5..f37044ab8 100644 --- a/pkg/nebula/nebula.pkl +++ b/pkg/nebula/nebula.pkl @@ -28,3 +28,8 @@ stats = new Stats { thirdValue = "1.5M+"; thirdLabel = "Assets packed with power beyond your imagination."; }; + +home = new Home { + hero = hero; + stats = stats; +}; diff --git a/pkg/nebula/pages/home.go b/pkg/nebula/pages/home.go index 98c70ecf3..3c1b1e77b 100644 --- a/pkg/nebula/pages/home.go +++ b/pkg/nebula/pages/home.go @@ -2,6 +2,7 @@ package pages import ( "github.com/labstack/echo/v4" + "github.com/onsonr/sonr/pkg/nebula/components/home" "github.com/onsonr/sonr/pkg/nebula/models" ) @@ -11,5 +12,5 @@ func Home(c echo.Context) error { if err != nil { return err } - return echoResponse(c, home.View(mdls.Hero)) + return echoResponse(c, home.View(mdls.Home.Hero)) } diff --git a/pkl/uiux.pkl b/pkl/uiux.pkl index e8ac9bfc6..4686dccf0 100644 --- a/pkl/uiux.pkl +++ b/pkl/uiux.pkl @@ -74,8 +74,12 @@ class Footer { resourcesLinks: List } -hero : Hero -stats : Stats +class Home { + hero: Hero + stats: Stats +} + +home : Home // ╭───────────────────────────────────────────────────────────╮ // │ Registration Components │ diff --git a/x/vault/keeper/genesis.go b/x/vault/keeper/genesis.go index a0b681e2c..58d5210c6 100644 --- a/x/vault/keeper/genesis.go +++ b/x/vault/keeper/genesis.go @@ -8,6 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ipfs/boxo/path" "github.com/ipfs/kubo/client/rpc" + "github.com/onsonr/sonr/x/vault/types" ) @@ -74,8 +75,3 @@ func (k Keeper) HasPathInIPFS(ctx sdk.Context, cid string) (bool, error) { } return true, nil } - -// validateSubjectOrigin checks if the subject and origin are valid -func (k Keeper) validateSubjectOrigin(ctx sdk.Context, subject string, origin string) error { - return nil -}