From 3637f2736934a517cd9cf1c1d75515a79dd29ad5 Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Tue, 8 Oct 2024 21:06:24 -0400 Subject: [PATCH] feat: add static hero section content to homepage --- Makefile | 1 - pkg/nebula/components/dash/page.templ | 6 +- pkg/nebula/components/dash/page_templ.go | 11 +--- pkg/nebula/components/home/page.templ | 25 +++++++- pkg/nebula/components/home/page_templ.go | 23 +++++++- .../components/home/sections/hero_templ.go | 4 +- pkg/nebula/models/Bento.pkl.go | 12 ---- pkg/nebula/models/Button.pkl.go | 8 --- pkg/nebula/models/CallToAction.pkl.go | 12 ---- pkg/nebula/models/Feature.pkl.go | 12 ---- pkg/nebula/models/Features.pkl.go | 10 ---- pkg/nebula/models/Footer.pkl.go | 18 ------ pkg/nebula/models/Form.pkl.go | 10 ---- pkg/nebula/models/Hero.pkl.go | 20 ------- pkg/nebula/models/Highlight.pkl.go | 10 ---- pkg/nebula/models/Highlights.pkl.go | 10 ---- pkg/nebula/models/Home.pkl.go | 6 -- pkg/nebula/models/Image.pkl.go | 10 ---- pkg/nebula/models/Input.pkl.go | 20 ------- pkg/nebula/models/Link.pkl.go | 8 --- pkg/nebula/models/Lowlights.pkl.go | 10 ---- pkg/nebula/models/ModalForm.pkl.go | 10 ---- pkg/nebula/models/Models.pkl.go | 45 --------------- .../models/PublicKeyCreationOptions.pkl.go | 5 -- .../models/PublicKeyRequestOptions.pkl.go | 5 -- pkg/nebula/models/RegisterFormData.pkl.go | 28 --------- pkg/nebula/models/SocialLink.pkl.go | 8 --- pkg/nebula/models/Stat.pkl.go | 8 --- pkg/nebula/models/Stats.pkl.go | 16 ------ pkg/nebula/models/common.go | 36 ------------ pkg/nebula/models/events.go | 13 ----- pkg/nebula/models/init.pkl.go | 14 ----- pkg/nebula/models/inputtype/InputType.pkl.go | 43 -------------- pkg/nebula/models/marketing.go | 28 +++++++++ pkg/nebula/routes/routes.go | 7 +-- pkl/UIUX.pkl | 57 ------------------- 36 files changed, 77 insertions(+), 492 deletions(-) delete mode 100644 pkg/nebula/models/Bento.pkl.go delete mode 100644 pkg/nebula/models/Button.pkl.go delete mode 100644 pkg/nebula/models/CallToAction.pkl.go delete mode 100644 pkg/nebula/models/Feature.pkl.go delete mode 100644 pkg/nebula/models/Features.pkl.go delete mode 100644 pkg/nebula/models/Footer.pkl.go delete mode 100644 pkg/nebula/models/Form.pkl.go delete mode 100644 pkg/nebula/models/Hero.pkl.go delete mode 100644 pkg/nebula/models/Highlight.pkl.go delete mode 100644 pkg/nebula/models/Highlights.pkl.go delete mode 100644 pkg/nebula/models/Home.pkl.go delete mode 100644 pkg/nebula/models/Image.pkl.go delete mode 100644 pkg/nebula/models/Input.pkl.go delete mode 100644 pkg/nebula/models/Link.pkl.go delete mode 100644 pkg/nebula/models/Lowlights.pkl.go delete mode 100644 pkg/nebula/models/ModalForm.pkl.go delete mode 100644 pkg/nebula/models/Models.pkl.go delete mode 100644 pkg/nebula/models/PublicKeyCreationOptions.pkl.go delete mode 100644 pkg/nebula/models/PublicKeyRequestOptions.pkl.go delete mode 100644 pkg/nebula/models/RegisterFormData.pkl.go delete mode 100644 pkg/nebula/models/SocialLink.pkl.go delete mode 100644 pkg/nebula/models/Stat.pkl.go delete mode 100644 pkg/nebula/models/Stats.pkl.go delete mode 100644 pkg/nebula/models/common.go delete mode 100644 pkg/nebula/models/events.go delete mode 100644 pkg/nebula/models/init.pkl.go delete mode 100644 pkg/nebula/models/inputtype/InputType.pkl.go create mode 100644 pkg/nebula/models/marketing.go delete mode 100644 pkl/UIUX.pkl diff --git a/Makefile b/Makefile index 4a3919d17..32bfff22d 100644 --- a/Makefile +++ b/Makefile @@ -304,7 +304,6 @@ gen-pkl: go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/DWN.pkl go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/ORM.pkl go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/Txns.pkl - go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/UIUX.pkl diff --git a/pkg/nebula/components/dash/page.templ b/pkg/nebula/components/dash/page.templ index 610f279ee..e228c5075 100644 --- a/pkg/nebula/components/dash/page.templ +++ b/pkg/nebula/components/dash/page.templ @@ -1,15 +1,13 @@ package dash import ( + "github.com/onsonr/sonr/pkg/nebula/components/home/sections" "github.com/onsonr/sonr/pkg/nebula/global/styles" - "github.com/onsonr/sonr/pkg/nebula/components/home/sections" - "github.com/onsonr/sonr/pkg/nebula/models" ) -templ View(home *models.Home) { +templ View() { @styles.LayoutNoBody("Sonr.ID", true) { @sections.Header() - @sections.SectionHero(home.Hero) @sections.Highlights() @sections.Features() @sections.Bento() diff --git a/pkg/nebula/components/dash/page_templ.go b/pkg/nebula/components/dash/page_templ.go index 99892cd72..aa5ccb22b 100644 --- a/pkg/nebula/components/dash/page_templ.go +++ b/pkg/nebula/components/dash/page_templ.go @@ -11,10 +11,9 @@ import templruntime "github.com/a-h/templ/runtime" import ( "github.com/onsonr/sonr/pkg/nebula/components/home/sections" "github.com/onsonr/sonr/pkg/nebula/global/styles" - "github.com/onsonr/sonr/pkg/nebula/models" ) -func View(home *models.Home) templ.Component { +func View() templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { @@ -55,14 +54,6 @@ func View(home *models.Home) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = sections.SectionHero(home.Hero).Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } templ_7745c5c3_Err = sections.Highlights().Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err diff --git a/pkg/nebula/components/home/page.templ b/pkg/nebula/components/home/page.templ index 2ea151907..4c8578b58 100644 --- a/pkg/nebula/components/home/page.templ +++ b/pkg/nebula/components/home/page.templ @@ -1,15 +1,34 @@ package home import ( + "github.com/onsonr/sonr/pkg/nebula/components/home/sections" "github.com/onsonr/sonr/pkg/nebula/global/styles" - "github.com/onsonr/sonr/pkg/nebula/components/home/sections" "github.com/onsonr/sonr/pkg/nebula/models" ) -templ View(home *models.Home) { +var hero = models.Hero{ + TitleFirst: "Simplified", + TitleEmphasis: "self-custody", + TitleSecond: "for everyone", + Subtitle: "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.", + PrimaryButton: &models.Button{Text: "Get Started", Href: "/register"}, + SecondaryButton: &models.Button{Text: "Learn More", Href: "/about"}, + Image: &models.Image{ + Src: "https://cdn.sonr.id/img/hero-clipped.svg", + Width: "500", + Height: "500", + }, + Stats: []*models.Stat{ + {Value: "476K", Label: "Assets packed with power beyond your imagination."}, + {Value: "1.44K", Label: "Assets packed with power beyond your imagination."}, + {Value: "1.5M+", Label: "Assets packed with power beyond your imagination."}, + }, +} + +templ View() { @styles.LayoutNoBody("Sonr.ID", true) { @sections.Header() - @sections.SectionHero(home.Hero) + @sections.SectionHero(&hero) @sections.Highlights() @sections.Features() @sections.Bento() diff --git a/pkg/nebula/components/home/page_templ.go b/pkg/nebula/components/home/page_templ.go index 0fe0a9cfd..89b3a54e8 100644 --- a/pkg/nebula/components/home/page_templ.go +++ b/pkg/nebula/components/home/page_templ.go @@ -14,7 +14,26 @@ import ( "github.com/onsonr/sonr/pkg/nebula/models" ) -func View(home *models.Home) templ.Component { +var hero = models.Hero{ + TitleFirst: "Simplified", + TitleEmphasis: "self-custody", + TitleSecond: "for everyone", + Subtitle: "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.", + PrimaryButton: &models.Button{Text: "Get Started", Href: "/register"}, + SecondaryButton: &models.Button{Text: "Learn More", Href: "/about"}, + Image: &models.Image{ + Src: "https://cdn.sonr.id/img/hero-clipped.svg", + Width: "500", + Height: "500", + }, + Stats: []*models.Stat{ + {Value: "476K", Label: "Assets packed with power beyond your imagination."}, + {Value: "1.44K", Label: "Assets packed with power beyond your imagination."}, + {Value: "1.5M+", Label: "Assets packed with power beyond your imagination."}, + }, +} + +func View() templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { @@ -55,7 +74,7 @@ func View(home *models.Home) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = sections.SectionHero(home.Hero).Render(ctx, templ_7745c5c3_Buffer) + templ_7745c5c3_Err = sections.SectionHero(&hero).Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/pkg/nebula/components/home/sections/hero_templ.go b/pkg/nebula/components/home/sections/hero_templ.go index e8b3c0ca6..776705800 100644 --- a/pkg/nebula/components/home/sections/hero_templ.go +++ b/pkg/nebula/components/home/sections/hero_templ.go @@ -90,11 +90,11 @@ func SectionHero(hero *models.Hero) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = ui.PrimaryButton(hero.PrimaryButton.Href, hero.PrimaryButton.Text).Render(ctx, templ_7745c5c3_Buffer) + templ_7745c5c3_Err = ui.PrimaryButton("/register", "Get Started").Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = ui.SecondaryButton(hero.SecondaryButton.Href, hero.SecondaryButton.Text).Render(ctx, templ_7745c5c3_Buffer) + templ_7745c5c3_Err = ui.SecondaryButton("/about", "Learn More").Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/pkg/nebula/models/Bento.pkl.go b/pkg/nebula/models/Bento.pkl.go deleted file mode 100644 index 524e9781c..000000000 --- a/pkg/nebula/models/Bento.pkl.go +++ /dev/null @@ -1,12 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Bento struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - PrimaryButton *Button `pkl:"primaryButton"` - - SecondaryButton *Button `pkl:"secondaryButton"` -} diff --git a/pkg/nebula/models/Button.pkl.go b/pkg/nebula/models/Button.pkl.go deleted file mode 100644 index b6b277582..000000000 --- a/pkg/nebula/models/Button.pkl.go +++ /dev/null @@ -1,8 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Button struct { - Text string `pkl:"text"` - - Href string `pkl:"href"` -} diff --git a/pkg/nebula/models/CallToAction.pkl.go b/pkg/nebula/models/CallToAction.pkl.go deleted file mode 100644 index 00da5cd7c..000000000 --- a/pkg/nebula/models/CallToAction.pkl.go +++ /dev/null @@ -1,12 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type CallToAction struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - PrimaryButton *Button `pkl:"primaryButton"` - - SecondaryButton *Button `pkl:"secondaryButton"` -} diff --git a/pkg/nebula/models/Feature.pkl.go b/pkg/nebula/models/Feature.pkl.go deleted file mode 100644 index d27e177d7..000000000 --- a/pkg/nebula/models/Feature.pkl.go +++ /dev/null @@ -1,12 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Feature struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - Icon *string `pkl:"icon"` - - Image *Image `pkl:"image"` -} diff --git a/pkg/nebula/models/Features.pkl.go b/pkg/nebula/models/Features.pkl.go deleted file mode 100644 index 2bb3e1fe7..000000000 --- a/pkg/nebula/models/Features.pkl.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Features struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - Image *Image `pkl:"image"` -} diff --git a/pkg/nebula/models/Footer.pkl.go b/pkg/nebula/models/Footer.pkl.go deleted file mode 100644 index 2930ba80d..000000000 --- a/pkg/nebula/models/Footer.pkl.go +++ /dev/null @@ -1,18 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Footer struct { - Logo *Image `pkl:"logo"` - - MediumLink *SocialLink `pkl:"mediumLink"` - - TwitterLink *SocialLink `pkl:"twitterLink"` - - DiscordLink *SocialLink `pkl:"discordLink"` - - GithubLink *SocialLink `pkl:"githubLink"` - - CompanyLinks []*Link `pkl:"companyLinks"` - - ResourcesLinks []*Link `pkl:"resourcesLinks"` -} diff --git a/pkg/nebula/models/Form.pkl.go b/pkg/nebula/models/Form.pkl.go deleted file mode 100644 index 497fee014..000000000 --- a/pkg/nebula/models/Form.pkl.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Form interface { - GetTitle() string - - GetDescription() string - - GetInputs() []*Input -} diff --git a/pkg/nebula/models/Hero.pkl.go b/pkg/nebula/models/Hero.pkl.go deleted file mode 100644 index 1001dc4a6..000000000 --- a/pkg/nebula/models/Hero.pkl.go +++ /dev/null @@ -1,20 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Hero struct { - TitleFirst string `pkl:"titleFirst"` - - TitleEmphasis string `pkl:"titleEmphasis"` - - TitleSecond string `pkl:"titleSecond"` - - Subtitle string `pkl:"subtitle"` - - PrimaryButton *Button `pkl:"primaryButton"` - - SecondaryButton *Button `pkl:"secondaryButton"` - - Image *Image `pkl:"image"` - - Stats []*Stat `pkl:"stats"` -} diff --git a/pkg/nebula/models/Highlight.pkl.go b/pkg/nebula/models/Highlight.pkl.go deleted file mode 100644 index e8a4a5af2..000000000 --- a/pkg/nebula/models/Highlight.pkl.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Highlight struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - Image *Image `pkl:"image"` -} diff --git a/pkg/nebula/models/Highlights.pkl.go b/pkg/nebula/models/Highlights.pkl.go deleted file mode 100644 index 9c310ae3f..000000000 --- a/pkg/nebula/models/Highlights.pkl.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Highlights struct { - Heading string `pkl:"heading"` - - Subheading string `pkl:"subheading"` - - Highlights []*Feature `pkl:"highlights"` -} diff --git a/pkg/nebula/models/Home.pkl.go b/pkg/nebula/models/Home.pkl.go deleted file mode 100644 index 9842d8afc..000000000 --- a/pkg/nebula/models/Home.pkl.go +++ /dev/null @@ -1,6 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Home struct { - Hero *Hero `pkl:"hero"` -} diff --git a/pkg/nebula/models/Image.pkl.go b/pkg/nebula/models/Image.pkl.go deleted file mode 100644 index 9bacfa74f..000000000 --- a/pkg/nebula/models/Image.pkl.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Image struct { - Src string `pkl:"src"` - - Width string `pkl:"width"` - - Height string `pkl:"height"` -} diff --git a/pkg/nebula/models/Input.pkl.go b/pkg/nebula/models/Input.pkl.go deleted file mode 100644 index 919852c02..000000000 --- a/pkg/nebula/models/Input.pkl.go +++ /dev/null @@ -1,20 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -import "github.com/onsonr/sonr/pkg/nebula/models/inputtype" - -type Input struct { - Label string `pkl:"label"` - - Type inputtype.InputType `pkl:"type"` - - Placeholder string `pkl:"placeholder"` - - Value *string `pkl:"value"` - - Error *string `pkl:"error"` - - Help *string `pkl:"help"` - - Required *bool `pkl:"required"` -} diff --git a/pkg/nebula/models/Link.pkl.go b/pkg/nebula/models/Link.pkl.go deleted file mode 100644 index dc0342440..000000000 --- a/pkg/nebula/models/Link.pkl.go +++ /dev/null @@ -1,8 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Link struct { - Text string `pkl:"text"` - - Href string `pkl:"href"` -} diff --git a/pkg/nebula/models/Lowlights.pkl.go b/pkg/nebula/models/Lowlights.pkl.go deleted file mode 100644 index 8f160bb14..000000000 --- a/pkg/nebula/models/Lowlights.pkl.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Lowlights struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - Image *Image `pkl:"image"` -} diff --git a/pkg/nebula/models/ModalForm.pkl.go b/pkg/nebula/models/ModalForm.pkl.go deleted file mode 100644 index 41c9ec152..000000000 --- a/pkg/nebula/models/ModalForm.pkl.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type ModalForm struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - Id string `pkl:"id"` -} diff --git a/pkg/nebula/models/Models.pkl.go b/pkg/nebula/models/Models.pkl.go deleted file mode 100644 index e7c7c681e..000000000 --- a/pkg/nebula/models/Models.pkl.go +++ /dev/null @@ -1,45 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -import ( - "context" - - "github.com/apple/pkl-go/pkl" -) - -type Models struct { - Home *Home `pkl:"home"` - - Register *ModalForm `pkl:"register"` - - Login *ModalForm `pkl:"login"` - - Authorize *ModalForm `pkl:"authorize"` - - PrivacyConsent *ModalForm `pkl:"privacyConsent"` -} - -// LoadFromPath loads the pkl module at the given path and evaluates it into a Models -func LoadFromPath(ctx context.Context, path string) (ret *Models, err error) { - evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions) - if err != nil { - return nil, err - } - defer func() { - cerr := evaluator.Close() - if err == nil { - err = cerr - } - }() - ret, err = Load(ctx, evaluator, pkl.FileSource(path)) - return ret, err -} - -// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Models -func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Models, error) { - var ret Models - if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil { - return nil, err - } - return &ret, nil -} diff --git a/pkg/nebula/models/PublicKeyCreationOptions.pkl.go b/pkg/nebula/models/PublicKeyCreationOptions.pkl.go deleted file mode 100644 index 6d3e24d2b..000000000 --- a/pkg/nebula/models/PublicKeyCreationOptions.pkl.go +++ /dev/null @@ -1,5 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type PublicKeyCreationOptions struct { -} diff --git a/pkg/nebula/models/PublicKeyRequestOptions.pkl.go b/pkg/nebula/models/PublicKeyRequestOptions.pkl.go deleted file mode 100644 index 8507330df..000000000 --- a/pkg/nebula/models/PublicKeyRequestOptions.pkl.go +++ /dev/null @@ -1,5 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type PublicKeyRequestOptions struct { -} diff --git a/pkg/nebula/models/RegisterFormData.pkl.go b/pkg/nebula/models/RegisterFormData.pkl.go deleted file mode 100644 index e4b0d698e..000000000 --- a/pkg/nebula/models/RegisterFormData.pkl.go +++ /dev/null @@ -1,28 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type RegisterFormData interface { - Form -} - -var _ RegisterFormData = (*RegisterFormDataImpl)(nil) - -type RegisterFormDataImpl struct { - Title string `pkl:"title"` - - Description string `pkl:"description"` - - Inputs []*Input `pkl:"inputs"` -} - -func (rcv *RegisterFormDataImpl) GetTitle() string { - return rcv.Title -} - -func (rcv *RegisterFormDataImpl) GetDescription() string { - return rcv.Description -} - -func (rcv *RegisterFormDataImpl) GetInputs() []*Input { - return rcv.Inputs -} diff --git a/pkg/nebula/models/SocialLink.pkl.go b/pkg/nebula/models/SocialLink.pkl.go deleted file mode 100644 index 39399369b..000000000 --- a/pkg/nebula/models/SocialLink.pkl.go +++ /dev/null @@ -1,8 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type SocialLink struct { - Link *Link `pkl:"link"` - - Icon string `pkl:"icon"` -} diff --git a/pkg/nebula/models/Stat.pkl.go b/pkg/nebula/models/Stat.pkl.go deleted file mode 100644 index a58923b5a..000000000 --- a/pkg/nebula/models/Stat.pkl.go +++ /dev/null @@ -1,8 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Stat struct { - Value string `pkl:"value"` - - Label string `pkl:"label"` -} diff --git a/pkg/nebula/models/Stats.pkl.go b/pkg/nebula/models/Stats.pkl.go deleted file mode 100644 index c12e140a7..000000000 --- a/pkg/nebula/models/Stats.pkl.go +++ /dev/null @@ -1,16 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -type Stats struct { - FirstValue string `pkl:"firstValue"` - - FirstLabel string `pkl:"firstLabel"` - - SecondValue string `pkl:"secondValue"` - - SecondLabel string `pkl:"secondLabel"` - - ThirdValue string `pkl:"thirdValue"` - - ThirdLabel string `pkl:"thirdLabel"` -} diff --git a/pkg/nebula/models/common.go b/pkg/nebula/models/common.go deleted file mode 100644 index a0d1042d6..000000000 --- a/pkg/nebula/models/common.go +++ /dev/null @@ -1,36 +0,0 @@ -package models - -import ( - "context" - "errors" - - "github.com/apple/pkl-go/pkl" -) - -var models *Models - -func LoadFromString(ctx context.Context, s string) (err error) { - evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions) - if err != nil { - return err - } - defer func() { - cerr := evaluator.Close() - if err == nil { - err = cerr - } - }() - ret, err := Load(ctx, evaluator, pkl.TextSource(s)) - if err != nil { - return err - } - models = ret - return nil -} - -func GetModels() (*Models, error) { - if models == nil { - return nil, errors.New("models not initialized") - } - return models, nil -} diff --git a/pkg/nebula/models/events.go b/pkg/nebula/models/events.go deleted file mode 100644 index 2dd89d2a3..000000000 --- a/pkg/nebula/models/events.go +++ /dev/null @@ -1,13 +0,0 @@ -package models - -type Event string - -const ( - // Auth - AuthLoginSuccess Event = "login_success" - AuthLogoutSuccess Event = "logout_success" - AuthRegisterSuccess Event = "register_success" - AuthRegisterFailure Event = "register_failure" - - WalletTransactionConfirmed Event = "transaction_confirmed" -) diff --git a/pkg/nebula/models/init.pkl.go b/pkg/nebula/models/init.pkl.go deleted file mode 100644 index f33bd3f09..000000000 --- a/pkg/nebula/models/init.pkl.go +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package models - -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{}) - pkl.RegisterMapping("models#Stat", Stat{}) - pkl.RegisterMapping("models#ModalForm", ModalForm{}) -} diff --git a/pkg/nebula/models/inputtype/InputType.pkl.go b/pkg/nebula/models/inputtype/InputType.pkl.go deleted file mode 100644 index f234b3b7f..000000000 --- a/pkg/nebula/models/inputtype/InputType.pkl.go +++ /dev/null @@ -1,43 +0,0 @@ -// Code generated from Pkl module `models`. DO NOT EDIT. -package inputtype - -import ( - "encoding" - "fmt" -) - -type InputType string - -const ( - Text InputType = "text" - Password InputType = "password" - Email InputType = "email" - Credential InputType = "credential" - File InputType = "file" -) - -// String returns the string representation of InputType -func (rcv InputType) String() string { - return string(rcv) -} - -var _ encoding.BinaryUnmarshaler = new(InputType) - -// UnmarshalBinary implements encoding.BinaryUnmarshaler for InputType. -func (rcv *InputType) UnmarshalBinary(data []byte) error { - switch str := string(data); str { - case "text": - *rcv = Text - case "password": - *rcv = Password - case "email": - *rcv = Email - case "credential": - *rcv = Credential - case "file": - *rcv = File - default: - return fmt.Errorf(`illegal: "%s" is not a valid InputType`, str) - } - return nil -} diff --git a/pkg/nebula/models/marketing.go b/pkg/nebula/models/marketing.go new file mode 100644 index 000000000..e558e2e34 --- /dev/null +++ b/pkg/nebula/models/marketing.go @@ -0,0 +1,28 @@ +package models + +type Button struct { + Text string + Href string +} + +type Image struct { + Src string + Width string + Height string +} + +type Stat struct { + Value string + Label string +} + +type Hero struct { + TitleFirst string + TitleEmphasis string + TitleSecond string + Subtitle string + PrimaryButton *Button + SecondaryButton *Button + Image *Image + Stats []*Stat +} diff --git a/pkg/nebula/routes/routes.go b/pkg/nebula/routes/routes.go index 3bd754f7e..4d1338a71 100644 --- a/pkg/nebula/routes/routes.go +++ b/pkg/nebula/routes/routes.go @@ -8,7 +8,6 @@ import ( "github.com/onsonr/sonr/pkg/nebula/components/auth" "github.com/onsonr/sonr/pkg/nebula/components/home" - "github.com/onsonr/sonr/pkg/nebula/models" ) // ╭───────────────────────────────────────────────────────────╮ @@ -16,11 +15,7 @@ import ( // ╰───────────────────────────────────────────────────────────╯ func Home(c echo.Context) error { - mdls, err := models.GetModels() - if err != nil { - return err - } - return render(c, home.View(mdls.Home)) + return render(c, home.View()) } // ╭───────────────────────────────────────────────────────────╮ diff --git a/pkl/UIUX.pkl b/pkl/UIUX.pkl deleted file mode 100644 index f4b392a97..000000000 --- a/pkl/UIUX.pkl +++ /dev/null @@ -1,57 +0,0 @@ -@go.Package { name = "github.com/onsonr/sonr/pkg/nebula/models" } - -module models - -import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl" - -// ╭───────────────────────────────────────────────────────────╮ -// │ General State │ -// ╰───────────────────────────────────────────────────────────╯ - -class Button { - text: String - href: String -} - -class Image { - src: String - width: String - height: String -} - -class Stat { - value: String - label: String -} - -class ModalForm { - title: String - description: String - id: String -} - -// ╭───────────────────────────────────────────────────────────╮ -// │ View Models │ -// ╰───────────────────────────────────────────────────────────╯ - -class Hero { - titleFirst: String - titleEmphasis: String - titleSecond: String - subtitle: String - primaryButton: Button - secondaryButton: Button - image: Image - stats: Listing -} - -class Home { - hero: Hero -} - -home : Home -register: ModalForm -login: ModalForm -authorize: ModalForm -privacyConsent: ModalForm -