-
{ text }
+templ Container() {
+
}
diff --git a/internal/nebula/layout/container_templ.go b/internal/nebula/layout/container_templ.go
index 34a8679ee..c02d5ed6d 100644
--- a/internal/nebula/layout/container_templ.go
+++ b/internal/nebula/layout/container_templ.go
@@ -8,8 +8,7 @@ package layout
import "github.com/a-h/templ"
import templruntime "github.com/a-h/templ/runtime"
-// Columns is a component that renders a responsive flex container that stacks on mobile
-func Columns() templ.Component {
+func Container() 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 {
@@ -30,7 +29,7 @@ func Columns() templ.Component {
templ_7745c5c3_Var1 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -38,87 +37,7 @@ func Columns() templ.Component {
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
- }
- return templ_7745c5c3_Err
- })
-}
-
-// Rows is a component that renders a responsive flex container that wraps on mobile
-func Rows() 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 {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var2 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var2 == nil {
- templ_7745c5c3_Var2 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- templ_7745c5c3_Err = templ_7745c5c3_Var2.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
- }
- return templ_7745c5c3_Err
- })
-}
-
-func Separator(text string) 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 {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var3 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var3 == nil {
- templ_7745c5c3_Var3 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- var templ_7745c5c3_Var4 string
- templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(text)
- if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/container.templ`, Line: 21, Col: 45}
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
diff --git a/internal/nebula/layout/grid.templ b/internal/nebula/layout/grid.templ
new file mode 100644
index 000000000..4b2ef729b
--- /dev/null
+++ b/internal/nebula/layout/grid.templ
@@ -0,0 +1,24 @@
+package layout
+
+// Columns is a component that renders a responsive flex container that stacks on mobile
+templ Columns() {
+
+ { children... }
+
+}
+
+// Rows is a component that renders a responsive flex container that wraps on mobile
+templ Rows() {
+
+ { children... }
+
+}
+
+templ Separator(text string) {
+
+}
diff --git a/internal/nebula/layout/grid_templ.go b/internal/nebula/layout/grid_templ.go
new file mode 100644
index 000000000..4db78d318
--- /dev/null
+++ b/internal/nebula/layout/grid_templ.go
@@ -0,0 +1,129 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.793
+package layout
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+// Columns is a component that renders a responsive flex container that stacks on mobile
+func Columns() 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 {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = templ_7745c5c3_Var1.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
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+// Rows is a component that renders a responsive flex container that wraps on mobile
+func Rows() 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 {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var2 == nil {
+ templ_7745c5c3_Var2 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = templ_7745c5c3_Var2.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
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+func Separator(text string) 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 {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var3 == nil {
+ templ_7745c5c3_Var3 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ var templ_7745c5c3_Var4 string
+ templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(text)
+ if templ_7745c5c3_Err != nil {
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/grid.templ`, Line: 21, Col: 45}
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+ 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
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+var _ = templruntime.GeneratedTemplate
diff --git a/internal/nebula/layout/scripts.templ b/internal/nebula/layout/head.templ
similarity index 71%
rename from internal/nebula/layout/scripts.templ
rename to internal/nebula/layout/head.templ
index e7fbaf921..d42780a80 100644
--- a/internal/nebula/layout/scripts.templ
+++ b/internal/nebula/layout/head.templ
@@ -11,6 +11,56 @@ var (
turnstileHandle = templ.NewOnceHandle()
)
+templ Head(title string, nebulaVersion string) {
+
+ @Turnstile()
+ @Tailwind()
+ @Alpine()
+ @Htmx()
+ @Dexie()
+ @Nebula(nebulaVersion)
+
+
+
+
{ title }
+
+
+
+
+
+ { children... }
+
+}
+
// ╭──────────────────────────────────────────────────────────╮
// │ 3rd Party Libraries │
// ╰──────────────────────────────────────────────────────────╯
diff --git a/internal/nebula/layout/scripts_templ.go b/internal/nebula/layout/head_templ.go
similarity index 72%
rename from internal/nebula/layout/scripts_templ.go
rename to internal/nebula/layout/head_templ.go
index 76c0b5823..fe6d98888 100644
--- a/internal/nebula/layout/scripts_templ.go
+++ b/internal/nebula/layout/head_templ.go
@@ -19,6 +19,84 @@ var (
turnstileHandle = templ.NewOnceHandle()
)
+func Head(title string, nebulaVersion string) 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 {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = Turnstile().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = Tailwind().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = Alpine().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = Htmx().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = Dexie().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = Nebula(nebulaVersion).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
+ }
+ var templ_7745c5c3_Var2 string
+ templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(title)
+ if templ_7745c5c3_Err != nil {
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 25, Col: 16}
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+ 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 = templ_7745c5c3_Var1.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
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
// ╭──────────────────────────────────────────────────────────╮
// │ 3rd Party Libraries │
// ╰──────────────────────────────────────────────────────────╯
@@ -40,12 +118,12 @@ func Tailwind() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var1 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var1 == nil {
- templ_7745c5c3_Var1 = templ.NopComponent
+ templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var3 == nil {
+ templ_7745c5c3_Var3 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_Var4 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
@@ -63,7 +141,7 @@ func Tailwind() templ.Component {
}
return templ_7745c5c3_Err
})
- templ_7745c5c3_Err = tailwindHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
+ templ_7745c5c3_Err = tailwindHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -88,12 +166,12 @@ func Turnstile() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var3 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var3 == nil {
- templ_7745c5c3_Var3 = templ.NopComponent
+ templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var5 == nil {
+ templ_7745c5c3_Var5 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var4 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_Var6 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
@@ -111,7 +189,7 @@ func Turnstile() templ.Component {
}
return templ_7745c5c3_Err
})
- templ_7745c5c3_Err = turnstileHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
+ templ_7745c5c3_Err = turnstileHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -136,12 +214,12 @@ func Alpine() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var5 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var5 == nil {
- templ_7745c5c3_Var5 = templ.NopComponent
+ templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var7 == nil {
+ templ_7745c5c3_Var7 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var6 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_Var8 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
@@ -157,12 +235,12 @@ func Alpine() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var7 string
- templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("alpinejs", "3.14.6", "dist/cdn.min.js"))
+ var templ_7745c5c3_Var9 string
+ templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("alpinejs", "3.14.6", "dist/cdn.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 36, Col: 68}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 86, Col: 68}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -170,12 +248,12 @@ func Alpine() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var8 string
- templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("@alpinejs/focus", "3.14.6", "dist/cdn.min.js"))
+ var templ_7745c5c3_Var10 string
+ templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("@alpinejs/focus", "3.14.6", "dist/cdn.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 37, Col: 75}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 87, Col: 75}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -185,7 +263,7 @@ func Alpine() templ.Component {
}
return templ_7745c5c3_Err
})
- templ_7745c5c3_Err = alpineHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
+ templ_7745c5c3_Err = alpineHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var8), templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -210,12 +288,12 @@ func Dexie() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var9 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var9 == nil {
- templ_7745c5c3_Var9 = templ.NopComponent
+ templ_7745c5c3_Var11 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var11 == nil {
+ templ_7745c5c3_Var11 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var10 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_Var12 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
@@ -231,12 +309,12 @@ func Dexie() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var11 string
- templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("dexie", "4.0.10", "dist/dexie.min.js"))
+ var templ_7745c5c3_Var13 string
+ templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("dexie", "4.0.10", "dist/dexie.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 44, Col: 67}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 94, Col: 67}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -244,12 +322,12 @@ func Dexie() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var12 string
- templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("dexie-export-import", "4.1.4", "dist/dexie-export-import.min.js"))
+ var templ_7745c5c3_Var14 string
+ templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("dexie-export-import", "4.1.4", "dist/dexie-export-import.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 45, Col: 94}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 95, Col: 94}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -259,7 +337,7 @@ func Dexie() templ.Component {
}
return templ_7745c5c3_Err
})
- templ_7745c5c3_Err = dexieHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var10), templ_7745c5c3_Buffer)
+ templ_7745c5c3_Err = dexieHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var12), templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -284,12 +362,12 @@ func Htmx() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var13 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var13 == nil {
- templ_7745c5c3_Var13 = templ.NopComponent
+ templ_7745c5c3_Var15 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var15 == nil {
+ templ_7745c5c3_Var15 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var14 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_Var16 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
@@ -305,12 +383,12 @@ func Htmx() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var15 string
- templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx.org", "1.9.12", "dist/htmx.min.js"))
+ var templ_7745c5c3_Var17 string
+ templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx.org", "1.9.12", "dist/htmx.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 52, Col: 69}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 102, Col: 69}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -318,12 +396,12 @@ func Htmx() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var16 string
- templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx-ext-include-vals", "2.0.0", "include-vals.min.js"))
+ var templ_7745c5c3_Var18 string
+ templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx-ext-include-vals", "2.0.0", "include-vals.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 53, Col: 84}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 103, Col: 84}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -331,12 +409,12 @@ func Htmx() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var17 string
- templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx-ext-path-params", "2.0.0", "path-params.min.js"))
+ var templ_7745c5c3_Var19 string
+ templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx-ext-path-params", "2.0.0", "path-params.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 54, Col: 82}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 104, Col: 82}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -344,12 +422,12 @@ func Htmx() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var18 string
- templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx-ext-alpine-morph", "2.0.0", "alpine-morph.min.js"))
+ var templ_7745c5c3_Var20 string
+ templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(jsDelivrURL("htmx-ext-alpine-morph", "2.0.0", "alpine-morph.min.js"))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/scripts.templ`, Line: 55, Col: 84}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/layout/head.templ`, Line: 105, Col: 84}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -359,7 +437,7 @@ func Htmx() templ.Component {
}
return templ_7745c5c3_Err
})
- templ_7745c5c3_Err = htmxHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var14), templ_7745c5c3_Buffer)
+ templ_7745c5c3_Err = htmxHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var16), templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -384,21 +462,21 @@ func Nebula(version string) templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var19 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var19 == nil {
- templ_7745c5c3_Var19 = templ.NopComponent
+ templ_7745c5c3_Var21 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var21 == nil {
+ templ_7745c5c3_Var21 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
}
-templ Head(title string, nebulaVersion string) {
-
- @Turnstile()
- @Tailwind()
- @Alpine()
- @Htmx()
- @Dexie()
- @Nebula(nebulaVersion)
-
-
-
-
{ title }
-
-
-
-
-
- { children... }
-
-}
-
templ Body(align Alignment, screenWidth ScreenWidth) {
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- templ_7745c5c3_Err = templ_7745c5c3_Var2.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
- }
- return templ_7745c5c3_Err
- })
-}
-
-func Body(align Alignment, screenWidth ScreenWidth) 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 {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var4 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var4 == nil {
- templ_7745c5c3_Var4 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- templ_7745c5c3_Err = templ_7745c5c3_Var4.Render(ctx, templ_7745c5c3_Buffer)
+ templ_7745c5c3_Err = templ_7745c5c3_Var2.Render(ctx, templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
diff --git a/internal/vault/handlers/auth/handlers.go b/internal/vault/handlers/auth.go
similarity index 100%
rename from internal/vault/handlers/auth/handlers.go
rename to internal/vault/handlers/auth.go
diff --git a/internal/vault/handlers/authz/handlers.go b/internal/vault/handlers/authz.go
similarity index 100%
rename from internal/vault/handlers/authz/handlers.go
rename to internal/vault/handlers/authz.go
diff --git a/internal/vault/handlers/feeds/handlers.go b/internal/vault/handlers/feeds.go
similarity index 75%
rename from internal/vault/handlers/feeds/handlers.go
rename to internal/vault/handlers/feeds.go
index a978d7f05..7f4621b14 100644
--- a/internal/vault/handlers/feeds/handlers.go
+++ b/internal/vault/handlers/feeds.go
@@ -6,6 +6,6 @@ import (
"github.com/labstack/echo/v4"
)
-func Handler(c echo.Context) error {
+func RenderFeeds(c echo.Context) error {
return c.Render(http.StatusOK, "index.templ", nil)
}
diff --git a/internal/vault/handlers/index/handlers.go b/internal/vault/handlers/index.go
similarity index 80%
rename from internal/vault/handlers/index/handlers.go
rename to internal/vault/handlers/index.go
index e543a3a53..8656afb8d 100644
--- a/internal/vault/handlers/index/handlers.go
+++ b/internal/vault/handlers/index.go
@@ -7,9 +7,9 @@ import (
"github.com/onsonr/sonr/internal/vault/context"
)
-func Handler(c echo.Context) error {
+func RenderIndex(c echo.Context) error {
// TODO: Create views
- if isInitial(c) {
+ if isReturning(c) {
// return response.TemplEcho(c, index.InitialView())
}
// TODO: Add authorization check
@@ -23,14 +23,6 @@ func Handler(c echo.Context) error {
// │ Utility Functions │
// ╰─────────────────────────────────────────────────────────╯
-// Initial users have no authorization, user handle, or vault address
-func isInitial(c echo.Context) bool {
- noAuth := !context.HasAuthorization(c)
- noUserHandle := !context.HasUserHandle(c)
- noVaultAddress := !context.HasVaultAddress(c)
- return noUserHandle && noVaultAddress && noAuth
-}
-
// Expired users have either a user handle or vault address
func isExpired(c echo.Context) bool {
noAuth := !context.HasAuthorization(c)
diff --git a/internal/vault/handlers/profile/handlers.go b/internal/vault/handlers/profile.go
similarity index 100%
rename from internal/vault/handlers/profile/handlers.go
rename to internal/vault/handlers/profile.go
diff --git a/internal/vault/handlers/search/handlers.go b/internal/vault/handlers/search.go
similarity index 100%
rename from internal/vault/handlers/search/handlers.go
rename to internal/vault/handlers/search.go
diff --git a/internal/vault/handlers/wallet/handlers.go b/internal/vault/handlers/wallet.go
similarity index 100%
rename from internal/vault/handlers/wallet/handlers.go
rename to internal/vault/handlers/wallet.go
diff --git a/pkg/config/hway/Hway.pkl.go b/pkg/config/hway/Hway.pkl.go
index 7859e50e7..09c88ce2a 100644
--- a/pkg/config/hway/Hway.pkl.go
+++ b/pkg/config/hway/Hway.pkl.go
@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.conf.Hway`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.net.Hway`. DO NOT EDIT.
package hway
import (
@@ -10,8 +10,6 @@ import (
type Hway interface {
GetServePort() int
- GetConfigDir() string
-
GetSqliteFile() string
GetChainId() string
@@ -23,6 +21,8 @@ type Hway interface {
GetSonrGrpcUrl() string
GetSonrRpcUrl() string
+
+ GetPsqlDSN() string
}
var _ Hway = (*HwayImpl)(nil)
@@ -30,8 +30,6 @@ var _ Hway = (*HwayImpl)(nil)
type HwayImpl struct {
ServePort int `pkl:"servePort"`
- ConfigDir string `pkl:"configDir"`
-
SqliteFile string `pkl:"sqliteFile"`
ChainId string `pkl:"chainId"`
@@ -43,16 +41,14 @@ type HwayImpl struct {
SonrGrpcUrl string `pkl:"sonrGrpcUrl"`
SonrRpcUrl string `pkl:"sonrRpcUrl"`
+
+ PsqlDSN string `pkl:"psqlDSN"`
}
func (rcv *HwayImpl) GetServePort() int {
return rcv.ServePort
}
-func (rcv *HwayImpl) GetConfigDir() string {
- return rcv.ConfigDir
-}
-
func (rcv *HwayImpl) GetSqliteFile() string {
return rcv.SqliteFile
}
@@ -77,6 +73,10 @@ func (rcv *HwayImpl) GetSonrRpcUrl() string {
return rcv.SonrRpcUrl
}
+func (rcv *HwayImpl) GetPsqlDSN() string {
+ return rcv.PsqlDSN
+}
+
// LoadFromPath loads the pkl module at the given path and evaluates it into a Hway
func LoadFromPath(ctx context.Context, path string) (ret Hway, err error) {
evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions)
diff --git a/pkg/config/hway/init.pkl.go b/pkg/config/hway/init.pkl.go
index d4ed3bee2..f8e5b2d88 100644
--- a/pkg/config/hway/init.pkl.go
+++ b/pkg/config/hway/init.pkl.go
@@ -1,8 +1,8 @@
-// Code generated from Pkl module `sonr.conf.Hway`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.net.Hway`. DO NOT EDIT.
package hway
import "github.com/apple/pkl-go/pkl"
func init() {
- pkl.RegisterMapping("sonr.conf.Hway", HwayImpl{})
+ pkl.RegisterMapping("sonr.net.Hway", HwayImpl{})
}
diff --git a/pkg/config/motr/Config.pkl.go b/pkg/config/motr/Config.pkl.go
index 2957560c9..4e20c6040 100644
--- a/pkg/config/motr/Config.pkl.go
+++ b/pkg/config/motr/Config.pkl.go
@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.net.Motr`. DO NOT EDIT.
package motr
type Config struct {
diff --git a/pkg/config/motr/Environment.pkl.go b/pkg/config/motr/Environment.pkl.go
index 5824d6ecc..8235f7724 100644
--- a/pkg/config/motr/Environment.pkl.go
+++ b/pkg/config/motr/Environment.pkl.go
@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.net.Motr`. DO NOT EDIT.
package motr
type Environment struct {
diff --git a/pkg/config/motr/Motr.pkl.go b/pkg/config/motr/Motr.pkl.go
index 35beff0b0..5aeb64bf0 100644
--- a/pkg/config/motr/Motr.pkl.go
+++ b/pkg/config/motr/Motr.pkl.go
@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.net.Motr`. DO NOT EDIT.
package motr
import (
diff --git a/pkg/config/motr/Schema.pkl.go b/pkg/config/motr/Schema.pkl.go
index 8ea43bd32..9a0e9742f 100644
--- a/pkg/config/motr/Schema.pkl.go
+++ b/pkg/config/motr/Schema.pkl.go
@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.net.Motr`. DO NOT EDIT.
package motr
type Schema struct {
diff --git a/pkg/config/motr/init.pkl.go b/pkg/config/motr/init.pkl.go
index 0b9d6ee41..fac9199be 100644
--- a/pkg/config/motr/init.pkl.go
+++ b/pkg/config/motr/init.pkl.go
@@ -1,11 +1,11 @@
-// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.net.Motr`. DO NOT EDIT.
package motr
import "github.com/apple/pkl-go/pkl"
func init() {
- pkl.RegisterMapping("sonr.conf.Motr", Motr{})
- pkl.RegisterMapping("sonr.conf.Motr#Config", Config{})
- pkl.RegisterMapping("sonr.conf.Motr#Schema", Schema{})
- pkl.RegisterMapping("sonr.conf.Motr#Environment", Environment{})
+ pkl.RegisterMapping("sonr.net.Motr", Motr{})
+ pkl.RegisterMapping("sonr.net.Motr#Config", Config{})
+ pkl.RegisterMapping("sonr.net.Motr#Schema", Schema{})
+ pkl.RegisterMapping("sonr.net.Motr#Environment", Environment{})
}
diff --git a/pkg/database/sessions/models.go b/pkg/database/sessions/models.go
deleted file mode 100644
index 4eeb7e235..000000000
--- a/pkg/database/sessions/models.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package sessions
-
-import (
- "net/http"
-
- "github.com/labstack/echo/v4"
- "gorm.io/gorm"
-)
-
-var (
- ErrInvalidCredentials = echo.NewHTTPError(http.StatusUnauthorized, "Invalid credentials")
- ErrInvalidSubject = echo.NewHTTPError(http.StatusBadRequest, "Invalid subject")
- ErrInvalidUser = echo.NewHTTPError(http.StatusBadRequest, "Invalid user")
-
- ErrUserAlreadyExists = echo.NewHTTPError(http.StatusConflict, "User already exists")
- ErrUserNotFound = echo.NewHTTPError(http.StatusNotFound, "User not found")
-)
-
-type User struct {
- gorm.Model
- Address string `json:"address"`
- Handle string `json:"handle"`
- Name string `json:"name"`
- CID string `json:"cid"`
-}
-
-type Session struct {
- gorm.Model
- ID string `json:"id" gorm:"primaryKey"`
- BrowserName string `json:"browserName"`
- BrowserVersion string `json:"browserVersion"`
- UserArchitecture string `json:"userArchitecture"`
- Platform string `json:"platform"`
- PlatformVersion string `json:"platformVersion"`
- DeviceModel string `json:"deviceModel"`
- UserHandle string `json:"userHandle"`
- FirstName string `json:"firstName"`
- LastInitial string `json:"lastInitial"`
- VaultAddress string `json:"vaultAddress"`
- HumanSum int `json:"humanSum"`
- Challenge string `json:"challenge"`
-}
diff --git a/pkg/database/sessions/sqlite.go b/pkg/database/sessions/sqlite.go
deleted file mode 100644
index 109275a9f..000000000
--- a/pkg/database/sessions/sqlite.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package sessions
-
-import (
- "os"
- "path/filepath"
-
- config "github.com/onsonr/sonr/pkg/config/hway"
- "gorm.io/driver/sqlite"
- "gorm.io/gorm"
-)
-
-// NewGormDB initializes and returns a configured database connection
-func NewGormDB(env config.Hway) (*gorm.DB, error) {
- path := formatDBPath(env.GetSqliteFile())
- db, err := gorm.Open(sqlite.Open(path), &gorm.Config{})
- if err != nil {
- return nil, err
- }
-
- // Migrate the schema
- db.AutoMigrate(&Session{})
- db.AutoMigrate(&User{})
- return db, nil
-}
-
-func formatDBPath(path string) string {
- home := os.Getenv("HOME")
- if home == "" {
- home = os.Getenv("USERPROFILE")
- }
- if home == "" {
- home = "."
- }
-
- configDir := filepath.Join(home, ".config", "hway")
- if err := os.MkdirAll(configDir, 0o755); err != nil {
- // If we can't create the directory, fall back to current directory
- return path
- }
-
- return filepath.Join(configDir, path)
-}
diff --git a/pkg/didauth/controller/config.go b/pkg/didauth/controller/config.go
index 7c86443fa..e76ece96f 100644
--- a/pkg/didauth/controller/config.go
+++ b/pkg/didauth/controller/config.go
@@ -2,7 +2,7 @@ package controller
import (
"github.com/labstack/echo/v4"
- "github.com/onsonr/sonr/crypto/ucan/spec"
+ "github.com/onsonr/sonr/crypto/mpc/spec"
)
// ControllerConfig defines the configuration for UCAN middleware
diff --git a/pkg/didauth/controller/middleware.go b/pkg/didauth/controller/middleware.go
index 41bccac1e..3c88539a1 100644
--- a/pkg/didauth/controller/middleware.go
+++ b/pkg/didauth/controller/middleware.go
@@ -8,7 +8,7 @@ import (
"strings"
"github.com/labstack/echo/v4"
- "github.com/onsonr/sonr/crypto/ucan/spec"
+ "github.com/onsonr/sonr/crypto/mpc/spec"
)
// Middleware returns middleware to validate Middleware tokens
diff --git a/pkg/didauth/producer/context.go b/pkg/didauth/producer/context.go
index ae7ccbe2f..ba7311c1d 100644
--- a/pkg/didauth/producer/context.go
+++ b/pkg/didauth/producer/context.go
@@ -3,8 +3,7 @@ package producer
import (
"github.com/labstack/echo/v4"
"github.com/onsonr/sonr/crypto/ucan"
- "github.com/onsonr/sonr/crypto/ucan/store"
- "github.com/onsonr/sonr/pkg/common/ipfs"
+ "github.com/onsonr/sonr/pkg/ipfsapi"
)
type ProducerContext struct {
@@ -13,8 +12,8 @@ type ProducerContext struct {
TokenParser *ucan.TokenParser
// TokenStore is the token store used to store and retrieve tokens
- TokenStore store.IPFSTokenStore
+ TokenStore ipfsapi.IPFSTokenStore
// IPFSClient is the IPFS client used to resolve the UCAN
- IPFSClient ipfs.Client
+ IPFSClient ipfsapi.Client
}
diff --git a/pkg/didauth/producer/middleware.go b/pkg/didauth/producer/middleware.go
index f79b34255..82f59eb92 100644
--- a/pkg/didauth/producer/middleware.go
+++ b/pkg/didauth/producer/middleware.go
@@ -3,16 +3,15 @@ package producer
import (
"github.com/onsonr/sonr/crypto/mpc"
"github.com/onsonr/sonr/crypto/ucan"
- "github.com/onsonr/sonr/crypto/ucan/store"
- "github.com/onsonr/sonr/pkg/common/ipfs"
+ "github.com/onsonr/sonr/pkg/ipfsapi"
"github.com/labstack/echo/v4"
)
// Middleware returns middleware to spawn controllers and validate UCAN tokens
-func Middleware(ipfs ipfs.Client, perms ucan.Permissions) echo.MiddlewareFunc {
+func Middleware(ipc ipfsapi.Client, perms ucan.Permissions) echo.MiddlewareFunc {
// Setup token store and parser
- store := store.NewIPFSTokenStore(ipfs)
+ store := ipfsapi.NewUCANStore(ipc)
parser := ucan.NewTokenParser(perms.GetConstructor(), store, store)
// Return middleware
@@ -20,7 +19,7 @@ func Middleware(ipfs ipfs.Client, perms ucan.Permissions) echo.MiddlewareFunc {
return func(c echo.Context) error {
ctx := ProducerContext{
Context: c,
- IPFSClient: ipfs,
+ IPFSClient: ipc,
TokenParser: parser,
TokenStore: store,
}
@@ -29,8 +28,8 @@ func Middleware(ipfs ipfs.Client, perms ucan.Permissions) echo.MiddlewareFunc {
}
}
-func NewKeyset(c echo.Context) (mpc.Keyset, error) {
- ks, err := mpc.NewKeyset()
+func NewKeyset(c echo.Context) (mpc.Enclave, error) {
+ ks, err := mpc.GenEnclave()
if err != nil {
return nil, err
}
diff --git a/pkg/common/ipfs/client.go b/pkg/ipfsapi/client.go
similarity index 99%
rename from pkg/common/ipfs/client.go
rename to pkg/ipfsapi/client.go
index 679536681..1425eb6be 100644
--- a/pkg/common/ipfs/client.go
+++ b/pkg/ipfsapi/client.go
@@ -1,4 +1,4 @@
-package ipfs
+package ipfsapi
import (
"bytes"
diff --git a/pkg/common/ipfs/file.go b/pkg/ipfsapi/file.go
similarity index 96%
rename from pkg/common/ipfs/file.go
rename to pkg/ipfsapi/file.go
index e3f5d531a..3f1e0aa03 100644
--- a/pkg/common/ipfs/file.go
+++ b/pkg/ipfsapi/file.go
@@ -1,4 +1,4 @@
-package ipfs
+package ipfsapi
import (
"context"
diff --git a/pkg/common/ipfs/folder.go b/pkg/ipfsapi/folder.go
similarity index 95%
rename from pkg/common/ipfs/folder.go
rename to pkg/ipfsapi/folder.go
index 4fbe0438c..511e2f03f 100644
--- a/pkg/common/ipfs/folder.go
+++ b/pkg/ipfsapi/folder.go
@@ -1,4 +1,4 @@
-package ipfs
+package ipfsapi
import (
"context"
diff --git a/pkg/common/ipfs/ipfs.go b/pkg/ipfsapi/iface.go
similarity index 97%
rename from pkg/common/ipfs/ipfs.go
rename to pkg/ipfsapi/iface.go
index 2d0fa8bfe..63f4c0ef1 100644
--- a/pkg/common/ipfs/ipfs.go
+++ b/pkg/ipfsapi/iface.go
@@ -1,4 +1,4 @@
-package ipfs
+package ipfsapi
import "github.com/ipfs/boxo/files"
diff --git a/crypto/ucan/store/ipfs.go b/pkg/ipfsapi/ucans.go
similarity index 66%
rename from crypto/ucan/store/ipfs.go
rename to pkg/ipfsapi/ucans.go
index c7e723fbc..9ca466a12 100644
--- a/crypto/ucan/store/ipfs.go
+++ b/pkg/ipfsapi/ucans.go
@@ -1,4 +1,4 @@
-package store
+package ipfsapi
import (
"context"
@@ -8,34 +8,33 @@ import (
"github.com/golang-jwt/jwt"
"github.com/ipfs/go-cid"
+ "github.com/onsonr/sonr/crypto/keys"
"github.com/onsonr/sonr/crypto/ucan"
- "github.com/onsonr/sonr/crypto/ucan/didkey"
- "github.com/onsonr/sonr/pkg/common/ipfs"
)
type IPFSTokenStore interface {
ucan.TokenStore
ResolveCIDBytes(ctx context.Context, id cid.Cid) ([]byte, error)
- ResolveDIDKey(ctx context.Context, did string) (didkey.ID, error)
+ ResolveDIDKey(ctx context.Context, did string) (keys.DID, error)
}
-// ipfsTokenStore is a token store that uses IPFS to store tokens. It uses the memory store as a cache
+// ipfsUCANStore is a token store that uses IPFS to store tokens. It uses the memory store as a cache
// for CID strings to be used as keys for retrieving tokens.
-type ipfsTokenStore struct {
+type ipfsUCANStore struct {
sync.Mutex
- ipfs ipfs.Client
+ ipfs Client
cache map[string]string
}
-// NewIPFSTokenStore creates a new IPFS-backed token store
-func NewIPFSTokenStore(ipfsClient ipfs.Client) IPFSTokenStore {
- return &ipfsTokenStore{
+// NewUCANStore creates a new IPFS-backed token store
+func NewUCANStore(ipfsClient Client) IPFSTokenStore {
+ return &ipfsUCANStore{
ipfs: ipfsClient,
cache: make(map[string]string),
}
}
-func (st *ipfsTokenStore) PutToken(ctx context.Context, key string, raw string) error {
+func (st *ipfsUCANStore) PutToken(ctx context.Context, key string, raw string) error {
// Validate token format
p := &jwt.Parser{
UseJSONNumber: true,
@@ -58,7 +57,7 @@ func (st *ipfsTokenStore) PutToken(ctx context.Context, key string, raw string)
return nil
}
-func (st *ipfsTokenStore) RawToken(ctx context.Context, key string) (string, error) {
+func (st *ipfsUCANStore) RawToken(ctx context.Context, key string) (string, error) {
st.Lock()
cid, exists := st.cache[key]
st.Unlock()
@@ -76,7 +75,7 @@ func (st *ipfsTokenStore) RawToken(ctx context.Context, key string) (string, err
return string(data), nil
}
-func (st *ipfsTokenStore) DeleteToken(ctx context.Context, key string) error {
+func (st *ipfsUCANStore) DeleteToken(ctx context.Context, key string) error {
st.Lock()
defer st.Unlock()
@@ -94,7 +93,7 @@ func (st *ipfsTokenStore) DeleteToken(ctx context.Context, key string) error {
return nil
}
-func (st *ipfsTokenStore) ListTokens(ctx context.Context, offset, limit int) ([]ucan.RawToken, error) {
+func (st *ipfsUCANStore) ListTokens(ctx context.Context, offset, limit int) ([]ucan.RawToken, error) {
st.Lock()
defer st.Unlock()
@@ -126,7 +125,7 @@ func (st *ipfsTokenStore) ListTokens(ctx context.Context, offset, limit int) ([]
return tokens[offset:end], nil
}
-func (st *ipfsTokenStore) ResolveCIDBytes(ctx context.Context, id cid.Cid) ([]byte, error) {
+func (st *ipfsUCANStore) ResolveCIDBytes(ctx context.Context, id cid.Cid) ([]byte, error) {
data, err := st.ipfs.Get(id.String())
if err != nil {
return nil, fmt.Errorf("failed to resolve CID bytes: %w", err)
@@ -134,10 +133,10 @@ func (st *ipfsTokenStore) ResolveCIDBytes(ctx context.Context, id cid.Cid) ([]by
return data, nil
}
-func (st *ipfsTokenStore) ResolveDIDKey(ctx context.Context, did string) (didkey.ID, error) {
- id, err := didkey.Parse(did)
+func (st *ipfsUCANStore) ResolveDIDKey(ctx context.Context, did string) (keys.DID, error) {
+ id, err := keys.Parse(did)
if err != nil {
- return didkey.ID{}, fmt.Errorf("failed to parse DID: %w", err)
+ return keys.DID{}, fmt.Errorf("failed to parse DID: %w", err)
}
return id, nil
}
diff --git a/pkl/sonr.chain/App.pkl b/pkl/sonr.chain/App.pkl
deleted file mode 100644
index 9ec0317c8..000000000
--- a/pkl/sonr.chain/App.pkl
+++ /dev/null
@@ -1,89 +0,0 @@
-open module sonr.chain.App
-
-import "package://pkg.pkl-lang.org/pkl-pantry/pkl.toml@1.0.0#/toml.pkl"
-
-class Chain {
- `minimum-gas-prices`: String = "0stake"
- `query-gas-limit`: String = "0"
- pruning: String = "default"
- `pruning-keep-recent`: String = "0"
- `pruning-interval`: String = "0"
- `halt-height`: Int = 0
- `halt-time`: Int = 0
- `min-retain-blocks`: Int = 0
- `inter-block-cache`: Boolean = true
- `index-events`: Listing = new {}
- `iavl-cache-size`: Int = 781250
- `iavl-disable-fastnode`: Boolean = false
- `app-db-backend`: String = ""
- telemetry: Telemetry = new {}
- api: Api = new {}
- grpc: Grpc = new {}
- `grpc-web`: GrpcWeb = new {}
- `state-sync`: StateSync = new {}
- streaming: Streaming = new {}
- mempool: Mempool = new {}
-}
-
-class Telemetry {
- `service-name`: String = ""
- enabled: Boolean = true
- `enable-hostname`: Boolean = false
- `enable-hostname-label`: Boolean = false
- `enable-service-label`: Boolean = false
- `prometheus-retention-time`: Int = 60
- `global-labels`: Listing> = new {
- new {
- "chain_id"
- "chain-NKlMbx"
- }
- }
- `metrics-sink`: String = ""
- `statsd-addr`: String = ""
- `datadog-hostname`: String = ""
-}
-
-class Api {
- enable: Boolean = true
- swagger: Boolean = false
- address: String = "tcp://0.0.0.0:1317"
- `max-open-connections`: Int = 1000
- `rpc-read-timeout`: Int = 10
- `rpc-write-timeout`: Int = 0
- `rpc-max-body-bytes`: Int = 1000000
- `enabled-unsafe-cors`: Boolean = false
-}
-
-class Grpc {
- enable: Boolean = true
- address: String = "0.0.0.0:9090"
- `max-recv-msg-size`: String = "10485760"
- `max-send-msg-size`: String = "2147483647"
-}
-
-class GrpcWeb {
- enable: Boolean = true
-}
-
-class StateSync {
- `snapshot-interval`: Int = 0
- `snapshot-keep-recent`: Int = 2
-}
-
-class Streaming {
- abci: Abci = new {}
-}
-
-class Abci {
- keys: Listing = new {}
- plugin: String = ""
- `stop-node-on-err`: Boolean = true
-}
-
-class Mempool {
- `max-txs`: Int = 5000
-}
-
-output {
- renderer = new toml.Renderer {}
-}
diff --git a/pkl/sonr.chain/Config.pkl b/pkl/sonr.chain/Config.pkl
deleted file mode 100644
index ee5e50c52..000000000
--- a/pkl/sonr.chain/Config.pkl
+++ /dev/null
@@ -1,154 +0,0 @@
-open module sonr.chain.Config
-
-import "package://pkg.pkl-lang.org/pkl-pantry/pkl.toml@1.0.0#/toml.pkl"
-
-class Chain {
- version: String = "0.38.5"
- proxy_app: String = "tcp://127.0.0.1:26658"
- moniker: String = "node0"
- db_backend: String = "goleveldb"
- db_dir: String = "data"
- log_level: String = "info"
- log_format: String = "plain"
- genesis_file: String = "config/genesis.json"
- priv_validator_key_file: String = "config/priv_validator_key.json"
- priv_validator_state_file: String = "data/priv_validator_state.json"
- priv_validator_laddr: String = ""
- node_key_file: String = "config/node_key.json"
- abci: String = "socket"
- filter_peers: Boolean = false
-
- rpc: Rpc = new {}
- p2p: P2p = new {}
- mempool: Mempool = new {}
- statesync: StateSync = new {}
- blocksync: BlockSync = new {}
- consensus: Consensus = new {}
- storage: Storage = new {}
- tx_index: TxIndex = new {}
- instrumentation: Instrumentation = new {}
-}
-
-class Rpc {
- laddr: String = "tcp://0.0.0.0:26657"
- cors_allowed_origins: Listing = new {}
- cors_allowed_methods: Listing = new {
- "HEAD"
- "GET"
- "POST"
- }
- cors_allowed_headers: Listing = new {
- "Origin"
- "Accept"
- "Content-Type"
- "X-Requested-With"
- "X-Server-Time"
- }
- grpc_laddr: String = ""
- grpc_max_open_connections: Int = 900
- unsafe: Boolean = false
- max_open_connections: Int = 900
- max_subscription_clients: Int = 100
- max_subscriptions_per_client: Int = 5
- experimental_subscription_buffer_size: Int = 200
- experimental_websocket_write_buffer_size: Int = 200
- experimental_close_on_slow_client: Boolean = false
- timeout_broadcast_tx_commit: String = "10s"
- max_body_bytes: Int = 1000000
- max_header_bytes: Int = 1048576
- tls_cert_file: String = ""
- tls_key_file: String = ""
- pprof_laddr: String = "localhost:6060"
-}
-
-class P2p {
- laddr: String = "tcp://0.0.0.0:26656"
- external_address: String = ""
- seeds: String = ""
- persistent_peers: String = read("env:SONR_PERSISTENT_PEERS") ?? ""
- addr_book_file: String = "config/addrbook.json"
- addr_book_strict: Boolean = true
- max_num_inbound_peers: Int = 40
- max_num_outbound_peers: Int = 10
- unconditional_peer_ids: String = ""
- persistent_peers_max_dial_period: String = "0s"
- flush_throttle_timeout: String = "100ms"
- max_packet_msg_payload_size: Int = 1024
- send_rate: Int = 5120000
- recv_rate: Int = 5120000
- pex: Boolean = true
- seed_mode: Boolean = false
- private_peer_ids: String = ""
- allow_duplicate_ip: Boolean = false
- handshake_timeout: String = "20s"
- dial_timeout: String = "3s"
-}
-
-class Mempool {
- type: String = "flood"
- recheck: Boolean = true
- broadcast: Boolean = true
- wal_dir: String = ""
- size: Int = 5000
- max_txs_bytes: Int = 1073741824
- cache_size: Int = 10000
- `keep-invalid-txs-in-cache`: Boolean = false
- max_tx_bytes: Int = 1048576
- max_batch_bytes: Int = 0
- experimental_max_gossip_connections_to_persistent_peers: Int = 0
- experimental_max_gossip_connections_to_non_persistent_peers: Int = 0
-}
-
-class StateSync {
- enable: Boolean = false
- rpc_servers: String = ""
- trust_height: Int = 0
- trust_hash: String = ""
- trust_period: String = "168h0m0s"
- discovery_time: String = "15s"
- temp_dir: String = ""
- chunk_request_timeout: String = "10s"
- chunk_fetchers: String = "4"
-}
-
-class BlockSync {
- version: String = "v0"
-}
-
-class Consensus {
- wal_file: String = "data/cs.wal/wal"
- timeout_propose: String = "3s"
- timeout_propose_delta: String = "500ms"
- timeout_prevote: String = "1s"
- timeout_prevote_delta: String = "500ms"
- timeout_precommit: String = "1s"
- timeout_precommit_delta: String = "500ms"
- timeout_commit: String = "5s"
- double_sign_check_height: Int = 0
- skip_timeout_commit: Boolean = false
- create_empty_blocks: Boolean = true
- create_empty_blocks_interval: String = "0s"
- peer_gossip_sleep_duration: String = "100ms"
- peer_query_maj23_sleep_duration: String = "2s"
-}
-
-class Storage {
- discard_abci_responses: Boolean = false
-}
-
-class TxIndex {
- indexer: String = "kv"
- `psql-conn`: String = read("env:SONR_PSQL_CONN") ?? ""
-}
-
-class Instrumentation {
- prometheus: Boolean = false
- prometheus_listen_addr: String = ":26660"
- max_open_connections: Int = 3
- namespace: String = "cometbft"
-}
-
-
-output {
- renderer = new toml.Renderer {}
-}
diff --git a/pkl/sonr.chain/Genesis.pkl b/pkl/sonr.chain/Genesis.pkl
deleted file mode 100644
index 3247a1ea5..000000000
--- a/pkl/sonr.chain/Genesis.pkl
+++ /dev/null
@@ -1,747 +0,0 @@
-open module sonr.chain.Genesis
-
-app_name: String
-
-app_version: String
-
-genesis_time: String
-
-chain_id: String
-
-initial_height: Int
-
-app_hash: Any
-
-app_state: AppState
-
-consensus: Consensus
-
-class AppState {
- `07-tendermint`: Any
-
- auth: Auth
-
- authz: Authz
-
- bank: Bank
-
- capability: Capability
-
- circuit: Circuit
-
- consensus: Any
-
- crisis: Crisis
-
- did: Did
-
- distribution: Distribution
-
- dwn: Dwn
-
- evidence: Evidence
-
- feegrant: Feegrant
-
- feeibc: Feeibc
-
- genutil: Genutil
-
- globalfee: Globalfee
-
- gov: Gov
-
- group: Group
-
- ibc: Ibc
-
- interchainaccounts: Interchainaccounts
-
- mint: Mint
-
- nft: Nft
-
- packetfowardmiddleware: Packetfowardmiddleware
-
- params: Any
-
- poa: Poa
-
- slashing: Slashing
-
- staking: Staking
-
- svc: Svc
-
- tokenfactory: Tokenfactory
-
- transfer: Transfer
-
- upgrade: Dynamic
-
- vesting: Dynamic
-}
-
-class Auth {
- params: Params
-
- accounts: Listing
-}
-
-class Params {
- max_memo_characters: String
-
- tx_sig_limit: String
-
- tx_size_cost_per_byte: String
-
- sig_verify_cost_ed25519: String
-
- sig_verify_cost_secp256k1: String
-}
-
-class AccountsItem1 {
- `@type`: String
-
- address: String
-
- pub_key: Any
-
- account_number: String
-
- sequence: String
-}
-
-class Authz {
- authorization: Listing
-}
-
-class Bank {
- params: BankParams
-
- balances: Listing
-
- supply: Listing
-
- denom_metadata: Listing
-
- send_enabled: Listing
-}
-
-class BankParams {
- send_enabled: Listing
-
- default_send_enabled: Boolean
-}
-
-class BalancesItem1 {
- address: String
-
- coins: Listing
-}
-
-class ExpeditedMinDepositItem0 {
- denom: String
-
- amount: String
-}
-
-class Capability {
- index: String
-
- owners: Listing
-}
-
-class Circuit {
- account_permissions: Listing
-
- disabled_type_urls: Listing
-}
-
-class Crisis {
- constant_fee: ExpeditedMinDepositItem0
-}
-
-class Did {
- params: Dynamic
-}
-
-class Distribution {
- params: DistributionParams
-
- fee_pool: FeePool
-
- delegator_withdraw_infos: Listing
-
- previous_proposer: String
-
- outstanding_rewards: Listing
-
- validator_accumulated_commissions: Listing
-
- validator_historical_rewards: Listing
-
- validator_current_rewards: Listing
-
- delegator_starting_infos: Listing
-
- validator_slash_events: Listing
-}
-
-class DistributionParams {
- community_tax: String
-
- base_proposer_reward: String
-
- bonus_proposer_reward: String
-
- withdraw_addr_enabled: Boolean
-}
-
-class FeePool {
- community_pool: Listing
-}
-
-class Dwn {
- params: DwnParams
-}
-
-class DwnParams {
- allowed_public_keys: Dynamic
-
- conveyance_preference: String
-
- attestation_formats: Listing
-
- schema: Schema
-
- allowed_operators: Listing
-}
-
-class Schema {
- version: Int
-
- account: String
-
- asset: String
-
- chain: String
-
- credential: String
-
- did: String
-
- jwk: String
-
- grant: String
-
- keyshare: String
-
- profile: String
-}
-
-class Evidence {
- evidence: Listing
-}
-
-class Feegrant {
- allowances: Listing
-}
-
-class Feeibc {
- identified_fees: Listing
-
- fee_enabled_channels: Listing
-
- registered_payees: Listing
-
- registered_counterparty_payees: Listing
-
- forward_relayers: Listing
-}
-
-class Genutil {
- gen_txs: Listing
-}
-
-class GenTxsItem0 {
- body: Body
-
- auth_info: AuthInfo
-
- signatures: Listing
-}
-
-class Body {
- messages: Listing
-
- memo: String
-
- timeout_height: String
-
- extension_options: Listing
-
- non_critical_extension_options: Listing
-}
-
-class MessagesItem0 {
- `@type`: String
-
- description: Description
-
- commission: Commission
-
- min_self_delegation: String
-
- delegator_address: String
-
- validator_address: String
-
- pubkey: PublicKey
-
- value: ExpeditedMinDepositItem0
-}
-
-class Description {
- moniker: String
-
- identity: String
-
- website: String
-
- security_contact: String
-
- details: String
-}
-
-class Commission {
- rate: String
-
- max_rate: String
-
- max_change_rate: String
-}
-
-class PublicKey {
- `@type`: String
-
- key: String
-}
-
-class AuthInfo {
- signer_infos: Listing
-
- fee: Fee
-
- tip: Any
-}
-
-class SignerInfosItem0 {
- public_key: PublicKey
-
- mode_info: ModeInfo
-
- sequence: String
-}
-
-class ModeInfo {
- single: Single
-}
-
-class Single {
- mode: String
-}
-
-class Fee {
- amount: Listing
-
- gas_limit: String
-
- payer: String
-
- granter: String
-}
-
-class Globalfee {
- params: GlobalfeeParams
-}
-
-class GlobalfeeParams {
- minimum_gas_prices: Listing
-}
-
-class MinimumGasPricesItem0 {
- amount: String
-
- denom: String
-}
-
-class Gov {
- starting_proposal_id: String
-
- deposits: Listing
-
- votes: Listing
-
- proposals: Listing
-
- deposit_params: Any
-
- voting_params: Any
-
- tally_params: Any
-
- params: GovParams
-
- constitution: String
-}
-
-class GovParams {
- min_deposit: Listing
-
- max_deposit_period: String
-
- voting_period: String
-
- quorum: String
-
- threshold: String
-
- veto_threshold: String
-
- min_initial_deposit_ratio: String
-
- proposal_cancel_ratio: String
-
- proposal_cancel_dest: String
-
- expedited_voting_period: String
-
- expedited_threshold: String
-
- expedited_min_deposit: Listing
-
- burn_vote_quorum: Boolean
-
- burn_proposal_deposit_prevote: Boolean
-
- burn_vote_veto: Boolean
-
- min_deposit_ratio: String
-}
-
-class Group {
- group_seq: String
-
- groups: Listing
-
- group_members: Listing
-
- group_policy_seq: String
-
- group_policies: Listing
-
- proposal_seq: String
-
- proposals: Listing
-
- votes: Listing
-}
-
-class Ibc {
- client_genesis: ClientGenesis
-
- connection_genesis: ConnectionGenesis
-
- channel_genesis: ChannelGenesis
-}
-
-class ClientGenesis {
- clients: Listing
-
- clients_consensus: Listing
-
- clients_metadata: Listing
-
- params: ClientGenesisParams
-
- create_localhost: Boolean
-
- next_client_sequence: String
-}
-
-class ClientGenesisParams {
- allowed_clients: Listing
-}
-
-class ConnectionGenesis {
- connections: Listing
-
- client_connection_paths: Listing
-
- next_connection_sequence: String
-
- params: ConnectionGenesisParams
-}
-
-class ConnectionGenesisParams {
- max_expected_time_per_block: String
-}
-
-class ChannelGenesis {
- channels: Listing
-
- acknowledgements: Listing
-
- commitments: Listing
-
- receipts: Listing
-
- send_sequences: Listing
-
- recv_sequences: Listing
-
- ack_sequences: Listing
-
- next_channel_sequence: String
-
- params: ChannelGenesisParams
-}
-
-class ChannelGenesisParams {
- upgrade_timeout: UpgradeTimeout
-}
-
-class UpgradeTimeout {
- height: Height
-
- timestamp: String
-}
-
-class Height {
- revision_number: String
-
- revision_height: String
-}
-
-class Interchainaccounts {
- controller_genesis_state: ControllerGenesisState
-
- host_genesis_state: HostGenesisState
-}
-
-class ControllerGenesisState {
- active_channels: Listing
-
- interchain_accounts: Listing
-
- ports: Listing
-
- params: ControllerGenesisStateParams
-}
-
-class ControllerGenesisStateParams {
- controller_enabled: Boolean
-}
-
-class HostGenesisState {
- active_channels: Listing
-
- interchain_accounts: Listing
-
- port: String
-
- params: HostGenesisStateParams
-}
-
-class HostGenesisStateParams {
- host_enabled: Boolean
-
- allow_messages: Listing
-}
-
-class Mint {
- minter: Minter
-
- params: MintParams
-}
-
-class Minter {
- inflation: String
-
- annual_provisions: String
-}
-
-class MintParams {
- mint_denom: String
-
- inflation_rate_change: String
-
- inflation_max: String
-
- inflation_min: String
-
- goal_bonded: String
-
- blocks_per_year: String
-}
-
-class Nft {
- classes: Listing
-
- entries: Listing
-}
-
-class Packetfowardmiddleware {
- params: PacketfowardmiddlewareParams
-
- in_flight_packets: Dynamic
-}
-
-class PacketfowardmiddlewareParams {
- fee_percentage: String
-}
-
-class Poa {
- params: PoaParams
-}
-
-class PoaParams {
- admins: Listing
-
- allow_validator_self_exit: Boolean
-}
-
-class Slashing {
- params: SlashingParams
-
- signing_infos: Listing
-
- missed_blocks: Listing
-}
-
-class SlashingParams {
- signed_blocks_window: String
-
- min_signed_per_window: String
-
- downtime_jail_duration: String
-
- slash_fraction_double_sign: String
-
- slash_fraction_downtime: String
-}
-
-class Staking {
- params: StakingParams
-
- last_total_power: String
-
- last_validator_powers: Listing
-
- validators: Listing
-
- delegations: Listing
-
- unbonding_delegations: Listing
-
- redelegations: Listing
-
- exported: Boolean
-}
-
-class StakingParams {
- unbonding_time: String
-
- max_validators: Int
-
- max_entries: Int
-
- historical_entries: Int
-
- bond_denom: String
-
- min_commission_rate: String
-}
-
-class Svc {
- params: SvcParams
-}
-
-class SvcParams {
- categories: Any
-
- types: Any
-}
-
-class Tokenfactory {
- params: TokenfactoryParams
-
- factory_denoms: Listing
-}
-
-class TokenfactoryParams {
- denom_creation_fee: Listing
-
- denom_creation_gas_consume: Int
-}
-
-class Transfer {
- port_id: String
-
- denom_traces: Listing
-
- params: TransferParams
-
- total_escrowed: Listing
-}
-
-class TransferParams {
- send_enabled: Boolean
-
- receive_enabled: Boolean
-}
-
-class Consensus {
- params: ConsensusParams
-}
-
-class ConsensusParams {
- block: Block
-
- evidence: ParamsEvidence
-
- validator: Validator
-
- version: Version
-
- abci: Abci
-}
-
-class Block {
- max_bytes: String
-
- max_gas: String
-}
-
-class ParamsEvidence {
- max_age_num_blocks: String
-
- max_age_duration: String
-
- max_bytes: String
-}
-
-class Validator {
- pub_key_types: Listing
-}
-
-class Version {
- app: String
-}
-
-class Abci {
- vote_extensions_enable_height: String
-}
-
-
diff --git a/pkl/sonr.chain/PklProject b/pkl/sonr.chain/PklProject
deleted file mode 100644
index a5185f92b..000000000
--- a/pkl/sonr.chain/PklProject
+++ /dev/null
@@ -1,22 +0,0 @@
-//===----------------------------------------------------------------------===//
-// Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//===----------------------------------------------------------------------===//
-/// Base configuration files for initializing a sonr chain
-amends "../basePklProject.pkl"
-
-package {
- name = "sonr.chain"
- version = "0.0.2"
-}
diff --git a/pkl/sonr.conf/PklProject.deps.json b/pkl/sonr.conf/PklProject.deps.json
deleted file mode 100644
index 836079aad..000000000
--- a/pkl/sonr.conf/PklProject.deps.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "schemaVersion": 1,
- "resolvedDependencies": {}
-}
\ No newline at end of file
diff --git a/pkl/sonr.conf/Hway.pkl b/pkl/sonr.net/Hway.pkl
similarity index 86%
rename from pkl/sonr.conf/Hway.pkl
rename to pkl/sonr.net/Hway.pkl
index de5223012..a0a70b4a0 100644
--- a/pkl/sonr.conf/Hway.pkl
+++ b/pkl/sonr.net/Hway.pkl
@@ -1,18 +1,17 @@
@go.Package { name = "github.com/onsonr/sonr/pkg/config/hway" }
-open module sonr.conf.Hway
+open module sonr.net.Hway
import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl"
servePort: Int = 3000
-configDir: String = "~/.config/hway"
sqliteFile: String = "hway.db"
chainId: String = "sonr-testnet-1"
ipfsGatewayUrl: String = "http://localhost:8080"
sonrApiUrl: String = "http://localhost:1317"
sonrGrpcUrl: String = "http://localhost:9090"
sonrRpcUrl: String = "http://localhost:26657"
-
+psqlDSN: String
diff --git a/pkl/sonr.conf/Motr.pkl b/pkl/sonr.net/Motr.pkl
similarity index 97%
rename from pkl/sonr.conf/Motr.pkl
rename to pkl/sonr.net/Motr.pkl
index 88d89a28f..2239e3e62 100644
--- a/pkl/sonr.conf/Motr.pkl
+++ b/pkl/sonr.net/Motr.pkl
@@ -1,6 +1,6 @@
@go.Package { name = "github.com/onsonr/sonr/pkg/config/motr" }
-module sonr.conf.Motr
+module sonr.net.Motr
import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl"
diff --git a/pkl/sonr.conf/PklProject b/pkl/sonr.net/PklProject
similarity index 97%
rename from pkl/sonr.conf/PklProject
rename to pkl/sonr.net/PklProject
index 9aaf524d8..16362f342 100644
--- a/pkl/sonr.conf/PklProject
+++ b/pkl/sonr.net/PklProject
@@ -17,6 +17,6 @@
amends "../basePklProject.pkl"
package {
- name = "sonr.conf"
+ name = "sonr.net"
version = "0.0.1"
}
diff --git a/pkl/sonr.chain/PklProject.deps.json b/pkl/sonr.net/PklProject.deps.json
similarity index 100%
rename from pkl/sonr.chain/PklProject.deps.json
rename to pkl/sonr.net/PklProject.deps.json