bump: version 0.5.9 → 0.5.10

- **feat: remove grant page**
- **refactor: remove alert, input, radios, tabs, and video blocks**
- **feat: add JSON serialization to DWN config**
- **feat: add new Highway gateway component**
- **refactor: remove unused chains.yaml and devbox.json**
- **refactor: Separate request and response headers into protected and
non-protected structs**
- **feat: Update the UseSession echo middleware to bind the correct
headers and provide methods for updating HTMX context from Go**
- **refactor: remove unused headers from session**
- **feat: add authorize endpoint**
- **feat: create marketing pages**

.cz.toml

@@ -2,6 +2,6 @@
 name = "cz_conventional_commits"
 tag_format = "v$version"
 version_scheme = "semver"
-version = "0.4.3"
+version = "0.5.10"
 update_changelog_on_bump = true
 major_version_zero = true

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,38 @@
+name: Bug Report
+description: File a bug report.
+title: "ERROR: "
+labels: ["#BUG", "#HELP"]
+projects: ["onsonr/39"]
+body:
+  - type: textarea
+    attributes:
+      label: Operating System
+      description: What operating system are you using?
+      placeholder: "Example: macOS Big Sur"
+      value: operating system
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Network
+      description: What network are you using?
+      multiple: false
+      options:
+        - LocalNet
+        - TestNet
+        - MainNet
+      default: 0
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description:
+        The Code of Conduct helps create a safe space for everyone. We require
+        that everyone agrees to it.
+      options:
+        - label: I agree to follow this project's [Code of Conduct](link/to/coc)
+          required: true
+  - type: markdown
+    attributes:
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Discussions
+    url: https://github.com/orgs/onsonr/discussions
+    about: Please submit ideas and suggestions here.

.github/ISSUE_TEMPLATE/okr.yml

@@ -0,0 +1,30 @@
+name: Tracking issue
+description: Use this template for tracking new features.
+title: "(v0.6): FEATURE NAME"
+labels: ["#TRACK", "#OKR"]
+assignees: ["prnk28"]
+projects: ["onsonr/37"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is this associated with a milestone?
+      description: This is a tracking issue for tracking a new feature for a given milestone.
+      options:
+        - label: I have confirmed this is an OKR tracking issue
+          required: true
+  - type: textarea
+    attributes:
+      label: Objective
+      description: Explain the objective of the feature and add any relevant links.
+      render: markdown
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Task List
+      description: |
+        Break down the objective into a list of tasks to be completed.
+      value: |
+        - [ ]
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/to-do.md

@@ -0,0 +1,22 @@
+---
+name: Default Todo
+about: Break down feature requirements into tasks.
+title: "Name of the new task"
+labels:
+  - "#TODO"
+  - "#OKR"
+assignees: "prnk28"
+projects: "onsonr/37"
+---
+
+### Description
+
+The expected deliverable of the task.
+
+### Associated Files
+
+These files will be modified by this task.
+
+### References
+
+Use these documents to help you complete the task.

.github/workflows/scheduled-release.yml

@@ -31,7 +31,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Release
         uses: goreleaser/goreleaser-action@v6

.goreleaser.yaml

@@ -14,22 +14,22 @@ builds:
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
 
-  - id: motr
+  - id: hway
     goos: [linux, darwin]
     goarch: [amd64, arm64]
-    main: ./cmd/motr
+    main: ./cmd/hway
-    binary: motr
+    binary: hway
     builder: go
     gobinary: go
     command: build
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
 
-  - id: dwn
+  - id: motr
     goos: [js]
     goarch: [wasm]
-    main: ./cmd/dwn/dwn.go
+    main: ./cmd/motr/motr.go
-    binary: dwn
+    binary: motr
     builder: go
     gobinary: go
     command: build
@@ -43,8 +43,8 @@ archives:
       - src: README*
       - src: CHANGELOG*
 
-  - id: motr
+  - id: hway
-    builds: [motr]
+    builds: [hway]
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
     format: tar.gz
     files:
@@ -55,7 +55,7 @@ release:
   github:
     owner: onsonr
     name: sonr
-  name_template: '{{.Now.Format "2006.01.02"}}'
+  name_template: "Release {{.Version}}"
   draft: false
   replace_existing_draft: true
   replace_existing_artifacts: true
@@ -63,7 +63,6 @@ release:
     - glob: ./CHANGELOG*
     - glob: ./README*
     - glob: ./LICENSE*
-    - glob: ./pkl/*
 
 brews:
   - name: sonr
@@ -72,7 +71,7 @@ brews:
       name: goreleaserbot
       email: bot@goreleaser.com
     directory: Formula
-    caveats: "Run a local sonr node and access it with the motr proxy"
+    caveats: "Run a local sonr node and access it with the hway proxy"
     homepage: "https://sonr.io/"
     description: "Sonr is a decentralized, permissionless, and censorship-resistant identity network."
     dependencies:
@@ -83,13 +82,13 @@ brews:
       branch: master
       token: "{{ .Env.GITHUB_PERSONAL_AUTH_TOKEN }}"
 
-  - name: motr
+  - name: hway
-    ids: [motr]
+    ids: [hway]
     commit_author:
       name: goreleaserbot
       email: bot@goreleaser.com
     directory: Formula
-    caveats: "Use motr to interact with the Sonr network"
+    caveats: "Use hway to interact with the Sonr network"
     homepage: "https://sonr.io/"
     description: "Motr is a proxy for interacting with the Sonr network."
     dependencies:
@@ -110,7 +109,7 @@ dockers:
     image_templates:
       - "onsonr/sonrd:latest"
       - "onsonr/sonrd:{{ .Tag }}"
-    dockerfile: "./deploy/release/sonrd.Dockerfile"
+    dockerfile: "./deploy/sonrd.Dockerfile"
     build_flag_templates:
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title=sonrd"
@@ -118,18 +117,18 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
 
   - # Motr Binary
-    id: motr
+    id: hway
     goos: linux
     goarch: amd64
     ids:
-      - motr
+      - hway
     image_templates:
-      - "onsonr/motr:latest"
+      - "onsonr/hway:latest"
-      - "onsonr/motr:{{ .Tag }}"
+      - "onsonr/hway:{{ .Tag }}"
-    dockerfile: "./deploy/release/motr.Dockerfile"
+    dockerfile: "./deploy/hway.Dockerfile"
     build_flag_templates:
       - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title=motr"
+      - "--label=org.opencontainers.image.title=hway"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
 
@@ -137,5 +136,3 @@ announce:
   telegram:
     enabled: true
     chat_id: -1002222617755
-    message_template: 'New Sonr Release {{.Tag}} is out{{ mdv2escape "!" }}'
-    parse_mode: HTML

CHANGELOG.md

@@ -1,3 +1,101 @@
+## v0.5.10 (2024-10-07)
+
+### Feat
+
+- **blocks**: remove button component
+
+## v0.5.9 (2024-10-06)
+
+### Feat
+
+- add Motr support
+- update UIUX PKL to utilize optional fields
+
+### Fix
+
+- Update source directory for asset publishing
+
+## v0.5.8 (2024-10-04)
+
+### Refactor
+
+- Remove unused logs configuration
+
+## v0.5.7 (2024-10-04)
+
+### Feat
+
+- **devbox**: use process-compose for testnet services
+- remove motr.mjs dependency
+- add markdown rendering to issue templates
+- update issue templates for better clarity
+- add issue templates for tracking and task issues
+- add issue templates for bug report and tracking
+- introduce docker-compose based setup
+
+### Refactor
+
+- update issue template headings
+- rename bug-report issue template to bug
+
+## v0.5.6 (2024-10-03)
+
+### Feat
+
+- add hway and sonr processes to dev environment
+
+## v0.5.5 (2024-10-03)
+
+### Feat
+
+- add rudimentary DidController table
+- update home section with new features
+- introduce Home model and refactor views
+- **nebula**: create Home model for home page
+
+### Refactor
+
+- reorganize pkl files for better separation of concerns
+- rename msg_server_test.go to rpc_test.go
+
+## v0.5.4 (2024-10-02)
+
+## v0.5.3 (2024-10-02)
+
+### Fix
+
+- remove unnecessary telegram message template
+
+## v0.5.2 (2024-10-02)
+
+### Feat
+
+- **service**: integrate group module (#1104)
+
+### Refactor
+
+- revert version bump to 0.5.1
+
+## v0.5.1 (2024-10-02)
+
+### Refactor
+
+- move Motr API to state package
+
+## v0.5.0 (2024-10-02)
+
+### Feat
+
+- allow multiple macaroons with the same id
+
+## v0.4.5 (2024-10-02)
+
+### Fix
+
+- use correct secret for docker login
+
+## v0.4.4 (2024-10-02)
+
 ## v0.4.3 (2024-10-02)
 
 ### Feat

Makefile

@@ -94,7 +94,7 @@ endif
 
 install: go.sum
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/sonrd
-	go install -mod=readonly $(BUILD_FLAGS) ./cmd/motr
+	go install -mod=readonly $(BUILD_FLAGS) ./cmd/hway
 
 ########################################
 ### Tools & dependencies
@@ -295,19 +295,19 @@ sh-testnet: mod-tidy
 ###                                 templ & vault                           ###
 ###############################################################################
 
-.PHONY: dwn motr templ pkl nebula
+.PHONY: motr hway templ pkl nebula
+
+hway:
+	@echo "(motr) Building Highway gateway"
+	templ generate
+	go build -o ./build/hway ./cmd/hway
 
 motr:
-	@echo "(motr) Building motr gateway"
+	@echo "(dwn) Building motr.wasm -> Service Worker IPFS Vault"
-	go build -o ./build/motr ./cmd/motr
+	GOOS=js GOARCH=wasm go build -o ./pkg/dwn/app.wasm ./cmd/motr/motr.go
-
-dwn:
-	@echo "(dwn) Building dwn.wasm -> IPFS Vault"
-	GOOS=js GOARCH=wasm go build -o ./pkg/dwn/app.wasm ./cmd/dwn/dwn.go
 
 templ:
 	@echo "(templ) Generating templ files"
-	go install github.com/a-h/templ/cmd/templ@latest
 	templ generate
 
 nebula:
@@ -316,18 +316,18 @@ nebula:
 
 pkl:
 	@echo "(pkl) Building 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/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/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/Txns.pkl
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/uiux.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/UIUX.pkl
 
 start-caddy:
 	@echo "(start-caddy) Starting caddy"
 	./build/caddy run --config ./config/caddy/Caddyfile
 
-start-motr: motr
+start-hway: hway
 	@echo "(start-proxy) Starting proxy server"
-	./build/motr start
+	./build/hway start
 
 ###############################################################################
 ###                                     help                                ###

api/macaroon/v1/genesis.pulsar.go

@@ -1042,61 +1042,63 @@ func (x *fastReflection_Params) ProtoMethods() *protoiface.Methods {
 	}
 }
 
-var _ protoreflect.List = (*_Methods_1_list)(nil)
+var _ protoreflect.List = (*_Methods_2_list)(nil)
 
-type _Methods_1_list struct {
+type _Methods_2_list struct {
 	list *[]string
 }
 
-func (x *_Methods_1_list) Len() int {
+func (x *_Methods_2_list) Len() int {
 	if x.list == nil {
 		return 0
 	}
 	return len(*x.list)
 }
 
-func (x *_Methods_1_list) Get(i int) protoreflect.Value {
+func (x *_Methods_2_list) Get(i int) protoreflect.Value {
 	return protoreflect.ValueOfString((*x.list)[i])
 }
 
-func (x *_Methods_1_list) Set(i int, value protoreflect.Value) {
+func (x *_Methods_2_list) Set(i int, value protoreflect.Value) {
 	valueUnwrapped := value.String()
 	concreteValue := valueUnwrapped
 	(*x.list)[i] = concreteValue
 }
 
-func (x *_Methods_1_list) Append(value protoreflect.Value) {
+func (x *_Methods_2_list) Append(value protoreflect.Value) {
 	valueUnwrapped := value.String()
 	concreteValue := valueUnwrapped
 	*x.list = append(*x.list, concreteValue)
 }
 
-func (x *_Methods_1_list) AppendMutable() protoreflect.Value {
+func (x *_Methods_2_list) AppendMutable() protoreflect.Value {
-	panic(fmt.Errorf("AppendMutable can not be called on message Methods at list field Methods as it is not of Message kind"))
+	panic(fmt.Errorf("AppendMutable can not be called on message Methods at list field Supported as it is not of Message kind"))
 }
 
-func (x *_Methods_1_list) Truncate(n int) {
+func (x *_Methods_2_list) Truncate(n int) {
 	*x.list = (*x.list)[:n]
 }
 
-func (x *_Methods_1_list) NewElement() protoreflect.Value {
+func (x *_Methods_2_list) NewElement() protoreflect.Value {
 	v := ""
 	return protoreflect.ValueOfString(v)
 }
 
-func (x *_Methods_1_list) IsValid() bool {
+func (x *_Methods_2_list) IsValid() bool {
 	return x.list != nil
 }
 
 var (
-	md_Methods         protoreflect.MessageDescriptor
+	md_Methods           protoreflect.MessageDescriptor
-	fd_Methods_methods protoreflect.FieldDescriptor
+	fd_Methods_default   protoreflect.FieldDescriptor
+	fd_Methods_supported protoreflect.FieldDescriptor
 )
 
 func init() {
 	file_macaroon_v1_genesis_proto_init()
 	md_Methods = File_macaroon_v1_genesis_proto.Messages().ByName("Methods")
-	fd_Methods_methods = md_Methods.Fields().ByName("methods")
+	fd_Methods_default = md_Methods.Fields().ByName("default")
+	fd_Methods_supported = md_Methods.Fields().ByName("supported")
 }
 
 var _ protoreflect.Message = (*fastReflection_Methods)(nil)
@@ -1164,9 +1166,15 @@ func (x *fastReflection_Methods) Interface() protoreflect.ProtoMessage {
 // While iterating, mutating operations may only be performed
 // on the current field descriptor.
 func (x *fastReflection_Methods) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
-	if len(x.Methods) != 0 {
+	if x.Default != "" {
-		value := protoreflect.ValueOfList(&_Methods_1_list{list: &x.Methods})
+		value := protoreflect.ValueOfString(x.Default)
-		if !f(fd_Methods_methods, value) {
+		if !f(fd_Methods_default, value) {
+			return
+		}
+	}
+	if len(x.Supported) != 0 {
+		value := protoreflect.ValueOfList(&_Methods_2_list{list: &x.Supported})
+		if !f(fd_Methods_supported, value) {
 			return
 		}
 	}
@@ -1185,8 +1193,10 @@ func (x *fastReflection_Methods) Range(f func(protoreflect.FieldDescriptor, prot
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_Methods) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "macaroon.v1.Methods.methods":
+	case "macaroon.v1.Methods.default":
-		return len(x.Methods) != 0
+		return x.Default != ""
+	case "macaroon.v1.Methods.supported":
+		return len(x.Supported) != 0
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Methods"))
@@ -1203,8 +1213,10 @@ func (x *fastReflection_Methods) Has(fd protoreflect.FieldDescriptor) bool {
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Methods) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "macaroon.v1.Methods.methods":
+	case "macaroon.v1.Methods.default":
-		x.Methods = nil
+		x.Default = ""
+	case "macaroon.v1.Methods.supported":
+		x.Supported = nil
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Methods"))
@@ -1221,11 +1233,14 @@ func (x *fastReflection_Methods) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_Methods) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "macaroon.v1.Methods.methods":
+	case "macaroon.v1.Methods.default":
-		if len(x.Methods) == 0 {
+		value := x.Default
-			return protoreflect.ValueOfList(&_Methods_1_list{})
+		return protoreflect.ValueOfString(value)
+	case "macaroon.v1.Methods.supported":
+		if len(x.Supported) == 0 {
+			return protoreflect.ValueOfList(&_Methods_2_list{})
 		}
-		listValue := &_Methods_1_list{list: &x.Methods}
+		listValue := &_Methods_2_list{list: &x.Supported}
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
@@ -1247,10 +1262,12 @@ func (x *fastReflection_Methods) Get(descriptor protoreflect.FieldDescriptor) pr
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Methods) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "macaroon.v1.Methods.methods":
+	case "macaroon.v1.Methods.default":
+		x.Default = value.Interface().(string)
+	case "macaroon.v1.Methods.supported":
 		lv := value.List()
-		clv := lv.(*_Methods_1_list)
+		clv := lv.(*_Methods_2_list)
-		x.Methods = *clv.list
+		x.Supported = *clv.list
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Methods"))
@@ -1271,12 +1288,14 @@ func (x *fastReflection_Methods) Set(fd protoreflect.FieldDescriptor, value prot
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Methods) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "macaroon.v1.Methods.methods":
+	case "macaroon.v1.Methods.supported":
-		if x.Methods == nil {
+		if x.Supported == nil {
-			x.Methods = []string{}
+			x.Supported = []string{}
 		}
-		value := &_Methods_1_list{list: &x.Methods}
+		value := &_Methods_2_list{list: &x.Supported}
 		return protoreflect.ValueOfList(value)
+	case "macaroon.v1.Methods.default":
+		panic(fmt.Errorf("field default of message macaroon.v1.Methods is not mutable"))
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Methods"))
@@ -1290,9 +1309,11 @@ func (x *fastReflection_Methods) Mutable(fd protoreflect.FieldDescriptor) protor
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_Methods) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "macaroon.v1.Methods.methods":
+	case "macaroon.v1.Methods.default":
+		return protoreflect.ValueOfString("")
+	case "macaroon.v1.Methods.supported":
 		list := []string{}
-		return protoreflect.ValueOfList(&_Methods_1_list{list: &list})
+		return protoreflect.ValueOfList(&_Methods_2_list{list: &list})
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Methods"))
@@ -1362,8 +1383,12 @@ func (x *fastReflection_Methods) ProtoMethods() *protoiface.Methods {
 		var n int
 		var l int
 		_ = l
-		if len(x.Methods) > 0 {
+		l = len(x.Default)
-			for _, s := range x.Methods {
+		if l > 0 {
+			n += 1 + l + runtime.Sov(uint64(l))
+		}
+		if len(x.Supported) > 0 {
+			for _, s := range x.Supported {
 				l = len(s)
 				n += 1 + l + runtime.Sov(uint64(l))
 			}
@@ -1397,15 +1422,22 @@ func (x *fastReflection_Methods) ProtoMethods() *protoiface.Methods {
 			i -= len(x.unknownFields)
 			copy(dAtA[i:], x.unknownFields)
 		}
-		if len(x.Methods) > 0 {
+		if len(x.Supported) > 0 {
-			for iNdEx := len(x.Methods) - 1; iNdEx >= 0; iNdEx-- {
+			for iNdEx := len(x.Supported) - 1; iNdEx >= 0; iNdEx-- {
-				i -= len(x.Methods[iNdEx])
+				i -= len(x.Supported[iNdEx])
-				copy(dAtA[i:], x.Methods[iNdEx])
+				copy(dAtA[i:], x.Supported[iNdEx])
-				i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Methods[iNdEx])))
+				i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Supported[iNdEx])))
 				i--
-				dAtA[i] = 0xa
+				dAtA[i] = 0x12
 			}
 		}
+		if len(x.Default) > 0 {
+			i -= len(x.Default)
+			copy(dAtA[i:], x.Default)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Default)))
+			i--
+			dAtA[i] = 0xa
+		}
 		if input.Buf != nil {
 			input.Buf = append(input.Buf, dAtA...)
 		} else {
@@ -1457,7 +1489,7 @@ func (x *fastReflection_Methods) ProtoMethods() *protoiface.Methods {
 			switch fieldNum {
 			case 1:
 				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Methods", wireType)
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Default", wireType)
 				}
 				var stringLen uint64
 				for shift := uint(0); ; shift += 7 {
@@ -1485,7 +1517,39 @@ func (x *fastReflection_Methods) ProtoMethods() *protoiface.Methods {
 				if postIndex > l {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
 				}
-				x.Methods = append(x.Methods, string(dAtA[iNdEx:postIndex]))
+				x.Default = string(dAtA[iNdEx:postIndex])
+				iNdEx = postIndex
+			case 2:
+				if wireType != 2 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Supported", wireType)
+				}
+				var stringLen uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					stringLen |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				intStringLen := int(stringLen)
+				if intStringLen < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				postIndex := iNdEx + intStringLen
+				if postIndex < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if postIndex > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				x.Supported = append(x.Supported, string(dAtA[iNdEx:postIndex]))
 				iNdEx = postIndex
 			default:
 				iNdEx = preIndex
@@ -1522,61 +1586,63 @@ func (x *fastReflection_Methods) ProtoMethods() *protoiface.Methods {
 	}
 }
 
-var _ protoreflect.List = (*_Scopes_1_list)(nil)
+var _ protoreflect.List = (*_Scopes_2_list)(nil)
 
-type _Scopes_1_list struct {
+type _Scopes_2_list struct {
 	list *[]string
 }
 
-func (x *_Scopes_1_list) Len() int {
+func (x *_Scopes_2_list) Len() int {
 	if x.list == nil {
 		return 0
 	}
 	return len(*x.list)
 }
 
-func (x *_Scopes_1_list) Get(i int) protoreflect.Value {
+func (x *_Scopes_2_list) Get(i int) protoreflect.Value {
 	return protoreflect.ValueOfString((*x.list)[i])
 }
 
-func (x *_Scopes_1_list) Set(i int, value protoreflect.Value) {
+func (x *_Scopes_2_list) Set(i int, value protoreflect.Value) {
 	valueUnwrapped := value.String()
 	concreteValue := valueUnwrapped
 	(*x.list)[i] = concreteValue
 }
 
-func (x *_Scopes_1_list) Append(value protoreflect.Value) {
+func (x *_Scopes_2_list) Append(value protoreflect.Value) {
 	valueUnwrapped := value.String()
 	concreteValue := valueUnwrapped
 	*x.list = append(*x.list, concreteValue)
 }
 
-func (x *_Scopes_1_list) AppendMutable() protoreflect.Value {
+func (x *_Scopes_2_list) AppendMutable() protoreflect.Value {
-	panic(fmt.Errorf("AppendMutable can not be called on message Scopes at list field Scopes as it is not of Message kind"))
+	panic(fmt.Errorf("AppendMutable can not be called on message Scopes at list field Supported as it is not of Message kind"))
 }
 
-func (x *_Scopes_1_list) Truncate(n int) {
+func (x *_Scopes_2_list) Truncate(n int) {
 	*x.list = (*x.list)[:n]
 }
 
-func (x *_Scopes_1_list) NewElement() protoreflect.Value {
+func (x *_Scopes_2_list) NewElement() protoreflect.Value {
 	v := ""
 	return protoreflect.ValueOfString(v)
 }
 
-func (x *_Scopes_1_list) IsValid() bool {
+func (x *_Scopes_2_list) IsValid() bool {
 	return x.list != nil
 }
 
 var (
-	md_Scopes        protoreflect.MessageDescriptor
+	md_Scopes           protoreflect.MessageDescriptor
-	fd_Scopes_scopes protoreflect.FieldDescriptor
+	fd_Scopes_base      protoreflect.FieldDescriptor
+	fd_Scopes_supported protoreflect.FieldDescriptor
 )
 
 func init() {
 	file_macaroon_v1_genesis_proto_init()
 	md_Scopes = File_macaroon_v1_genesis_proto.Messages().ByName("Scopes")
-	fd_Scopes_scopes = md_Scopes.Fields().ByName("scopes")
+	fd_Scopes_base = md_Scopes.Fields().ByName("base")
+	fd_Scopes_supported = md_Scopes.Fields().ByName("supported")
 }
 
 var _ protoreflect.Message = (*fastReflection_Scopes)(nil)
@@ -1644,9 +1710,15 @@ func (x *fastReflection_Scopes) Interface() protoreflect.ProtoMessage {
 // While iterating, mutating operations may only be performed
 // on the current field descriptor.
 func (x *fastReflection_Scopes) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
-	if len(x.Scopes) != 0 {
+	if x.Base != "" {
-		value := protoreflect.ValueOfList(&_Scopes_1_list{list: &x.Scopes})
+		value := protoreflect.ValueOfString(x.Base)
-		if !f(fd_Scopes_scopes, value) {
+		if !f(fd_Scopes_base, value) {
+			return
+		}
+	}
+	if len(x.Supported) != 0 {
+		value := protoreflect.ValueOfList(&_Scopes_2_list{list: &x.Supported})
+		if !f(fd_Scopes_supported, value) {
 			return
 		}
 	}
@@ -1665,8 +1737,10 @@ func (x *fastReflection_Scopes) Range(f func(protoreflect.FieldDescriptor, proto
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_Scopes) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "macaroon.v1.Scopes.scopes":
+	case "macaroon.v1.Scopes.base":
-		return len(x.Scopes) != 0
+		return x.Base != ""
+	case "macaroon.v1.Scopes.supported":
+		return len(x.Supported) != 0
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Scopes"))
@@ -1683,8 +1757,10 @@ func (x *fastReflection_Scopes) Has(fd protoreflect.FieldDescriptor) bool {
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Scopes) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "macaroon.v1.Scopes.scopes":
+	case "macaroon.v1.Scopes.base":
-		x.Scopes = nil
+		x.Base = ""
+	case "macaroon.v1.Scopes.supported":
+		x.Supported = nil
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Scopes"))
@@ -1701,11 +1777,14 @@ func (x *fastReflection_Scopes) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_Scopes) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "macaroon.v1.Scopes.scopes":
+	case "macaroon.v1.Scopes.base":
-		if len(x.Scopes) == 0 {
+		value := x.Base
-			return protoreflect.ValueOfList(&_Scopes_1_list{})
+		return protoreflect.ValueOfString(value)
+	case "macaroon.v1.Scopes.supported":
+		if len(x.Supported) == 0 {
+			return protoreflect.ValueOfList(&_Scopes_2_list{})
 		}
-		listValue := &_Scopes_1_list{list: &x.Scopes}
+		listValue := &_Scopes_2_list{list: &x.Supported}
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
@@ -1727,10 +1806,12 @@ func (x *fastReflection_Scopes) Get(descriptor protoreflect.FieldDescriptor) pro
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Scopes) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "macaroon.v1.Scopes.scopes":
+	case "macaroon.v1.Scopes.base":
+		x.Base = value.Interface().(string)
+	case "macaroon.v1.Scopes.supported":
 		lv := value.List()
-		clv := lv.(*_Scopes_1_list)
+		clv := lv.(*_Scopes_2_list)
-		x.Scopes = *clv.list
+		x.Supported = *clv.list
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Scopes"))
@@ -1751,12 +1832,14 @@ func (x *fastReflection_Scopes) Set(fd protoreflect.FieldDescriptor, value proto
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Scopes) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "macaroon.v1.Scopes.scopes":
+	case "macaroon.v1.Scopes.supported":
-		if x.Scopes == nil {
+		if x.Supported == nil {
-			x.Scopes = []string{}
+			x.Supported = []string{}
 		}
-		value := &_Scopes_1_list{list: &x.Scopes}
+		value := &_Scopes_2_list{list: &x.Supported}
 		return protoreflect.ValueOfList(value)
+	case "macaroon.v1.Scopes.base":
+		panic(fmt.Errorf("field base of message macaroon.v1.Scopes is not mutable"))
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Scopes"))
@@ -1770,9 +1853,11 @@ func (x *fastReflection_Scopes) Mutable(fd protoreflect.FieldDescriptor) protore
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_Scopes) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "macaroon.v1.Scopes.scopes":
+	case "macaroon.v1.Scopes.base":
+		return protoreflect.ValueOfString("")
+	case "macaroon.v1.Scopes.supported":
 		list := []string{}
-		return protoreflect.ValueOfList(&_Scopes_1_list{list: &list})
+		return protoreflect.ValueOfList(&_Scopes_2_list{list: &list})
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Scopes"))
@@ -1842,8 +1927,12 @@ func (x *fastReflection_Scopes) ProtoMethods() *protoiface.Methods {
 		var n int
 		var l int
 		_ = l
-		if len(x.Scopes) > 0 {
+		l = len(x.Base)
-			for _, s := range x.Scopes {
+		if l > 0 {
+			n += 1 + l + runtime.Sov(uint64(l))
+		}
+		if len(x.Supported) > 0 {
+			for _, s := range x.Supported {
 				l = len(s)
 				n += 1 + l + runtime.Sov(uint64(l))
 			}
@@ -1877,15 +1966,22 @@ func (x *fastReflection_Scopes) ProtoMethods() *protoiface.Methods {
 			i -= len(x.unknownFields)
 			copy(dAtA[i:], x.unknownFields)
 		}
-		if len(x.Scopes) > 0 {
+		if len(x.Supported) > 0 {
-			for iNdEx := len(x.Scopes) - 1; iNdEx >= 0; iNdEx-- {
+			for iNdEx := len(x.Supported) - 1; iNdEx >= 0; iNdEx-- {
-				i -= len(x.Scopes[iNdEx])
+				i -= len(x.Supported[iNdEx])
-				copy(dAtA[i:], x.Scopes[iNdEx])
+				copy(dAtA[i:], x.Supported[iNdEx])
-				i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Scopes[iNdEx])))
+				i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Supported[iNdEx])))
 				i--
-				dAtA[i] = 0xa
+				dAtA[i] = 0x12
 			}
 		}
+		if len(x.Base) > 0 {
+			i -= len(x.Base)
+			copy(dAtA[i:], x.Base)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Base)))
+			i--
+			dAtA[i] = 0xa
+		}
 		if input.Buf != nil {
 			input.Buf = append(input.Buf, dAtA...)
 		} else {
@@ -1937,7 +2033,7 @@ func (x *fastReflection_Scopes) ProtoMethods() *protoiface.Methods {
 			switch fieldNum {
 			case 1:
 				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Scopes", wireType)
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Base", wireType)
 				}
 				var stringLen uint64
 				for shift := uint(0); ; shift += 7 {
@@ -1965,7 +2061,39 @@ func (x *fastReflection_Scopes) ProtoMethods() *protoiface.Methods {
 				if postIndex > l {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
 				}
-				x.Scopes = append(x.Scopes, string(dAtA[iNdEx:postIndex]))
+				x.Base = string(dAtA[iNdEx:postIndex])
+				iNdEx = postIndex
+			case 2:
+				if wireType != 2 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Supported", wireType)
+				}
+				var stringLen uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					stringLen |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				intStringLen := int(stringLen)
+				if intStringLen < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				postIndex := iNdEx + intStringLen
+				if postIndex < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if postIndex > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				x.Supported = append(x.Supported, string(dAtA[iNdEx:postIndex]))
 				iNdEx = postIndex
 			default:
 				iNdEx = preIndex
@@ -2032,7 +2160,7 @@ func (x *_Caveats_1_list) Append(value protoreflect.Value) {
 }
 
 func (x *_Caveats_1_list) AppendMutable() protoreflect.Value {
-	panic(fmt.Errorf("AppendMutable can not be called on message Caveats at list field Caveats as it is not of Message kind"))
+	panic(fmt.Errorf("AppendMutable can not be called on message Caveats at list field SupportedFirstParty as it is not of Message kind"))
 }
 
 func (x *_Caveats_1_list) Truncate(n int) {
@@ -2048,15 +2176,63 @@ func (x *_Caveats_1_list) IsValid() bool {
 	return x.list != nil
 }
 
+var _ protoreflect.List = (*_Caveats_2_list)(nil)
+
+type _Caveats_2_list struct {
+	list *[]string
+}
+
+func (x *_Caveats_2_list) Len() int {
+	if x.list == nil {
+		return 0
+	}
+	return len(*x.list)
+}
+
+func (x *_Caveats_2_list) Get(i int) protoreflect.Value {
+	return protoreflect.ValueOfString((*x.list)[i])
+}
+
+func (x *_Caveats_2_list) Set(i int, value protoreflect.Value) {
+	valueUnwrapped := value.String()
+	concreteValue := valueUnwrapped
+	(*x.list)[i] = concreteValue
+}
+
+func (x *_Caveats_2_list) Append(value protoreflect.Value) {
+	valueUnwrapped := value.String()
+	concreteValue := valueUnwrapped
+	*x.list = append(*x.list, concreteValue)
+}
+
+func (x *_Caveats_2_list) AppendMutable() protoreflect.Value {
+	panic(fmt.Errorf("AppendMutable can not be called on message Caveats at list field SupportedThirdParty as it is not of Message kind"))
+}
+
+func (x *_Caveats_2_list) Truncate(n int) {
+	*x.list = (*x.list)[:n]
+}
+
+func (x *_Caveats_2_list) NewElement() protoreflect.Value {
+	v := ""
+	return protoreflect.ValueOfString(v)
+}
+
+func (x *_Caveats_2_list) IsValid() bool {
+	return x.list != nil
+}
+
 var (
-	md_Caveats         protoreflect.MessageDescriptor
+	md_Caveats                       protoreflect.MessageDescriptor
-	fd_Caveats_caveats protoreflect.FieldDescriptor
+	fd_Caveats_supported_first_party protoreflect.FieldDescriptor
+	fd_Caveats_supported_third_party protoreflect.FieldDescriptor
 )
 
 func init() {
 	file_macaroon_v1_genesis_proto_init()
 	md_Caveats = File_macaroon_v1_genesis_proto.Messages().ByName("Caveats")
-	fd_Caveats_caveats = md_Caveats.Fields().ByName("caveats")
+	fd_Caveats_supported_first_party = md_Caveats.Fields().ByName("supported_first_party")
+	fd_Caveats_supported_third_party = md_Caveats.Fields().ByName("supported_third_party")
 }
 
 var _ protoreflect.Message = (*fastReflection_Caveats)(nil)
@@ -2124,9 +2300,15 @@ func (x *fastReflection_Caveats) Interface() protoreflect.ProtoMessage {
 // While iterating, mutating operations may only be performed
 // on the current field descriptor.
 func (x *fastReflection_Caveats) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
-	if len(x.Caveats) != 0 {
+	if len(x.SupportedFirstParty) != 0 {
-		value := protoreflect.ValueOfList(&_Caveats_1_list{list: &x.Caveats})
+		value := protoreflect.ValueOfList(&_Caveats_1_list{list: &x.SupportedFirstParty})
-		if !f(fd_Caveats_caveats, value) {
+		if !f(fd_Caveats_supported_first_party, value) {
+			return
+		}
+	}
+	if len(x.SupportedThirdParty) != 0 {
+		value := protoreflect.ValueOfList(&_Caveats_2_list{list: &x.SupportedThirdParty})
+		if !f(fd_Caveats_supported_third_party, value) {
 			return
 		}
 	}
@@ -2145,8 +2327,10 @@ func (x *fastReflection_Caveats) Range(f func(protoreflect.FieldDescriptor, prot
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_Caveats) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "macaroon.v1.Caveats.caveats":
+	case "macaroon.v1.Caveats.supported_first_party":
-		return len(x.Caveats) != 0
+		return len(x.SupportedFirstParty) != 0
+	case "macaroon.v1.Caveats.supported_third_party":
+		return len(x.SupportedThirdParty) != 0
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Caveats"))
@@ -2163,8 +2347,10 @@ func (x *fastReflection_Caveats) Has(fd protoreflect.FieldDescriptor) bool {
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Caveats) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "macaroon.v1.Caveats.caveats":
+	case "macaroon.v1.Caveats.supported_first_party":
-		x.Caveats = nil
+		x.SupportedFirstParty = nil
+	case "macaroon.v1.Caveats.supported_third_party":
+		x.SupportedThirdParty = nil
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Caveats"))
@@ -2181,11 +2367,17 @@ func (x *fastReflection_Caveats) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_Caveats) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "macaroon.v1.Caveats.caveats":
+	case "macaroon.v1.Caveats.supported_first_party":
-		if len(x.Caveats) == 0 {
+		if len(x.SupportedFirstParty) == 0 {
 			return protoreflect.ValueOfList(&_Caveats_1_list{})
 		}
-		listValue := &_Caveats_1_list{list: &x.Caveats}
+		listValue := &_Caveats_1_list{list: &x.SupportedFirstParty}
+		return protoreflect.ValueOfList(listValue)
+	case "macaroon.v1.Caveats.supported_third_party":
+		if len(x.SupportedThirdParty) == 0 {
+			return protoreflect.ValueOfList(&_Caveats_2_list{})
+		}
+		listValue := &_Caveats_2_list{list: &x.SupportedThirdParty}
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
@@ -2207,10 +2399,14 @@ func (x *fastReflection_Caveats) Get(descriptor protoreflect.FieldDescriptor) pr
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Caveats) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "macaroon.v1.Caveats.caveats":
+	case "macaroon.v1.Caveats.supported_first_party":
 		lv := value.List()
 		clv := lv.(*_Caveats_1_list)
-		x.Caveats = *clv.list
+		x.SupportedFirstParty = *clv.list
+	case "macaroon.v1.Caveats.supported_third_party":
+		lv := value.List()
+		clv := lv.(*_Caveats_2_list)
+		x.SupportedThirdParty = *clv.list
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Caveats"))
@@ -2231,11 +2427,17 @@ func (x *fastReflection_Caveats) Set(fd protoreflect.FieldDescriptor, value prot
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Caveats) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "macaroon.v1.Caveats.caveats":
+	case "macaroon.v1.Caveats.supported_first_party":
-		if x.Caveats == nil {
+		if x.SupportedFirstParty == nil {
-			x.Caveats = []string{}
+			x.SupportedFirstParty = []string{}
 		}
-		value := &_Caveats_1_list{list: &x.Caveats}
+		value := &_Caveats_1_list{list: &x.SupportedFirstParty}
+		return protoreflect.ValueOfList(value)
+	case "macaroon.v1.Caveats.supported_third_party":
+		if x.SupportedThirdParty == nil {
+			x.SupportedThirdParty = []string{}
+		}
+		value := &_Caveats_2_list{list: &x.SupportedThirdParty}
 		return protoreflect.ValueOfList(value)
 	default:
 		if fd.IsExtension() {
@@ -2250,9 +2452,12 @@ func (x *fastReflection_Caveats) Mutable(fd protoreflect.FieldDescriptor) protor
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_Caveats) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "macaroon.v1.Caveats.caveats":
+	case "macaroon.v1.Caveats.supported_first_party":
 		list := []string{}
 		return protoreflect.ValueOfList(&_Caveats_1_list{list: &list})
+	case "macaroon.v1.Caveats.supported_third_party":
+		list := []string{}
+		return protoreflect.ValueOfList(&_Caveats_2_list{list: &list})
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Caveats"))
@@ -2322,8 +2527,14 @@ func (x *fastReflection_Caveats) ProtoMethods() *protoiface.Methods {
 		var n int
 		var l int
 		_ = l
-		if len(x.Caveats) > 0 {
+		if len(x.SupportedFirstParty) > 0 {
-			for _, s := range x.Caveats {
+			for _, s := range x.SupportedFirstParty {
+				l = len(s)
+				n += 1 + l + runtime.Sov(uint64(l))
+			}
+		}
+		if len(x.SupportedThirdParty) > 0 {
+			for _, s := range x.SupportedThirdParty {
 				l = len(s)
 				n += 1 + l + runtime.Sov(uint64(l))
 			}
@@ -2357,11 +2568,20 @@ func (x *fastReflection_Caveats) ProtoMethods() *protoiface.Methods {
 			i -= len(x.unknownFields)
 			copy(dAtA[i:], x.unknownFields)
 		}
-		if len(x.Caveats) > 0 {
+		if len(x.SupportedThirdParty) > 0 {
-			for iNdEx := len(x.Caveats) - 1; iNdEx >= 0; iNdEx-- {
+			for iNdEx := len(x.SupportedThirdParty) - 1; iNdEx >= 0; iNdEx-- {
-				i -= len(x.Caveats[iNdEx])
+				i -= len(x.SupportedThirdParty[iNdEx])
-				copy(dAtA[i:], x.Caveats[iNdEx])
+				copy(dAtA[i:], x.SupportedThirdParty[iNdEx])
-				i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Caveats[iNdEx])))
+				i = runtime.EncodeVarint(dAtA, i, uint64(len(x.SupportedThirdParty[iNdEx])))
+				i--
+				dAtA[i] = 0x12
+			}
+		}
+		if len(x.SupportedFirstParty) > 0 {
+			for iNdEx := len(x.SupportedFirstParty) - 1; iNdEx >= 0; iNdEx-- {
+				i -= len(x.SupportedFirstParty[iNdEx])
+				copy(dAtA[i:], x.SupportedFirstParty[iNdEx])
+				i = runtime.EncodeVarint(dAtA, i, uint64(len(x.SupportedFirstParty[iNdEx])))
 				i--
 				dAtA[i] = 0xa
 			}
@@ -2417,7 +2637,7 @@ func (x *fastReflection_Caveats) ProtoMethods() *protoiface.Methods {
 			switch fieldNum {
 			case 1:
 				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Caveats", wireType)
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field SupportedFirstParty", wireType)
 				}
 				var stringLen uint64
 				for shift := uint(0); ; shift += 7 {
@@ -2445,7 +2665,39 @@ func (x *fastReflection_Caveats) ProtoMethods() *protoiface.Methods {
 				if postIndex > l {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
 				}
-				x.Caveats = append(x.Caveats, string(dAtA[iNdEx:postIndex]))
+				x.SupportedFirstParty = append(x.SupportedFirstParty, string(dAtA[iNdEx:postIndex]))
+				iNdEx = postIndex
+			case 2:
+				if wireType != 2 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field SupportedThirdParty", wireType)
+				}
+				var stringLen uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					stringLen |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				intStringLen := int(stringLen)
+				if intStringLen < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				postIndex := iNdEx + intStringLen
+				if postIndex < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if postIndex > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				x.SupportedThirdParty = append(x.SupportedThirdParty, string(dAtA[iNdEx:postIndex]))
 				iNdEx = postIndex
 			default:
 				iNdEx = preIndex
@@ -2593,7 +2845,8 @@ type Methods struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Methods []string `protobuf:"bytes,1,rep,name=methods,proto3" json:"methods,omitempty"`
+	Default   string   `protobuf:"bytes,1,opt,name=default,proto3" json:"default,omitempty"`
+	Supported []string `protobuf:"bytes,2,rep,name=supported,proto3" json:"supported,omitempty"`
 }
 
 func (x *Methods) Reset() {
@@ -2616,9 +2869,16 @@ func (*Methods) Descriptor() ([]byte, []int) {
 	return file_macaroon_v1_genesis_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Methods) GetMethods() []string {
+func (x *Methods) GetDefault() string {
 	if x != nil {
-		return x.Methods
+		return x.Default
+	}
+	return ""
+}
+
+func (x *Methods) GetSupported() []string {
+	if x != nil {
+		return x.Supported
 	}
 	return nil
 }
@@ -2629,7 +2889,8 @@ type Scopes struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Scopes []string `protobuf:"bytes,1,rep,name=scopes,proto3" json:"scopes,omitempty"`
+	Base      string   `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"`
+	Supported []string `protobuf:"bytes,2,rep,name=supported,proto3" json:"supported,omitempty"`
 }
 
 func (x *Scopes) Reset() {
@@ -2652,9 +2913,16 @@ func (*Scopes) Descriptor() ([]byte, []int) {
 	return file_macaroon_v1_genesis_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *Scopes) GetScopes() []string {
+func (x *Scopes) GetBase() string {
 	if x != nil {
-		return x.Scopes
+		return x.Base
+	}
+	return ""
+}
+
+func (x *Scopes) GetSupported() []string {
+	if x != nil {
+		return x.Supported
 	}
 	return nil
 }
@@ -2665,7 +2933,8 @@ type Caveats struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Caveats []string `protobuf:"bytes,1,rep,name=caveats,proto3" json:"caveats,omitempty"`
+	SupportedFirstParty []string `protobuf:"bytes,1,rep,name=supported_first_party,json=supportedFirstParty,proto3" json:"supported_first_party,omitempty"`
+	SupportedThirdParty []string `protobuf:"bytes,2,rep,name=supported_third_party,json=supportedThirdParty,proto3" json:"supported_third_party,omitempty"`
 }
 
 func (x *Caveats) Reset() {
@@ -2688,9 +2957,16 @@ func (*Caveats) Descriptor() ([]byte, []int) {
 	return file_macaroon_v1_genesis_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *Caveats) GetCaveats() []string {
+func (x *Caveats) GetSupportedFirstParty() []string {
 	if x != nil {
-		return x.Caveats
+		return x.SupportedFirstParty
+	}
+	return nil
+}
+
+func (x *Caveats) GetSupportedThirdParty() []string {
+	if x != nil {
+		return x.SupportedThirdParty
 	}
 	return nil
 }
@@ -2718,29 +2994,38 @@ var file_macaroon_v1_genesis_proto_rawDesc = []byte{
 	0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x76, 0x65,
 	0x61, 0x74, 0x73, 0x52, 0x07, 0x63, 0x61, 0x76, 0x65, 0x61, 0x74, 0x73, 0x3a, 0x1c, 0x98, 0xa0,
 	0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x0f, 0x6d, 0x61, 0x63, 0x61, 0x72,
-	0x6f, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x3e, 0x0a, 0x07, 0x4d, 0x65,
+	0x6f, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x5c, 0x0a, 0x07, 0x4d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73,
+	0x74, 0x68, 0x6f, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x3a,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12,
-	0x19, 0xe8, 0xa0, 0x1f, 0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x10, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f,
+	0x1c, 0x0a, 0x09, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03,
-	0x6f, 0x6e, 0x2f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x22, 0x3a, 0x0a, 0x06, 0x53, 0x63,
+	0x28, 0x09, 0x52, 0x09, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x3a, 0x19, 0xe8,
-	0x6f, 0x70, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x18, 0x01,
+	0xa0, 0x1f, 0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x10, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x3a, 0x18, 0xe8, 0xa0,
+	0x2f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x22, 0x54, 0x0a, 0x06, 0x53, 0x63, 0x6f, 0x70,
-	0x1f, 0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x0f, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f,
+	0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x22, 0x3d, 0x0a, 0x07, 0x43, 0x61, 0x76, 0x65, 0x61, 0x74,
+	0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72,
-	0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x61, 0x76, 0x65, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x73, 0x75, 0x70, 0x70, 0x6f,
-	0x28, 0x09, 0x52, 0x07, 0x63, 0x61, 0x76, 0x65, 0x61, 0x74, 0x73, 0x3a, 0x18, 0xe8, 0xa0, 0x1f,
+	0x72, 0x74, 0x65, 0x64, 0x3a, 0x18, 0xe8, 0xa0, 0x1f, 0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x0f, 0x6d,
-	0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x0f, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f, 0x63,
+	0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x22, 0x8b,
-	0x61, 0x76, 0x65, 0x61, 0x74, 0x42, 0x9f, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x61,
+	0x01, 0x0a, 0x07, 0x43, 0x61, 0x76, 0x65, 0x61, 0x74, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x73, 0x75,
-	0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73,
+	0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x70, 0x61,
-	0x69, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x72, 0x74, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e,
+	0x72, 0x74, 0x65, 0x64, 0x46, 0x69, 0x72, 0x73, 0x74, 0x50, 0x61, 0x72, 0x74, 0x79, 0x12, 0x32,
-	0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f, 0x76,
+	0x0a, 0x15, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x68, 0x69, 0x72,
-	0x31, 0x3b, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4d,
+	0x64, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x13, 0x73,
-	0x58, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x56, 0x31,
+	0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72,
-	0xca, 0x02, 0x0b, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02,
+	0x74, 0x79, 0x3a, 0x18, 0xe8, 0xa0, 0x1f, 0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x0f, 0x6d, 0x61, 0x63,
-	0x17, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42,
+	0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f, 0x63, 0x61, 0x76, 0x65, 0x61, 0x74, 0x42, 0x9f, 0x01, 0x0a,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x4d, 0x61, 0x63, 0x61, 0x72,
+	0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
-	0x6f, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x42, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73,
+	0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x63,
+	0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f,
+	0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4d, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x61, 0x63, 0x61,
+	0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0b, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f,
+	0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x17, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e,
+	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x0c, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

api/macaroon/v1/state.cosmos_orm.go

@@ -176,20 +176,193 @@ func NewGrantTable(db ormtable.Schema) (GrantTable, error) {
 	return grantTable{table.(ormtable.AutoIncrementTable)}, nil
 }
 
+type MacaroonTable interface {
+	Insert(ctx context.Context, macaroon *Macaroon) error
+	InsertReturningId(ctx context.Context, macaroon *Macaroon) (uint64, error)
+	LastInsertedSequence(ctx context.Context) (uint64, error)
+	Update(ctx context.Context, macaroon *Macaroon) error
+	Save(ctx context.Context, macaroon *Macaroon) error
+	Delete(ctx context.Context, macaroon *Macaroon) error
+	Has(ctx context.Context, id uint64) (found bool, err error)
+	// Get returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
+	Get(ctx context.Context, id uint64) (*Macaroon, error)
+	HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error)
+	// GetBySubjectOrigin returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
+	GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Macaroon, error)
+	List(ctx context.Context, prefixKey MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error)
+	ListRange(ctx context.Context, from, to MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error)
+	DeleteBy(ctx context.Context, prefixKey MacaroonIndexKey) error
+	DeleteRange(ctx context.Context, from, to MacaroonIndexKey) error
+
+	doNotImplement()
+}
+
+type MacaroonIterator struct {
+	ormtable.Iterator
+}
+
+func (i MacaroonIterator) Value() (*Macaroon, error) {
+	var macaroon Macaroon
+	err := i.UnmarshalMessage(&macaroon)
+	return &macaroon, err
+}
+
+type MacaroonIndexKey interface {
+	id() uint32
+	values() []interface{}
+	macaroonIndexKey()
+}
+
+// primary key starting index..
+type MacaroonPrimaryKey = MacaroonIdIndexKey
+
+type MacaroonIdIndexKey struct {
+	vs []interface{}
+}
+
+func (x MacaroonIdIndexKey) id() uint32            { return 0 }
+func (x MacaroonIdIndexKey) values() []interface{} { return x.vs }
+func (x MacaroonIdIndexKey) macaroonIndexKey()     {}
+
+func (this MacaroonIdIndexKey) WithId(id uint64) MacaroonIdIndexKey {
+	this.vs = []interface{}{id}
+	return this
+}
+
+type MacaroonSubjectOriginIndexKey struct {
+	vs []interface{}
+}
+
+func (x MacaroonSubjectOriginIndexKey) id() uint32            { return 1 }
+func (x MacaroonSubjectOriginIndexKey) values() []interface{} { return x.vs }
+func (x MacaroonSubjectOriginIndexKey) macaroonIndexKey()     {}
+
+func (this MacaroonSubjectOriginIndexKey) WithSubject(subject string) MacaroonSubjectOriginIndexKey {
+	this.vs = []interface{}{subject}
+	return this
+}
+
+func (this MacaroonSubjectOriginIndexKey) WithSubjectOrigin(subject string, origin string) MacaroonSubjectOriginIndexKey {
+	this.vs = []interface{}{subject, origin}
+	return this
+}
+
+type macaroonTable struct {
+	table ormtable.AutoIncrementTable
+}
+
+func (this macaroonTable) Insert(ctx context.Context, macaroon *Macaroon) error {
+	return this.table.Insert(ctx, macaroon)
+}
+
+func (this macaroonTable) Update(ctx context.Context, macaroon *Macaroon) error {
+	return this.table.Update(ctx, macaroon)
+}
+
+func (this macaroonTable) Save(ctx context.Context, macaroon *Macaroon) error {
+	return this.table.Save(ctx, macaroon)
+}
+
+func (this macaroonTable) Delete(ctx context.Context, macaroon *Macaroon) error {
+	return this.table.Delete(ctx, macaroon)
+}
+
+func (this macaroonTable) InsertReturningId(ctx context.Context, macaroon *Macaroon) (uint64, error) {
+	return this.table.InsertReturningPKey(ctx, macaroon)
+}
+
+func (this macaroonTable) LastInsertedSequence(ctx context.Context) (uint64, error) {
+	return this.table.LastInsertedSequence(ctx)
+}
+
+func (this macaroonTable) Has(ctx context.Context, id uint64) (found bool, err error) {
+	return this.table.PrimaryKey().Has(ctx, id)
+}
+
+func (this macaroonTable) Get(ctx context.Context, id uint64) (*Macaroon, error) {
+	var macaroon Macaroon
+	found, err := this.table.PrimaryKey().Get(ctx, &macaroon, id)
+	if err != nil {
+		return nil, err
+	}
+	if !found {
+		return nil, ormerrors.NotFound
+	}
+	return &macaroon, nil
+}
+
+func (this macaroonTable) HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error) {
+	return this.table.GetIndexByID(1).(ormtable.UniqueIndex).Has(ctx,
+		subject,
+		origin,
+	)
+}
+
+func (this macaroonTable) GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Macaroon, error) {
+	var macaroon Macaroon
+	found, err := this.table.GetIndexByID(1).(ormtable.UniqueIndex).Get(ctx, &macaroon,
+		subject,
+		origin,
+	)
+	if err != nil {
+		return nil, err
+	}
+	if !found {
+		return nil, ormerrors.NotFound
+	}
+	return &macaroon, nil
+}
+
+func (this macaroonTable) List(ctx context.Context, prefixKey MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error) {
+	it, err := this.table.GetIndexByID(prefixKey.id()).List(ctx, prefixKey.values(), opts...)
+	return MacaroonIterator{it}, err
+}
+
+func (this macaroonTable) ListRange(ctx context.Context, from, to MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error) {
+	it, err := this.table.GetIndexByID(from.id()).ListRange(ctx, from.values(), to.values(), opts...)
+	return MacaroonIterator{it}, err
+}
+
+func (this macaroonTable) DeleteBy(ctx context.Context, prefixKey MacaroonIndexKey) error {
+	return this.table.GetIndexByID(prefixKey.id()).DeleteBy(ctx, prefixKey.values()...)
+}
+
+func (this macaroonTable) DeleteRange(ctx context.Context, from, to MacaroonIndexKey) error {
+	return this.table.GetIndexByID(from.id()).DeleteRange(ctx, from.values(), to.values())
+}
+
+func (this macaroonTable) doNotImplement() {}
+
+var _ MacaroonTable = macaroonTable{}
+
+func NewMacaroonTable(db ormtable.Schema) (MacaroonTable, error) {
+	table := db.GetTable(&Macaroon{})
+	if table == nil {
+		return nil, ormerrors.TableNotFound.Wrap(string((&Macaroon{}).ProtoReflect().Descriptor().FullName()))
+	}
+	return macaroonTable{table.(ormtable.AutoIncrementTable)}, nil
+}
+
 type StateStore interface {
 	GrantTable() GrantTable
+	MacaroonTable() MacaroonTable
 
 	doNotImplement()
 }
 
 type stateStore struct {
-	grant GrantTable
+	grant    GrantTable
+	macaroon MacaroonTable
 }
 
 func (x stateStore) GrantTable() GrantTable {
 	return x.grant
 }
 
+func (x stateStore) MacaroonTable() MacaroonTable {
+	return x.macaroon
+}
+
 func (stateStore) doNotImplement() {}
 
 var _ StateStore = stateStore{}
@@ -200,7 +373,13 @@ func NewStateStore(db ormtable.Schema) (StateStore, error) {
 		return nil, err
 	}
 
+	macaroonTable, err := NewMacaroonTable(db)
+	if err != nil {
+		return nil, err
+	}
+
 	return stateStore{
 		grantTable,
+		macaroonTable,
 	}, nil
 }

api/macaroon/v1/state.pulsar.go

@@ -657,6 +657,714 @@ func (x *fastReflection_Grant) ProtoMethods() *protoiface.Methods {
 	}
 }
 
+var (
+	md_Macaroon               protoreflect.MessageDescriptor
+	fd_Macaroon_id            protoreflect.FieldDescriptor
+	fd_Macaroon_controller    protoreflect.FieldDescriptor
+	fd_Macaroon_subject       protoreflect.FieldDescriptor
+	fd_Macaroon_origin        protoreflect.FieldDescriptor
+	fd_Macaroon_expiry_height protoreflect.FieldDescriptor
+	fd_Macaroon_macaroon      protoreflect.FieldDescriptor
+)
+
+func init() {
+	file_macaroon_v1_state_proto_init()
+	md_Macaroon = File_macaroon_v1_state_proto.Messages().ByName("Macaroon")
+	fd_Macaroon_id = md_Macaroon.Fields().ByName("id")
+	fd_Macaroon_controller = md_Macaroon.Fields().ByName("controller")
+	fd_Macaroon_subject = md_Macaroon.Fields().ByName("subject")
+	fd_Macaroon_origin = md_Macaroon.Fields().ByName("origin")
+	fd_Macaroon_expiry_height = md_Macaroon.Fields().ByName("expiry_height")
+	fd_Macaroon_macaroon = md_Macaroon.Fields().ByName("macaroon")
+}
+
+var _ protoreflect.Message = (*fastReflection_Macaroon)(nil)
+
+type fastReflection_Macaroon Macaroon
+
+func (x *Macaroon) ProtoReflect() protoreflect.Message {
+	return (*fastReflection_Macaroon)(x)
+}
+
+func (x *Macaroon) slowProtoReflect() protoreflect.Message {
+	mi := &file_macaroon_v1_state_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+var _fastReflection_Macaroon_messageType fastReflection_Macaroon_messageType
+var _ protoreflect.MessageType = fastReflection_Macaroon_messageType{}
+
+type fastReflection_Macaroon_messageType struct{}
+
+func (x fastReflection_Macaroon_messageType) Zero() protoreflect.Message {
+	return (*fastReflection_Macaroon)(nil)
+}
+func (x fastReflection_Macaroon_messageType) New() protoreflect.Message {
+	return new(fastReflection_Macaroon)
+}
+func (x fastReflection_Macaroon_messageType) Descriptor() protoreflect.MessageDescriptor {
+	return md_Macaroon
+}
+
+// Descriptor returns message descriptor, which contains only the protobuf
+// type information for the message.
+func (x *fastReflection_Macaroon) Descriptor() protoreflect.MessageDescriptor {
+	return md_Macaroon
+}
+
+// Type returns the message type, which encapsulates both Go and protobuf
+// type information. If the Go type information is not needed,
+// it is recommended that the message descriptor be used instead.
+func (x *fastReflection_Macaroon) Type() protoreflect.MessageType {
+	return _fastReflection_Macaroon_messageType
+}
+
+// New returns a newly allocated and mutable empty message.
+func (x *fastReflection_Macaroon) New() protoreflect.Message {
+	return new(fastReflection_Macaroon)
+}
+
+// Interface unwraps the message reflection interface and
+// returns the underlying ProtoMessage interface.
+func (x *fastReflection_Macaroon) Interface() protoreflect.ProtoMessage {
+	return (*Macaroon)(x)
+}
+
+// Range iterates over every populated field in an undefined order,
+// calling f for each field descriptor and value encountered.
+// Range returns immediately if f returns false.
+// While iterating, mutating operations may only be performed
+// on the current field descriptor.
+func (x *fastReflection_Macaroon) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
+	if x.Id != uint64(0) {
+		value := protoreflect.ValueOfUint64(x.Id)
+		if !f(fd_Macaroon_id, value) {
+			return
+		}
+	}
+	if x.Controller != "" {
+		value := protoreflect.ValueOfString(x.Controller)
+		if !f(fd_Macaroon_controller, value) {
+			return
+		}
+	}
+	if x.Subject != "" {
+		value := protoreflect.ValueOfString(x.Subject)
+		if !f(fd_Macaroon_subject, value) {
+			return
+		}
+	}
+	if x.Origin != "" {
+		value := protoreflect.ValueOfString(x.Origin)
+		if !f(fd_Macaroon_origin, value) {
+			return
+		}
+	}
+	if x.ExpiryHeight != int64(0) {
+		value := protoreflect.ValueOfInt64(x.ExpiryHeight)
+		if !f(fd_Macaroon_expiry_height, value) {
+			return
+		}
+	}
+	if x.Macaroon != "" {
+		value := protoreflect.ValueOfString(x.Macaroon)
+		if !f(fd_Macaroon_macaroon, value) {
+			return
+		}
+	}
+}
+
+// Has reports whether a field is populated.
+//
+// Some fields have the property of nullability where it is possible to
+// distinguish between the default value of a field and whether the field
+// was explicitly populated with the default value. Singular message fields,
+// member fields of a oneof, and proto2 scalar fields are nullable. Such
+// fields are populated only if explicitly set.
+//
+// In other cases (aside from the nullable cases above),
+// a proto3 scalar field is populated if it contains a non-zero value, and
+// a repeated field is populated if it is non-empty.
+func (x *fastReflection_Macaroon) Has(fd protoreflect.FieldDescriptor) bool {
+	switch fd.FullName() {
+	case "macaroon.v1.Macaroon.id":
+		return x.Id != uint64(0)
+	case "macaroon.v1.Macaroon.controller":
+		return x.Controller != ""
+	case "macaroon.v1.Macaroon.subject":
+		return x.Subject != ""
+	case "macaroon.v1.Macaroon.origin":
+		return x.Origin != ""
+	case "macaroon.v1.Macaroon.expiry_height":
+		return x.ExpiryHeight != int64(0)
+	case "macaroon.v1.Macaroon.macaroon":
+		return x.Macaroon != ""
+	default:
+		if fd.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Macaroon"))
+		}
+		panic(fmt.Errorf("message macaroon.v1.Macaroon does not contain field %s", fd.FullName()))
+	}
+}
+
+// Clear clears the field such that a subsequent Has call reports false.
+//
+// Clearing an extension field clears both the extension type and value
+// associated with the given field number.
+//
+// Clear is a mutating operation and unsafe for concurrent use.
+func (x *fastReflection_Macaroon) Clear(fd protoreflect.FieldDescriptor) {
+	switch fd.FullName() {
+	case "macaroon.v1.Macaroon.id":
+		x.Id = uint64(0)
+	case "macaroon.v1.Macaroon.controller":
+		x.Controller = ""
+	case "macaroon.v1.Macaroon.subject":
+		x.Subject = ""
+	case "macaroon.v1.Macaroon.origin":
+		x.Origin = ""
+	case "macaroon.v1.Macaroon.expiry_height":
+		x.ExpiryHeight = int64(0)
+	case "macaroon.v1.Macaroon.macaroon":
+		x.Macaroon = ""
+	default:
+		if fd.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Macaroon"))
+		}
+		panic(fmt.Errorf("message macaroon.v1.Macaroon does not contain field %s", fd.FullName()))
+	}
+}
+
+// Get retrieves the value for a field.
+//
+// For unpopulated scalars, it returns the default value, where
+// the default value of a bytes scalar is guaranteed to be a copy.
+// For unpopulated composite types, it returns an empty, read-only view
+// of the value; to obtain a mutable reference, use Mutable.
+func (x *fastReflection_Macaroon) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
+	switch descriptor.FullName() {
+	case "macaroon.v1.Macaroon.id":
+		value := x.Id
+		return protoreflect.ValueOfUint64(value)
+	case "macaroon.v1.Macaroon.controller":
+		value := x.Controller
+		return protoreflect.ValueOfString(value)
+	case "macaroon.v1.Macaroon.subject":
+		value := x.Subject
+		return protoreflect.ValueOfString(value)
+	case "macaroon.v1.Macaroon.origin":
+		value := x.Origin
+		return protoreflect.ValueOfString(value)
+	case "macaroon.v1.Macaroon.expiry_height":
+		value := x.ExpiryHeight
+		return protoreflect.ValueOfInt64(value)
+	case "macaroon.v1.Macaroon.macaroon":
+		value := x.Macaroon
+		return protoreflect.ValueOfString(value)
+	default:
+		if descriptor.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Macaroon"))
+		}
+		panic(fmt.Errorf("message macaroon.v1.Macaroon does not contain field %s", descriptor.FullName()))
+	}
+}
+
+// Set stores the value for a field.
+//
+// For a field belonging to a oneof, it implicitly clears any other field
+// that may be currently set within the same oneof.
+// For extension fields, it implicitly stores the provided ExtensionType.
+// When setting a composite type, it is unspecified whether the stored value
+// aliases the source's memory in any way. If the composite value is an
+// empty, read-only value, then it panics.
+//
+// Set is a mutating operation and unsafe for concurrent use.
+func (x *fastReflection_Macaroon) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
+	switch fd.FullName() {
+	case "macaroon.v1.Macaroon.id":
+		x.Id = value.Uint()
+	case "macaroon.v1.Macaroon.controller":
+		x.Controller = value.Interface().(string)
+	case "macaroon.v1.Macaroon.subject":
+		x.Subject = value.Interface().(string)
+	case "macaroon.v1.Macaroon.origin":
+		x.Origin = value.Interface().(string)
+	case "macaroon.v1.Macaroon.expiry_height":
+		x.ExpiryHeight = value.Int()
+	case "macaroon.v1.Macaroon.macaroon":
+		x.Macaroon = value.Interface().(string)
+	default:
+		if fd.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Macaroon"))
+		}
+		panic(fmt.Errorf("message macaroon.v1.Macaroon does not contain field %s", fd.FullName()))
+	}
+}
+
+// Mutable returns a mutable reference to a composite type.
+//
+// If the field is unpopulated, it may allocate a composite value.
+// For a field belonging to a oneof, it implicitly clears any other field
+// that may be currently set within the same oneof.
+// For extension fields, it implicitly stores the provided ExtensionType
+// if not already stored.
+// It panics if the field does not contain a composite type.
+//
+// Mutable is a mutating operation and unsafe for concurrent use.
+func (x *fastReflection_Macaroon) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
+	switch fd.FullName() {
+	case "macaroon.v1.Macaroon.id":
+		panic(fmt.Errorf("field id of message macaroon.v1.Macaroon is not mutable"))
+	case "macaroon.v1.Macaroon.controller":
+		panic(fmt.Errorf("field controller of message macaroon.v1.Macaroon is not mutable"))
+	case "macaroon.v1.Macaroon.subject":
+		panic(fmt.Errorf("field subject of message macaroon.v1.Macaroon is not mutable"))
+	case "macaroon.v1.Macaroon.origin":
+		panic(fmt.Errorf("field origin of message macaroon.v1.Macaroon is not mutable"))
+	case "macaroon.v1.Macaroon.expiry_height":
+		panic(fmt.Errorf("field expiry_height of message macaroon.v1.Macaroon is not mutable"))
+	case "macaroon.v1.Macaroon.macaroon":
+		panic(fmt.Errorf("field macaroon of message macaroon.v1.Macaroon is not mutable"))
+	default:
+		if fd.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Macaroon"))
+		}
+		panic(fmt.Errorf("message macaroon.v1.Macaroon does not contain field %s", fd.FullName()))
+	}
+}
+
+// NewField returns a new value that is assignable to the field
+// for the given descriptor. For scalars, this returns the default value.
+// For lists, maps, and messages, this returns a new, empty, mutable value.
+func (x *fastReflection_Macaroon) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
+	switch fd.FullName() {
+	case "macaroon.v1.Macaroon.id":
+		return protoreflect.ValueOfUint64(uint64(0))
+	case "macaroon.v1.Macaroon.controller":
+		return protoreflect.ValueOfString("")
+	case "macaroon.v1.Macaroon.subject":
+		return protoreflect.ValueOfString("")
+	case "macaroon.v1.Macaroon.origin":
+		return protoreflect.ValueOfString("")
+	case "macaroon.v1.Macaroon.expiry_height":
+		return protoreflect.ValueOfInt64(int64(0))
+	case "macaroon.v1.Macaroon.macaroon":
+		return protoreflect.ValueOfString("")
+	default:
+		if fd.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: macaroon.v1.Macaroon"))
+		}
+		panic(fmt.Errorf("message macaroon.v1.Macaroon does not contain field %s", fd.FullName()))
+	}
+}
+
+// WhichOneof reports which field within the oneof is populated,
+// returning nil if none are populated.
+// It panics if the oneof descriptor does not belong to this message.
+func (x *fastReflection_Macaroon) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
+	switch d.FullName() {
+	default:
+		panic(fmt.Errorf("%s is not a oneof field in macaroon.v1.Macaroon", d.FullName()))
+	}
+	panic("unreachable")
+}
+
+// GetUnknown retrieves the entire list of unknown fields.
+// The caller may only mutate the contents of the RawFields
+// if the mutated bytes are stored back into the message with SetUnknown.
+func (x *fastReflection_Macaroon) GetUnknown() protoreflect.RawFields {
+	return x.unknownFields
+}
+
+// SetUnknown stores an entire list of unknown fields.
+// The raw fields must be syntactically valid according to the wire format.
+// An implementation may panic if this is not the case.
+// Once stored, the caller must not mutate the content of the RawFields.
+// An empty RawFields may be passed to clear the fields.
+//
+// SetUnknown is a mutating operation and unsafe for concurrent use.
+func (x *fastReflection_Macaroon) SetUnknown(fields protoreflect.RawFields) {
+	x.unknownFields = fields
+}
+
+// IsValid reports whether the message is valid.
+//
+// An invalid message is an empty, read-only value.
+//
+// An invalid message often corresponds to a nil pointer of the concrete
+// message type, but the details are implementation dependent.
+// Validity is not part of the protobuf data model, and may not
+// be preserved in marshaling or other operations.
+func (x *fastReflection_Macaroon) IsValid() bool {
+	return x != nil
+}
+
+// ProtoMethods returns optional fastReflectionFeature-path implementations of various operations.
+// This method may return nil.
+//
+// The returned methods type is identical to
+// "google.golang.org/protobuf/runtime/protoiface".Methods.
+// Consult the protoiface package documentation for details.
+func (x *fastReflection_Macaroon) ProtoMethods() *protoiface.Methods {
+	size := func(input protoiface.SizeInput) protoiface.SizeOutput {
+		x := input.Message.Interface().(*Macaroon)
+		if x == nil {
+			return protoiface.SizeOutput{
+				NoUnkeyedLiterals: input.NoUnkeyedLiterals,
+				Size:              0,
+			}
+		}
+		options := runtime.SizeInputToOptions(input)
+		_ = options
+		var n int
+		var l int
+		_ = l
+		if x.Id != 0 {
+			n += 1 + runtime.Sov(uint64(x.Id))
+		}
+		l = len(x.Controller)
+		if l > 0 {
+			n += 1 + l + runtime.Sov(uint64(l))
+		}
+		l = len(x.Subject)
+		if l > 0 {
+			n += 1 + l + runtime.Sov(uint64(l))
+		}
+		l = len(x.Origin)
+		if l > 0 {
+			n += 1 + l + runtime.Sov(uint64(l))
+		}
+		if x.ExpiryHeight != 0 {
+			n += 1 + runtime.Sov(uint64(x.ExpiryHeight))
+		}
+		l = len(x.Macaroon)
+		if l > 0 {
+			n += 1 + l + runtime.Sov(uint64(l))
+		}
+		if x.unknownFields != nil {
+			n += len(x.unknownFields)
+		}
+		return protoiface.SizeOutput{
+			NoUnkeyedLiterals: input.NoUnkeyedLiterals,
+			Size:              n,
+		}
+	}
+
+	marshal := func(input protoiface.MarshalInput) (protoiface.MarshalOutput, error) {
+		x := input.Message.Interface().(*Macaroon)
+		if x == nil {
+			return protoiface.MarshalOutput{
+				NoUnkeyedLiterals: input.NoUnkeyedLiterals,
+				Buf:               input.Buf,
+			}, nil
+		}
+		options := runtime.MarshalInputToOptions(input)
+		_ = options
+		size := options.Size(x)
+		dAtA := make([]byte, size)
+		i := len(dAtA)
+		_ = i
+		var l int
+		_ = l
+		if x.unknownFields != nil {
+			i -= len(x.unknownFields)
+			copy(dAtA[i:], x.unknownFields)
+		}
+		if len(x.Macaroon) > 0 {
+			i -= len(x.Macaroon)
+			copy(dAtA[i:], x.Macaroon)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Macaroon)))
+			i--
+			dAtA[i] = 0x32
+		}
+		if x.ExpiryHeight != 0 {
+			i = runtime.EncodeVarint(dAtA, i, uint64(x.ExpiryHeight))
+			i--
+			dAtA[i] = 0x28
+		}
+		if len(x.Origin) > 0 {
+			i -= len(x.Origin)
+			copy(dAtA[i:], x.Origin)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Origin)))
+			i--
+			dAtA[i] = 0x22
+		}
+		if len(x.Subject) > 0 {
+			i -= len(x.Subject)
+			copy(dAtA[i:], x.Subject)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Subject)))
+			i--
+			dAtA[i] = 0x1a
+		}
+		if len(x.Controller) > 0 {
+			i -= len(x.Controller)
+			copy(dAtA[i:], x.Controller)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Controller)))
+			i--
+			dAtA[i] = 0x12
+		}
+		if x.Id != 0 {
+			i = runtime.EncodeVarint(dAtA, i, uint64(x.Id))
+			i--
+			dAtA[i] = 0x8
+		}
+		if input.Buf != nil {
+			input.Buf = append(input.Buf, dAtA...)
+		} else {
+			input.Buf = dAtA
+		}
+		return protoiface.MarshalOutput{
+			NoUnkeyedLiterals: input.NoUnkeyedLiterals,
+			Buf:               input.Buf,
+		}, nil
+	}
+	unmarshal := func(input protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) {
+		x := input.Message.Interface().(*Macaroon)
+		if x == nil {
+			return protoiface.UnmarshalOutput{
+				NoUnkeyedLiterals: input.NoUnkeyedLiterals,
+				Flags:             input.Flags,
+			}, nil
+		}
+		options := runtime.UnmarshalInputToOptions(input)
+		_ = options
+		dAtA := input.Buf
+		l := len(dAtA)
+		iNdEx := 0
+		for iNdEx < l {
+			preIndex := iNdEx
+			var wire uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+				}
+				if iNdEx >= l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				wire |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			fieldNum := int32(wire >> 3)
+			wireType := int(wire & 0x7)
+			if wireType == 4 {
+				return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: Macaroon: wiretype end group for non-group")
+			}
+			if fieldNum <= 0 {
+				return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: Macaroon: illegal tag %d (wire type %d)", fieldNum, wire)
+			}
+			switch fieldNum {
+			case 1:
+				if wireType != 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
+				}
+				x.Id = 0
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					x.Id |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+			case 2:
+				if wireType != 2 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Controller", wireType)
+				}
+				var stringLen uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					stringLen |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				intStringLen := int(stringLen)
+				if intStringLen < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				postIndex := iNdEx + intStringLen
+				if postIndex < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if postIndex > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				x.Controller = string(dAtA[iNdEx:postIndex])
+				iNdEx = postIndex
+			case 3:
+				if wireType != 2 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Subject", wireType)
+				}
+				var stringLen uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					stringLen |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				intStringLen := int(stringLen)
+				if intStringLen < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				postIndex := iNdEx + intStringLen
+				if postIndex < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if postIndex > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				x.Subject = string(dAtA[iNdEx:postIndex])
+				iNdEx = postIndex
+			case 4:
+				if wireType != 2 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Origin", wireType)
+				}
+				var stringLen uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					stringLen |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				intStringLen := int(stringLen)
+				if intStringLen < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				postIndex := iNdEx + intStringLen
+				if postIndex < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if postIndex > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				x.Origin = string(dAtA[iNdEx:postIndex])
+				iNdEx = postIndex
+			case 5:
+				if wireType != 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType)
+				}
+				x.ExpiryHeight = 0
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					x.ExpiryHeight |= int64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+			case 6:
+				if wireType != 2 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Macaroon", wireType)
+				}
+				var stringLen uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
+					}
+					if iNdEx >= l {
+						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					stringLen |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				intStringLen := int(stringLen)
+				if intStringLen < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				postIndex := iNdEx + intStringLen
+				if postIndex < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if postIndex > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				x.Macaroon = string(dAtA[iNdEx:postIndex])
+				iNdEx = postIndex
+			default:
+				iNdEx = preIndex
+				skippy, err := runtime.Skip(dAtA[iNdEx:])
+				if err != nil {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err
+				}
+				if (skippy < 0) || (iNdEx+skippy) < 0 {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
+				}
+				if (iNdEx + skippy) > l {
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+				}
+				if !options.DiscardUnknown {
+					x.unknownFields = append(x.unknownFields, dAtA[iNdEx:iNdEx+skippy]...)
+				}
+				iNdEx += skippy
+			}
+		}
+
+		if iNdEx > l {
+			return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
+		}
+		return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, nil
+	}
+	return &protoiface.Methods{
+		NoUnkeyedLiterals: struct{}{},
+		Flags:             protoiface.SupportMarshalDeterministic | protoiface.SupportUnmarshalDiscardUnknown,
+		Size:              size,
+		Marshal:           marshal,
+		Unmarshal:         unmarshal,
+		Merge:             nil,
+		CheckInitialized:  nil,
+	}
+}
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.0
@@ -737,6 +1445,81 @@ func (x *Grant) GetExpiryHeight() int64 {
 	return 0
 }
 
+type Macaroon struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id           uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Controller   string `protobuf:"bytes,2,opt,name=controller,proto3" json:"controller,omitempty"`
+	Subject      string `protobuf:"bytes,3,opt,name=subject,proto3" json:"subject,omitempty"`
+	Origin       string `protobuf:"bytes,4,opt,name=origin,proto3" json:"origin,omitempty"`
+	ExpiryHeight int64  `protobuf:"varint,5,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"`
+	Macaroon     string `protobuf:"bytes,6,opt,name=macaroon,proto3" json:"macaroon,omitempty"`
+}
+
+func (x *Macaroon) Reset() {
+	*x = Macaroon{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_macaroon_v1_state_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Macaroon) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Macaroon) ProtoMessage() {}
+
+// Deprecated: Use Macaroon.ProtoReflect.Descriptor instead.
+func (*Macaroon) Descriptor() ([]byte, []int) {
+	return file_macaroon_v1_state_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *Macaroon) GetId() uint64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *Macaroon) GetController() string {
+	if x != nil {
+		return x.Controller
+	}
+	return ""
+}
+
+func (x *Macaroon) GetSubject() string {
+	if x != nil {
+		return x.Subject
+	}
+	return ""
+}
+
+func (x *Macaroon) GetOrigin() string {
+	if x != nil {
+		return x.Origin
+	}
+	return ""
+}
+
+func (x *Macaroon) GetExpiryHeight() int64 {
+	if x != nil {
+		return x.ExpiryHeight
+	}
+	return 0
+}
+
+func (x *Macaroon) GetMacaroon() string {
+	if x != nil {
+		return x.Macaroon
+	}
+	return ""
+}
+
 var File_macaroon_v1_state_proto protoreflect.FileDescriptor
 
 var file_macaroon_v1_state_proto_rawDesc = []byte{
@@ -755,17 +1538,31 @@ var file_macaroon_v1_state_proto_rawDesc = []byte{
 	0x28, 0x03, 0x52, 0x0c, 0x65, 0x78, 0x70, 0x69, 0x72, 0x79, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74,
 	0x3a, 0x26, 0xf2, 0x9e, 0xd3, 0x8e, 0x03, 0x20, 0x0a, 0x06, 0x0a, 0x02, 0x69, 0x64, 0x10, 0x01,
 	0x12, 0x14, 0x0a, 0x0e, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x6f, 0x72, 0x69, 0x67,
-	0x69, 0x6e, 0x10, 0x01, 0x18, 0x01, 0x18, 0x01, 0x42, 0x9d, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d,
+	0x69, 0x6e, 0x10, 0x01, 0x18, 0x01, 0x18, 0x01, 0x22, 0xd5, 0x01, 0x0a, 0x08, 0x4d, 0x61, 0x63,
-	0x2e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x53, 0x74,
+	0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68,
+	0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f,
+	0x6c, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f,
+	0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74,
-	0x76, 0x31, 0x3b, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12,
-	0x4d, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x56,
+	0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x31, 0xca, 0x02, 0x0b, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2,
+	0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x78, 0x70, 0x69, 0x72,
-	0x02, 0x17, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50,
+	0x79, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c,
-	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x4d, 0x61, 0x63, 0x61,
+	0x65, 0x78, 0x70, 0x69, 0x72, 0x79, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1a, 0x0a, 0x08,
-	0x72, 0x6f, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x3a, 0x26, 0xf2, 0x9e, 0xd3, 0x8e, 0x03, 0x20,
+	0x0a, 0x06, 0x0a, 0x02, 0x69, 0x64, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x73, 0x75, 0x62, 0x6a,
+	0x65, 0x63, 0x74, 0x2c, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x10, 0x01, 0x18, 0x01, 0x18, 0x02,
+	0x42, 0x9d, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f,
+	0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f,
+	0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d,
+	0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x61, 0x63, 0x61, 0x72,
+	0x6f, 0x6f, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4d, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x61,
+	0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0b, 0x4d, 0x61, 0x63, 0x61,
+	0x72, 0x6f, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x17, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f,
+	0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0xea, 0x02, 0x0c, 0x4d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -780,9 +1577,10 @@ func file_macaroon_v1_state_proto_rawDescGZIP() []byte {
 	return file_macaroon_v1_state_proto_rawDescData
 }
 
-var file_macaroon_v1_state_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_macaroon_v1_state_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_macaroon_v1_state_proto_goTypes = []interface{}{
-	(*Grant)(nil), // 0: macaroon.v1.Grant
+	(*Grant)(nil),    // 0: macaroon.v1.Grant
+	(*Macaroon)(nil), // 1: macaroon.v1.Macaroon
 }
 var file_macaroon_v1_state_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
@@ -810,6 +1608,18 @@ func file_macaroon_v1_state_proto_init() {
 				return nil
 			}
 		}
+		file_macaroon_v1_state_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Macaroon); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -817,7 +1627,7 @@ func file_macaroon_v1_state_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_macaroon_v1_state_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   1,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

app/app.go

@@ -626,28 +626,15 @@ func NewChainApp(
 	// If evidence needs to be handled for the app, set routes in router here and seal
 	app.EvidenceKeeper = *evidenceKeeper
 
-	// Create the oracle Keeper
+	// Create the did Keeper
-	app.OracleKeeper = oraclekeeper.NewKeeper(
+	app.DidKeeper = didkeeper.NewKeeper(
 		appCodec,
-		sdkruntime.NewKVStoreService(keys[oracletypes.StoreKey]),
+		sdkruntime.NewKVStoreService(keys[didtypes.StoreKey]),
-		logger,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
-
-	// Create the service Keeper
-	app.ServiceKeeper = servicekeeper.NewKeeper(
-		appCodec,
-		sdkruntime.NewKVStoreService(keys[servicetypes.StoreKey]),
-		logger,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
-
-	// Create the macaroon Keeper
-	app.MacaroonKeeper = macaroonkeeper.NewKeeper(
-		appCodec,
-		sdkruntime.NewKVStoreService(keys[macaroontypes.StoreKey]),
 		logger,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		app.AccountKeeper,
+		app.NFTKeeper,
+		app.StakingKeeper,
 	)
 
 	// Create the vault Keeper
@@ -656,16 +643,35 @@ func NewChainApp(
 		sdkruntime.NewKVStoreService(keys[vaulttypes.StoreKey]),
 		logger,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		app.AccountKeeper,
+		app.DidKeeper,
+	)
+	// Create the macaroon Keeper
+	app.MacaroonKeeper = macaroonkeeper.NewKeeper(
+		appCodec,
+		sdkruntime.NewKVStoreService(keys[macaroontypes.StoreKey]),
+		logger,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		app.AccountKeeper,
 		app.DidKeeper,
 	)
 
-	// Create the did Keeper
+	// Create the service Keeper
-	app.DidKeeper = didkeeper.NewKeeper(
+	app.ServiceKeeper = servicekeeper.NewKeeper(
 		appCodec,
-		sdkruntime.NewKVStoreService(keys[didtypes.StoreKey]),
+		sdkruntime.NewKVStoreService(keys[servicetypes.StoreKey]),
-		app.AccountKeeper,
+		logger,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		app.DidKeeper,
+		app.GroupKeeper,
+		app.MacaroonKeeper,
 		app.NFTKeeper,
-		app.StakingKeeper,
+	)
+
+	// Create the oracle Keeper
+	app.OracleKeeper = oraclekeeper.NewKeeper(
+		appCodec,
+		sdkruntime.NewKVStoreService(keys[oracletypes.StoreKey]),
 		logger,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)

app/export.go

@@ -5,10 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
-
 	storetypes "cosmossdk.io/store/types"
-
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
@@ -45,7 +43,7 @@ func (app *SonrApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedA
 		AppState:        appState,
 		Validators:      validators,
 		Height:          height,
-		ConsensusParams: app.BaseApp.GetConsensusParams(ctx),
+		ConsensusParams: app.GetConsensusParams(ctx),
 	}, err
 }
 
@@ -54,13 +52,9 @@ func (app *SonrApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedA
 //
 //	in favor of export at a block height
 func (app *SonrApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
-	applyAllowedAddrs := false
+	applyAllowedAddrs := len(jailAllowedAddrs) > 0
 
 	// check if there is a allowed address list
-	if len(jailAllowedAddrs) > 0 {
-		applyAllowedAddrs = true
-	}
-
 	allowedAddrsMap := make(map[string]bool)
 
 	for _, addr := range jailAllowedAddrs {

app/proxy/proxycmd.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/onsonr/sonr/pkg/nebula"
-	"github.com/onsonr/sonr/pkg/nebula/pages"
+	"github.com/onsonr/sonr/pkg/nebula/router"
 )
 
 func NewProxyCmd() *cobra.Command {
@@ -29,8 +29,8 @@ func NewProxyCmd() *cobra.Command {
 				e.Logger.Fatal(err)
 			}
 
-			e.GET("/", pages.Home)
+			e.GET("/", router.Home)
-			e.GET("/allocate", pages.Profile)
+			e.GET("/allocate", router.Profile)
 
 			// Start server
 			ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)

cmd/hway/commands/root.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import "github.com/spf13/cobra"
 

cmd/hway/commands/start.go

@@ -0,0 +1,18 @@
+package commands
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/onsonr/sonr/cmd/hway/server"
+)
+
+func NewStartCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "start",
+		Short: "Starts the DWN proxy server for the local IPFS node",
+		Run: func(cmd *cobra.Command, args []string) {
+			s := server.New()
+			s.Start()
+		},
+	}
+}

cmd/hway/main.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"github.com/onsonr/sonr/cmd/hway/commands"
+)
+
+func main() {
+	rootCmd := commands.NewRootCmd()
+	rootCmd.AddCommand(commands.NewStartCmd())
+	if err := rootCmd.Execute(); err != nil {
+		panic(err)
+	}
+}

cmd/hway/server/handlers/search.go

@@ -0,0 +1 @@
+package handlers

cmd/hway/server/handlers/sync.go

@@ -0,0 +1 @@
+package handlers

cmd/hway/server/handlers/txns.go

@@ -0,0 +1 @@
+package handlers

cmd/hway/server/handlers/wss.go

@@ -0,0 +1 @@
+package handlers

cmd/hway/server/server.go

@@ -0,0 +1,40 @@
+package server
+
+import (
+	"net/http"
+
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/gommon/log"
+
+	"github.com/onsonr/sonr/internal/session"
+	"github.com/onsonr/sonr/pkg/nebula"
+	"github.com/onsonr/sonr/pkg/nebula/router"
+)
+
+type Server struct {
+	*echo.Echo
+}
+
+func New() *Server {
+	s := &Server{Echo: echo.New()}
+	s.Logger.SetLevel(log.INFO)
+	s.Use(session.UseSession)
+
+	// Configure the server
+	if err := nebula.UseAssets(s.Echo); err != nil {
+		s.Logger.Fatal(err)
+	}
+
+	s.GET("/", router.Home)
+	s.GET("/login", router.Login)
+	s.GET("/register", router.Register)
+	s.GET("/profile", router.Profile)
+	s.GET("/authorize", router.Authorize)
+	return s
+}
+
+func (s *Server) Start() {
+	if err := s.Echo.Start(":1323"); err != http.ErrServerClosed {
+		log.Fatal(err)
+	}
+}

cmd/motr/main.go

@@ -1,9 +0,0 @@
-package main
-
-func main() {
-	rootCmd := NewRootCmd()
-	rootCmd.AddCommand(NewProxyCmd())
-	if err := rootCmd.Execute(); err != nil {
-		panic(err)
-	}
-}

cmd/motr/motr.go

@@ -15,14 +15,14 @@ import (
 	"github.com/labstack/echo/v4"
 	promise "github.com/nlepage/go-js-promise"
 
-	"github.com/onsonr/sonr/cmd/dwn/middleware"
+	"github.com/onsonr/sonr/cmd/motr/state"
-	"github.com/onsonr/sonr/cmd/dwn/state"
+	"github.com/onsonr/sonr/internal/session"
 	"github.com/onsonr/sonr/pkg/nebula/pages"
 )
 
 func main() {
 	e := echo.New()
-	e.Use(middleware.UseSession)
+	e.Use(session.UseSession)
 	registerViews(e)
 	registerState(e)
 	Serve(e)

cmd/motr/proxy.go

@@ -1,39 +0,0 @@
-package main
-
-import (
-	"net/http"
-
-	"github.com/labstack/echo/v4"
-	"github.com/labstack/gommon/log"
-	"github.com/spf13/cobra"
-
-	"github.com/onsonr/sonr/pkg/nebula"
-	"github.com/onsonr/sonr/pkg/nebula/pages"
-)
-
-func NewProxyCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "start",
-		Short: "Starts the DWN proxy server for the local IPFS node",
-		Run: func(cmd *cobra.Command, args []string) {
-			// Echo instance
-			e := echo.New()
-			e.Logger.SetLevel(log.INFO)
-
-			// Configure the server
-			if err := nebula.UseAssets(e); err != nil {
-				e.Logger.Fatal(err)
-			}
-
-			e.GET("/", pages.Home)
-			e.GET("/login", pages.Login)
-			e.GET("/register", pages.Register)
-			e.GET("/profile", pages.Profile)
-			e.GET("/allocate", pages.Profile)
-
-			if err := e.Start(":1323"); err != http.ErrServerClosed {
-				log.Fatal(err)
-			}
-		},
-	}
-}

configs/logs.json

@@ -1 +0,0 @@
-{}

deploy/devenv/air.motr.toml

@@ -1,49 +0,0 @@
-root = "."
-testdata_dir = "testdata"
-tmp_dir = "tmp"
-
-[build]
-delay = 1000
-cmd = "devbox run build:motr"
-exclude_dir = ["assets", "tmp", "vendor", "testdata"]
-exclude_file = []
-exclude_regex = ["_test.go"]
-exclude_unchanged = true
-follow_symlink = false
-full_bin = "devbox run start"
-include_dir = ["cmd/dwn", "cmd/motr", "internal", "models", "pkl"]
-include_ext = ["go", "templ", "html", "pkl", "js", "mjs", "proto"]
-include_file = [
-  "Dockerfile",
-  ".goreleaser.yaml",
-  "go.mod",
-  "devbox.json",
-  ".air.toml",
-]
-kill_delay = "10s"
-log = "build-errors.log"
-poll = false
-poll_interval = 0
-post_cmd = ["devbox run stop"]
-pre_cmd = ["templ generate"]
-rerun = false
-rerun_delay = 1000
-send_interrupt = true
-stop_on_error = false
-
-[color]
-build = "yellow"
-main = "magenta"
-runner = "green"
-watcher = "cyan"
-
-[log]
-main_only = true
-time = true
-
-[misc]
-clean_on_exit = true
-
-[screen]
-clear_on_rebuild = true
-keep_scroll = true

deploy/devenv/air.sonr.toml

@@ -1,49 +0,0 @@
-root = "."
-testdata_dir = "testdata"
-tmp_dir = "tmp"
-
-[build]
-delay = 1000
-cmd = "devbox run build:motr"
-exclude_dir = ["assets", "tmp", "vendor", "testdata"]
-exclude_file = []
-exclude_regex = ["_test.go"]
-exclude_unchanged = true
-follow_symlink = false
-full_bin = "devbox run start"
-include_dir = ["cmd/dwn", "cmd/motr", "internal", "models", "pkl"]
-include_ext = ["go", "templ", "html", "pkl", "js", "mjs", "proto"]
-include_file = [
-  "Dockerfile",
-  ".goreleaser.yaml",
-  "go.mod",
-  "devbox.json",
-  ".air.toml",
-]
-kill_delay = "10s"
-log = "build-errors.log"
-poll = false
-poll_interval = 0
-post_cmd = ["devbox run stop"]
-pre_cmd = ["templ generate"]
-rerun = false
-rerun_delay = 1000
-send_interrupt = true
-stop_on_error = false
-
-[color]
-build = "yellow"
-main = "magenta"
-runner = "green"
-watcher = "cyan"
-
-[log]
-main_only = true
-time = true
-
-[misc]
-clean_on_exit = true
-
-[screen]
-clear_on_rebuild = true
-keep_scroll = true

deploy/hway.Dockerfile

@@ -0,0 +1,3 @@
+FROM scratch
+ENTRYPOINT ["/hway"]
+COPY hway /

deploy/process-compose.yaml

@@ -13,13 +13,14 @@ processes:
     namespace: testnet
     command: "devbox run start:testnet"
     restart: on_failure
+    env:
     max_restarts: 1
     depends:
       - ipfs
 
-  motr:
+  hway:
     namespace: testnet
-    command: "devbox run start:motr"
+    command: "devbox run start:hway"
     restart: on_failure
     max_restarts: 1
     depends:
@@ -31,5 +32,3 @@ processes:
     command: "cloudflared tunnel run --token $TUNNEL_TOKEN"
     restart: on_failure
     max_restarts: 1
-    depends:
-      - caddy

deploy/release/motr.Dockerfile

@@ -1,3 +0,0 @@
-FROM scratch
-ENTRYPOINT ["/motr"]
-COPY motr /

deploy/testnet/chains.yaml

@@ -1,37 +0,0 @@
-# This file is used to create docker images using the heighliner binary.
-# see: https://github.com/strangelove-ventures/heighliner
-
-# Sonr Node - Identity
-- name: sonr
-  github-organization: onsonr
-  github-repo: sonr
-  dockerfile: cosmos
-  build-target: make install
-  binaries:
-    - /go/bin/sonrd
-  build-env:
-    - LEDGER_ENABLED=false
-    - BUILD_TAGS=muslc
-
-# Ethereum Node - Web3
-- name: evmos
-  github-organization: tharsis
-  github-repo: evmos
-  dockerfile: cosmos
-  build-target: make install
-  binaries:
-    - /go/bin/evmosd
-
-# Bitcoin Node - Gold
-- name: nomic
-  github-organization: nomic-io
-  github-repo: nomic
-  dockerfile: cargo
-  build-target: |
-    TOOLCHAIN=$(cat rust-toolchain.toml | grep channel | awk '{print $3}' | tr -d '"')
-    rustup component add rust-src --toolchain ${TOOLCHAIN}-$(uname -m)-unknown-linux-gnu
-    cargo install --locked --path . -Zbuild-std
-  binaries:
-    - /build/nomic/target/${ARCH}-unknown-linux-gnu/release/nomic
-  platforms:
-    - linux/amd64

deploy/testnet/devbox.json

@@ -1,92 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json",
-  "packages": [
-    "go@1.22",
-    "air@latest",
-    "bun@latest",
-    "ipfs@latest",
-    "skate@latest",
-    "cloudflared@latest",
-    "process-compose@latest"
-  ],
-  "env": {
-    "GOPATH": "$HOME/go",
-    "PATH": "$HOME/go/bin:$PATH",
-    "CHAIN_ID": "sonr-testnet-1",
-    "DENOM": "usnr",
-    "KEYRING": "test",
-    "MONIKER": "florence",
-    "BINARY": "sonrd",
-    "ACC0_NAME": "acc0",
-    "ACC1_NAME": "acc1",
-    "ACC0_ADDRESS": "idx1efd63aw40lxf3n4mhf7dzhjkr453axur9vjt6y",
-    "ACC1_ADDRESS": "idx1hj5fveer5cjtn4wd6wstzugjfdxzl0xpecp0nd",
-    "ACC0_MNEMONIC": "$(skate get ACC0_MNEMONIC)",
-    "ACC1_MNEMONIC": "$(skate get ACC1_MNEMONIC)",
-    "TUNNEL_TOKEN": "$(skate get CLOUDFLARE_TUNNEL_TOKEN)",
-    "TEMPL_EXPERIMENT": "rawgo"
-  },
-  "shell": {
-    "scripts": {
-      "dev": [
-        "air"
-      ],
-      "build:docker": [
-        "make local-image"
-      ],
-      "build:motr": [
-        "make nebula",
-        "make motr"
-      ],
-      "build:nebula": [
-        "make nebula"
-      ],
-      "build:sonrd": [
-        "make dwn",
-        "make build"
-      ],
-      "build": [
-        "make dwn",
-        "make build",
-        "make motr"
-      ],
-      "gen:proto": [
-        "make proto-gen"
-      ],
-      "gen:pkl": [
-        "make pkl"
-      ],
-      "gen:templ": [
-        "make templ"
-      ],
-      "start:motr": [
-        "make templ",
-        "make motr",
-        "make start-motr"
-      ],
-      "start:testnet": [
-        "make templ",
-        "make install",
-        "make sh-testnet"
-      ],
-      "start": [
-        "process-compose up -d"
-      ],
-      "stop": [
-        "process-compose down"
-      ],
-      "test:e2e": [
-        "make templ",
-        "make test-e2e"
-      ],
-      "test:unit": [
-        "make templ",
-        "make test-unit"
-      ],
-      "test": [
-        "make templ",
-        "make test"
-      ]
-    }
-  }
-}

deploy/testnet/docker-compose.yaml

@@ -1,30 +0,0 @@
-version: "3"
-
-services:
-  sonr-node:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - /home/prad/.scnr:/root/.sonr
-    ports:
-      - "26657:26657"
-      - "1317:1317"
-      - "9090:9090"
-    environment:
-      - CHAIN_ID=local-1
-      - MONIKER=localvalidator
-      - KEYRING=test
-      - KEY=user1
-      - KEY2=user2
-      - DENOM=usnr
-      - CLEAN=true
-      - BLOCK_TIME=5s
-    command: "start --pruning=nothing"
-    restart: always
-    networks:
-      - sonr-network
-
-networks:
-  sonr-network:
-    name: sonr-network

devbox.json

@@ -4,14 +4,17 @@
     "go@1.22",
     "air@latest",
     "bun@latest",
+    "gum@latest",
     "ipfs@latest",
+    "mprocs@latest",
     "skate@latest",
+    "templ@latest",
     "cloudflared@latest",
     "process-compose@latest"
   ],
   "env": {
     "GOPATH": "$HOME/go",
-    "PATH": "$HOME/go/bin:$PATH",
+    "PATH": "./build:$HOME/go/bin:$PATH",
     "CHAIN_ID": "sonr-testnet-1",
     "DENOM": "usnr",
     "KEYRING": "test",
@@ -28,27 +31,27 @@
   },
   "shell": {
     "scripts": {
-      "dev": [
-        "air"
-      ],
       "build:docker": [
         "make local-image"
       ],
-      "build:motr": [
+      "build:hway": [
         "make nebula",
-        "make motr"
+        "make hway"
       ],
       "build:nebula": [
         "make nebula"
       ],
+      "build:motr": [
+        "make motr"
+      ],
       "build:sonrd": [
-        "make dwn",
+        "make motr",
         "make build"
       ],
       "build": [
-        "make dwn",
+        "make motr",
         "make build",
-        "make motr"
+        "make hway"
       ],
       "gen:proto": [
         "make proto-gen"
@@ -59,33 +62,19 @@
       "gen:templ": [
         "make templ"
       ],
-      "start:motr": [
-        "make templ",
-        "make motr",
-        "make start-motr"
-      ],
-      "start:testnet": [
-        "make templ",
-        "make install",
-        "make sh-testnet"
-      ],
       "start": [
-        "process-compose up -d"
+        "process-compose up -f ./deploy/process-compose.yaml"
       ],
       "stop": [
-        "process-compose down"
+        "process-compose down -f ./deploy/process-compose.yaml"
       ],
-      "test:e2e": [
+      "start:testnet": [
-        "make templ",
+        "make sh-testnet"
-        "make test-e2e"
       ],
-      "test:unit": [
+      "start:hway": [
-        "make templ",
+        "make nebula",
-        "make test-unit"
+        "make hway",
-      ],
+        "./build/hway start"
-      "test": [
-        "make templ",
-        "make test"
       ]
     }
   }

devbox.lock

@@ -193,12 +193,108 @@
         }
       }
     },
+    "gum@latest": {
+      "last_modified": "2024-09-10T15:01:03Z",
+      "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#gum",
+      "source": "devbox-search",
+      "version": "0.14.5",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/n1gqffrwdzr3vpsmwmwx3hmw814c1k6g-gum-0.14.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/n1gqffrwdzr3vpsmwmwx3hmw814c1k6g-gum-0.14.5"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/ggp10jr3l6higs0gqibp6ypjlf7yakpc-gum-0.14.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/ggp10jr3l6higs0gqibp6ypjlf7yakpc-gum-0.14.5"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/jq8shghha81s1wg67fcjrfnf4hbliimn-gum-0.14.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/jq8shghha81s1wg67fcjrfnf4hbliimn-gum-0.14.5"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/f199acwir08z47f3d5kf1fhmhajmd1ig-gum-0.14.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/f199acwir08z47f3d5kf1fhmhajmd1ig-gum-0.14.5"
+        }
+      }
+    },
     "ipfs@latest": {
       "last_modified": "2023-02-24T09:01:09Z",
       "resolved": "github:NixOS/nixpkgs/7d0ed7f2e5aea07ab22ccb338d27fbe347ed2f11#ipfs",
       "source": "devbox-search",
       "version": "0.17.0"
     },
+    "mprocs@latest": {
+      "last_modified": "2024-09-10T15:01:03Z",
+      "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#mprocs",
+      "source": "devbox-search",
+      "version": "0.7.1",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/sri1rv6phxhcvgwknd3zv98km6s1740b-mprocs-0.7.1",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/sri1rv6phxhcvgwknd3zv98km6s1740b-mprocs-0.7.1"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/7q84qjs24xd9jf2wvn7f39gvxsn5n33q-mprocs-0.7.1",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/7q84qjs24xd9jf2wvn7f39gvxsn5n33q-mprocs-0.7.1"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/47j50bgr6mxlvdjddh0li810wkld34qb-mprocs-0.7.1",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/47j50bgr6mxlvdjddh0li810wkld34qb-mprocs-0.7.1"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/6vrvg4jhv2yg8y326dmrxsz3yddkqgzq-mprocs-0.7.1",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/6vrvg4jhv2yg8y326dmrxsz3yddkqgzq-mprocs-0.7.1"
+        }
+      }
+    },
     "process-compose@latest": {
       "last_modified": "2024-09-15T21:49:16Z",
       "resolved": "github:NixOS/nixpkgs/039b72d0c738c934e2e36d7fc5520d1b425287a6#process-compose",
@@ -294,6 +390,54 @@
           "store_path": "/nix/store/6zbyhj72wh0645lj6b9c392aqqg11a84-skate-1.0.0"
         }
       }
+    },
+    "templ@latest": {
+      "last_modified": "2024-09-10T15:01:03Z",
+      "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#templ",
+      "source": "devbox-search",
+      "version": "0.2.778",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/n3yqslisz9v81k4w4vhci1v2bl1sqf9s-templ-0.2.778",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/n3yqslisz9v81k4w4vhci1v2bl1sqf9s-templ-0.2.778"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/i4xjiw0vc25qpr3g01q0x401351w28hr-templ-0.2.778",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/i4xjiw0vc25qpr3g01q0x401351w28hr-templ-0.2.778"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/77w522agb5fgsr36jkifcccr9x4xwkf9-templ-0.2.778",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/77w522agb5fgsr36jkifcccr9x4xwkf9-templ-0.2.778"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/1g5ji5930j03cycpcjy12z6lr24l9c65-templ-0.2.778",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/1g5ji5930j03cycpcjy12z6lr24l9c65-templ-0.2.778"
+        }
+      }
     }
   }
 }

internal/auth/macaroon.go

@@ -1,4 +1,4 @@
-package middleware
+package auth
 
 import (
 	"fmt"

internal/auth/middleware.go

@@ -1,4 +1,4 @@
-package middleware
+package auth
 
 import (
 	"net/http"
@@ -7,21 +7,6 @@ import (
 	"gopkg.in/macaroon.v2"
 )
 
-// GetSession returns the current Session
-func GetSession(c echo.Context) *Session {
-	return c.(*Session)
-}
-
-// UseSession establishes a Session Cookie.
-func UseSession(next echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		sc := initSession(c)
-		headers := new(RequestHeaders)
-		sc.Bind(headers)
-		return next(sc)
-	}
-}
-
 func MacaroonMiddleware(secretKeyStr string, location string) echo.MiddlewareFunc {
 	secretKey := []byte(secretKeyStr)
 	return func(next echo.HandlerFunc) echo.HandlerFunc {

internal/headers/request.go

@@ -0,0 +1,31 @@
+package headers
+
+type RequestHeaders struct {
+	CacheControl  *string `header:"Cache-Control"`
+	DeviceMemory  *string `header:"Device-Memory"`
+	From          *string `header:"From"`
+	Host          *string `header:"Host"`
+	Referer       *string `header:"Referer"`
+	UserAgent     *string `header:"User-Agent"`
+	ViewportWidth *string `header:"Viewport-Width"`
+	Width         *string `header:"Width"`
+
+	// HTMX Specific
+	HXBoosted               *string `header:"HX-Boosted"`
+	HXCurrentURL            *string `header:"HX-Current-URL"`
+	HXHistoryRestoreRequest *string `header:"HX-History-Restore-Request"`
+	HXPrompt                *string `header:"HX-Prompt"`
+	HXRequest               *string `header:"HX-Request"`
+	HXTarget                *string `header:"HX-Target"`
+	HXTriggerName           *string `header:"HX-Trigger-Name"`
+	HXTrigger               *string `header:"HX-Trigger"`
+}
+
+type ProtectedRequestHeaders struct {
+	Authorization      *string `header:"Authorization"`
+	Forwarded          *string `header:"Forwarded"`
+	Link               *string `header:"Link"`
+	PermissionsPolicy  *string `header:"Permissions-Policy"`
+	ProxyAuthorization *string `header:"Proxy-Authorization"`
+	WWWAuthenticate    *string `header:"WWW-Authenticate"`
+}

internal/headers/response.go

@@ -1,45 +1,6 @@
-package middleware
+package headers
-
-type RequestHeaders struct {
-	Authorization      *string `header:"Authorization"`
-	CacheControl       *string `header:"Cache-Control"`
-	DeviceMemory       *string `header:"Device-Memory"`
-	Forwarded          *string `header:"Forwarded"`
-	From               *string `header:"From"`
-	Host               *string `header:"Host"`
-	Link               *string `header:"Link"`
-	PermissionsPolicy  *string `header:"Permissions-Policy"`
-	ProxyAuthorization *string `header:"Proxy-Authorization"`
-	Referer            *string `header:"Referer"`
-	UserAgent          *string `header:"User-Agent"`
-	ViewportWidth      *string `header:"Viewport-Width"`
-	Width              *string `header:"Width"`
-	WWWAuthenticate    *string `header:"WWW-Authenticate"`
-
-	// HTMX Specific
-	HXBoosted               *string `header:"HX-Boosted"`
-	HXCurrentURL            *string `header:"HX-Current-URL"`
-	HXHistoryRestoreRequest *string `header:"HX-History-Restore-Request"`
-	HXPrompt                *string `header:"HX-Prompt"`
-	HXRequest               *string `header:"HX-Request"`
-	HXTarget                *string `header:"HX-Target"`
-	HXTriggerName           *string `header:"HX-Trigger-Name"`
-	HXTrigger               *string `header:"HX-Trigger"`
-}
 
 type ResponseHeaders struct {
-	AcceptCH                      *string `header:"Accept-CH"`
-	AccessControlAllowCredentials *string `header:"Access-Control-Allow-Credentials"`
-	AccessControlAllowHeaders     *string `header:"Access-Control-Allow-Headers"`
-	AccessControlAllowMethods     *string `header:"Access-Control-Allow-Methods"`
-	AccessControlExposeHeaders    *string `header:"Access-Control-Expose-Headers"`
-	AccessControlRequestHeaders   *string `header:"Access-Control-Request-Headers"`
-	ContentSecurityPolicy         *string `header:"Content-Security-Policy"`
-	CrossOriginEmbedderPolicy     *string `header:"Cross-Origin-Embedder-Policy"`
-	PermissionsPolicy             *string `header:"Permissions-Policy"`
-	ProxyAuthorization            *string `header:"Proxy-Authorization"`
-	WWWAuthenticate               *string `header:"WWW-Authenticate"`
-
 	// HTMX Specific
 	HXLocation           *string `header:"HX-Location"`
 	HXPushURL            *string `header:"HX-Push-Url"`
@@ -53,3 +14,17 @@ type ResponseHeaders struct {
 	HXTriggerAfterSettle *string `header:"HX-Trigger-After-Settle"`
 	HXTriggerAfterSwap   *string `header:"HX-Trigger-After-Swap"`
 }
+
+type ProtectedResponseHeaders struct {
+	AcceptCH                      *string `header:"Accept-CH"`
+	AccessControlAllowCredentials *string `header:"Access-Control-Allow-Credentials"`
+	AccessControlAllowHeaders     *string `header:"Access-Control-Allow-Headers"`
+	AccessControlAllowMethods     *string `header:"Access-Control-Allow-Methods"`
+	AccessControlExposeHeaders    *string `header:"Access-Control-Expose-Headers"`
+	AccessControlRequestHeaders   *string `header:"Access-Control-Request-Headers"`
+	ContentSecurityPolicy         *string `header:"Content-Security-Policy"`
+	CrossOriginEmbedderPolicy     *string `header:"Cross-Origin-Embedder-Policy"`
+	PermissionsPolicy             *string `header:"Permissions-Policy"`
+	ProxyAuthorization            *string `header:"Proxy-Authorization"`
+	WWWAuthenticate               *string `header:"WWW-Authenticate"`
+}

internal/session/cookies.go

@@ -1,4 +1,4 @@
-package middleware
+package session
 
 import (
 	"net/http"
@@ -6,7 +6,6 @@ import (
 
 	"github.com/donseba/go-htmx"
 	"github.com/labstack/echo/v4"
-	"github.com/segmentio/ksuid"
 )
 
 type Session struct {
@@ -22,15 +21,6 @@ func (c *Session) ID() string {
 	return ReadCookie(c, "session")
 }
 
-func initSession(c echo.Context) *Session {
-	s := &Session{Context: c}
-	if val := ReadCookie(c, "session"); val == "" {
-		id := ksuid.New().String()
-		WriteCookie(c, "session", id)
-	}
-	return s
-}
-
 func ReadCookie(c echo.Context, key string) string {
 	cookie, err := c.Cookie(key)
 	if err != nil {

internal/session/middleware.go

@@ -0,0 +1,35 @@
+package session
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/segmentio/ksuid"
+
+	"github.com/onsonr/sonr/internal/headers"
+)
+
+// GetSession returns the current Session
+func GetSession(c echo.Context) *Session {
+	return c.(*Session)
+}
+
+// UseSession establishes a Session Cookie.
+func UseSession(next echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		sc := initSession(c)
+		headers := new(headers.RequestHeaders)
+		err := sc.Bind(headers)
+		if err != nil {
+			return err
+		}
+		return next(sc)
+	}
+}
+
+func initSession(c echo.Context) *Session {
+	s := &Session{Context: c}
+	if val := ReadCookie(c, "session"); val == "" {
+		id := ksuid.New().String()
+		WriteCookie(c, "session", id)
+	}
+	return s
+}

pkg/dwn/Config.pkl.go

@@ -2,13 +2,13 @@
 package dwn
 
 type Config struct {
-	Ipfs *IPFS `pkl:"ipfs" json:"ipfs,omitempty"`
+	Ipfs *IPFS `pkl:"ipfs"`
 
-	Sonr *Sonr `pkl:"sonr" json:"sonr,omitempty"`
+	Sonr *Sonr `pkl:"sonr"`
 
-	Motr *Motr `pkl:"motr" json:"motr,omitempty"`
+	Motr *Motr `pkl:"motr"`
 
-	Schema *Schema `pkl:"schema" json:"schema,omitempty"`
+	Schema *Schema `pkl:"schema"`
 
-	ProxyUrl string `pkl:"proxyUrl" json:"proxyUrl,omitempty"`
+	ProxyUrl string `pkl:"proxyUrl"`
 }

pkg/dwn/IPFS.pkl.go

@@ -2,7 +2,7 @@
 package dwn
 
 type IPFS struct {
-	ApiUrl string `pkl:"apiUrl" json:"apiUrl,omitempty"`
+	ApiUrl string `pkl:"apiUrl"`
 
-	GatewayUrl string `pkl:"gatewayUrl" json:"gatewayUrl,omitempty"`
+	GatewayUrl string `pkl:"gatewayUrl"`
 }

pkg/dwn/Motr.pkl.go

@@ -2,9 +2,9 @@
 package dwn
 
 type Motr struct {
-	Keyshare string `pkl:"keyshare" json:"keyshare,omitempty"`
+	Keyshare string `pkl:"keyshare"`
 
-	Address string `pkl:"address" json:"address,omitempty"`
+	Address string `pkl:"address"`
 
-	Origin string `pkl:"origin" json:"origin,omitempty"`
+	Origin string `pkl:"origin"`
 }

pkg/dwn/Schema.pkl.go

@@ -4,19 +4,19 @@ package dwn
 type Schema struct {
 	Version int `pkl:"version"`
 
-	Account string `pkl:"account" json:"account,omitempty"`
+	Account string `pkl:"account"`
 
-	Asset string `pkl:"asset" json:"asset,omitempty"`
+	Asset string `pkl:"asset"`
 
-	Chain string `pkl:"chain" json:"chain,omitempty"`
+	Chain string `pkl:"chain"`
 
-	Credential string `pkl:"credential" json:"credential,omitempty"`
+	Credential string `pkl:"credential"`
 
-	Jwk string `pkl:"jwk" json:"jwk,omitempty"`
+	Jwk string `pkl:"jwk"`
 
-	Grant string `pkl:"grant" json:"grant,omitempty"`
+	Grant string `pkl:"grant"`
 
-	Keyshare string `pkl:"keyshare" json:"keyshare,omitempty"`
+	Keyshare string `pkl:"keyshare"`
 
-	Profile string `pkl:"profile" json:"profile,omitempty"`
+	Profile string `pkl:"profile"`
 }

pkg/dwn/Sonr.pkl.go

@@ -2,13 +2,13 @@
 package dwn
 
 type Sonr struct {
-	ApiUrl string `pkl:"apiUrl" json:"apiUrl,omitempty"`
+	ApiUrl string `pkl:"apiUrl"`
 
-	GrpcUrl string `pkl:"grpcUrl" json:"grpcUrl,omitempty"`
+	GrpcUrl string `pkl:"grpcUrl"`
 
-	RpcUrl string `pkl:"rpcUrl" json:"rpcUrl,omitempty"`
+	RpcUrl string `pkl:"rpcUrl"`
 
-	WebSocketUrl string `pkl:"webSocketUrl" json:"webSocketUrl,omitempty"`
+	WebSocketUrl string `pkl:"webSocketUrl"`
 
-	ChainId string `pkl:"chainId" json:"chainId,omitempty"`
+	ChainId string `pkl:"chainId"`
 }

pkg/dwn/embed.go

@@ -13,15 +13,11 @@ import (
 //go:embed app.wasm
 var dwnWasmData []byte
 
-//go:embed motr.mjs
-var motrMJSData []byte
-
 //go:embed sw.js
 var swJSData []byte
 
 var (
 	dwnWasmFile = files.NewBytesFile(dwnWasmData)
-	motrMJSFile = files.NewBytesFile(motrMJSData)
 	swJSFile    = files.NewBytesFile(swJSData)
 )
 
@@ -43,7 +39,6 @@ func NewVaultDirectory(cnfg *Config) (files.Node, error) {
 	}
 	fileMap := map[string]files.Node{
 		"config.json": files.NewBytesFile(dwnJSON),
-		"motr.mjs":    motrMJSFile,
 		"sw.js":       swJSFile,
 		"app.wasm":    dwnWasmFile,
 		"index.html":  files.NewBytesFile(w.Bytes()),

pkg/dwn/motr.mjs

@@ -1,253 +0,0 @@
-// motr.mjs
-
-import Dexie from "dexie";
-
-export class Motr {
-  constructor(config) {
-    this.config = config;
-    this.vault = null;
-    this.initializeVault();
-  }
-
-  initializeVault() {
-    const { schema } = this.config;
-    this.vault = new Dexie("Vault");
-    this.vault.version(schema.version).stores(schema);
-  }
-
-  // Account methods
-  async insertAccount(accountData) {
-    return this.vault.account.add(accountData);
-  }
-
-  async getAccount(id) {
-    return this.vault.account.get(id);
-  }
-
-  async updateAccount(id, accountData) {
-    return this.vault.account.update(id, accountData);
-  }
-
-  async deleteAccount(id) {
-    return this.vault.account.delete(id);
-  }
-
-  // Asset methods
-  async insertAsset(assetData) {
-    return this.vault.asset.add(assetData);
-  }
-
-  async getAsset(id) {
-    return this.vault.asset.get(id);
-  }
-
-  async updateAsset(id, assetData) {
-    return this.vault.asset.update(id, assetData);
-  }
-
-  async deleteAsset(id) {
-    return this.vault.asset.delete(id);
-  }
-
-  // Chain methods
-  async insertChain(chainData) {
-    return this.vault.chain.add(chainData);
-  }
-
-  async getChain(id) {
-    return this.vault.chain.get(id);
-  }
-
-  async updateChain(id, chainData) {
-    return this.vault.chain.update(id, chainData);
-  }
-
-  async deleteChain(id) {
-    return this.vault.chain.delete(id);
-  }
-
-  // Credential methods
-  async insertCredential(credentialData) {
-    const publicKey = await this.createPublicKeyCredential(credentialData);
-    credentialData.credentialId = publicKey.id;
-    credentialData.publicKey = publicKey.publicKey;
-    return this.vault.credential.add(credentialData);
-  }
-
-  async getCredential(id) {
-    return this.vault.credential.get(id);
-  }
-
-  async updateCredential(id, credentialData) {
-    return this.vault.credential.update(id, credentialData);
-  }
-
-  async deleteCredential(id) {
-    return this.vault.credential.delete(id);
-  }
-
-  // JWK methods
-  async insertJwk(jwkData) {
-    return this.vault.jwk.add(jwkData);
-  }
-
-  async getJwk(id) {
-    return this.vault.jwk.get(id);
-  }
-
-  async updateJwk(id, jwkData) {
-    return this.vault.jwk.update(id, jwkData);
-  }
-
-  async deleteJwk(id) {
-    return this.vault.jwk.delete(id);
-  }
-
-  // Grant methods
-  async insertGrant(grantData) {
-    return this.vault.grant.add(grantData);
-  }
-
-  async getGrant(id) {
-    return this.vault.grant.get(id);
-  }
-
-  async updateGrant(id, grantData) {
-    return this.vault.grant.update(id, grantData);
-  }
-
-  async deleteGrant(id) {
-    return this.vault.grant.delete(id);
-  }
-
-  // Keyshare methods
-  async insertKeyshare(keyshareData) {
-    return this.vault.keyshare.add(keyshareData);
-  }
-
-  async getKeyshare(id) {
-    return this.vault.keyshare.get(id);
-  }
-
-  async updateKeyshare(id, keyshareData) {
-    return this.vault.keyshare.update(id, keyshareData);
-  }
-
-  async deleteKeyshare(id) {
-    return this.vault.keyshare.delete(id);
-  }
-
-  // PublicKey methods
-  async insertPublicKey(publicKeyData) {
-    return this.vault.publicKey.add(publicKeyData);
-  }
-
-  async getPublicKey(id) {
-    return this.vault.publicKey.get(id);
-  }
-
-  async updatePublicKey(id, publicKeyData) {
-    return this.vault.publicKey.update(id, publicKeyData);
-  }
-
-  async deletePublicKey(id) {
-    return this.vault.publicKey.delete(id);
-  }
-
-  // Profile methods
-  async insertProfile(profileData) {
-    return this.vault.profile.add(profileData);
-  }
-
-  async getProfile(id) {
-    return this.vault.profile.get(id);
-  }
-
-  async updateProfile(id, profileData) {
-    return this.vault.profile.update(id, profileData);
-  }
-
-  async deleteProfile(id) {
-    return this.vault.profile.delete(id);
-  }
-
-  // WebAuthn methods
-  async createPublicKeyCredential(options) {
-    const publicKeyCredentialCreationOptions = {
-      challenge: new Uint8Array(32),
-      rp: {
-        name: this.config.motr.origin,
-        id: new URL(this.config.motr.origin).hostname,
-      },
-      user: {
-        id: new TextEncoder().encode(options.subject),
-        name: options.subject,
-        displayName: options.label,
-      },
-      pubKeyCredParams: [
-        { alg: -7, type: "public-key" },
-        { alg: -257, type: "public-key" },
-      ],
-      authenticatorSelection: {
-        authenticatorAttachment: "platform",
-        userVerification: "required",
-      },
-      timeout: 60000,
-      attestation: "direct",
-    };
-
-    try {
-      const credential = await navigator.credentials.create({
-        publicKey: publicKeyCredentialCreationOptions,
-      });
-
-      const publicKeyJwk = await crypto.subtle.exportKey(
-        "jwk",
-        credential.response.getPublicKey(),
-      );
-
-      return {
-        id: credential.id,
-        publicKey: publicKeyJwk,
-        type: credential.type,
-        transports: credential.response.getTransports(),
-      };
-    } catch (error) {
-      console.error("Error creating credential:", error);
-      throw error;
-    }
-  }
-
-  async getPublicKeyCredential(options) {
-    const publicKeyCredentialRequestOptions = {
-      challenge: new Uint8Array(32),
-      rpId: new URL(this.config.motr.origin).hostname,
-      allowCredentials: options.allowCredentials || [],
-      userVerification: "required",
-      timeout: 60000,
-    };
-
-    try {
-      const assertion = await navigator.credentials.get({
-        publicKey: publicKeyCredentialRequestOptions,
-      });
-
-      return {
-        id: assertion.id,
-        type: assertion.type,
-        rawId: new Uint8Array(assertion.rawId),
-        response: {
-          authenticatorData: new Uint8Array(
-            assertion.response.authenticatorData,
-          ),
-          clientDataJSON: new Uint8Array(assertion.response.clientDataJSON),
-          signature: new Uint8Array(assertion.response.signature),
-          userHandle: new Uint8Array(assertion.response.userHandle),
-        },
-      };
-    } catch (error) {
-      console.error("Error getting credential:", error);
-      throw error;
-    }
-  }
-}

pkg/nebula/assets/css/styles.css

@@ -54,6 +54,74 @@
   --tw-contain-layout:  ;
   --tw-contain-paint:  ;
   --tw-contain-style:  ;
+  --motion-origin-scale-x: 1;
+  --motion-origin-scale-y: 1;
+  --motion-origin-translate-x: 0;
+  --motion-origin-translate-y: 0;
+  --motion-origin-rotate: 0;
+  --motion-origin-blur: 0;
+  --motion-origin-grayscale: 0;
+  --motion-origin-opacity: 1;
+  --motion-origin-background-color: ;
+  --motion-origin-text-color: ;
+  --motion-end-scale-x: 1;
+  --motion-end-scale-y: 1;
+  --motion-end-translate-x: 0;
+  --motion-end-translate-y: 0;
+  --motion-end-rotate: 0;
+  --motion-end-blur: 0;
+  --motion-end-grayscale: 0;
+  --motion-end-opacity: 1;
+  --motion-end-background-color: ;
+  --motion-end-text-color: ;
+  --motion-duration: 750ms;
+  --motion-timing: var(--motion-default-timing);
+  --motion-perceptual-duration-multiplier: 1;
+  --motion-delay: 0ms;
+  --motion-scale-duration: var(--motion-duration);
+  --motion-scale-timing: var(--motion-timing);
+  --motion-scale-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-scale-delay: var(--motion-delay);
+  --motion-translate-duration: var(--motion-duration);
+  --motion-translate-timing: var(--motion-timing);
+  --motion-translate-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-translate-delay: var(--motion-delay);
+  --motion-rotate-duration: var(--motion-duration);
+  --motion-rotate-timing: var(--motion-timing);
+  --motion-rotate-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-rotate-delay: var(--motion-delay);
+  --motion-filter-duration: var(--motion-duration);
+  --motion-filter-timing: var(--motion-timing);
+  --motion-filter-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-filter-delay: var(--motion-delay);
+  --motion-opacity-duration: var(--motion-duration);
+  --motion-opacity-timing: var(--motion-timing);
+  --motion-opacity-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-opacity-delay: var(--motion-delay);
+  --motion-background-color-duration: var(--motion-duration);
+  --motion-background-color-timing: var(--motion-timing);
+  --motion-background-color-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-background-color-delay: var(--motion-delay);
+  --motion-text-color-duration: var(--motion-duration);
+  --motion-text-color-timing: var(--motion-timing);
+  --motion-text-color-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-text-color-delay: var(--motion-delay);
+  --motion-scale-in-animation: none;
+  --motion-translate-in-animation: none;
+  --motion-rotate-in-animation: none;
+  --motion-filter-in-animation: none;
+  --motion-opacity-in-animation: none;
+  --motion-background-color-in-animation: none;
+  --motion-text-color-in-animation: none;
+  --motion-scale-out-animation: none;
+  --motion-translate-out-animation: none;
+  --motion-rotate-out-animation: none;
+  --motion-filter-out-animation: none;
+  --motion-opacity-out-animation: none;
+  --motion-background-color-out-animation: none;
+  --motion-text-color-out-animation: none;
+  --motion-all-enter-animations: var(--motion-scale-in-animation), var(--motion-translate-in-animation), var(--motion-rotate-in-animation), var(--motion-filter-in-animation), var(--motion-opacity-in-animation), var(--motion-background-color-in-animation), var(--motion-text-color-in-animation);
+  --motion-all-exit-animations: var(--motion-scale-out-animation), var(--motion-translate-out-animation), var(--motion-rotate-out-animation), var(--motion-filter-out-animation), var(--motion-opacity-out-animation), var(--motion-background-color-out-animation), var(--motion-text-color-out-animation);
 }
 
 ::backdrop{
@@ -108,6 +176,74 @@
   --tw-contain-layout:  ;
   --tw-contain-paint:  ;
   --tw-contain-style:  ;
+  --motion-origin-scale-x: 1;
+  --motion-origin-scale-y: 1;
+  --motion-origin-translate-x: 0;
+  --motion-origin-translate-y: 0;
+  --motion-origin-rotate: 0;
+  --motion-origin-blur: 0;
+  --motion-origin-grayscale: 0;
+  --motion-origin-opacity: 1;
+  --motion-origin-background-color: ;
+  --motion-origin-text-color: ;
+  --motion-end-scale-x: 1;
+  --motion-end-scale-y: 1;
+  --motion-end-translate-x: 0;
+  --motion-end-translate-y: 0;
+  --motion-end-rotate: 0;
+  --motion-end-blur: 0;
+  --motion-end-grayscale: 0;
+  --motion-end-opacity: 1;
+  --motion-end-background-color: ;
+  --motion-end-text-color: ;
+  --motion-duration: 750ms;
+  --motion-timing: var(--motion-default-timing);
+  --motion-perceptual-duration-multiplier: 1;
+  --motion-delay: 0ms;
+  --motion-scale-duration: var(--motion-duration);
+  --motion-scale-timing: var(--motion-timing);
+  --motion-scale-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-scale-delay: var(--motion-delay);
+  --motion-translate-duration: var(--motion-duration);
+  --motion-translate-timing: var(--motion-timing);
+  --motion-translate-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-translate-delay: var(--motion-delay);
+  --motion-rotate-duration: var(--motion-duration);
+  --motion-rotate-timing: var(--motion-timing);
+  --motion-rotate-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-rotate-delay: var(--motion-delay);
+  --motion-filter-duration: var(--motion-duration);
+  --motion-filter-timing: var(--motion-timing);
+  --motion-filter-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-filter-delay: var(--motion-delay);
+  --motion-opacity-duration: var(--motion-duration);
+  --motion-opacity-timing: var(--motion-timing);
+  --motion-opacity-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-opacity-delay: var(--motion-delay);
+  --motion-background-color-duration: var(--motion-duration);
+  --motion-background-color-timing: var(--motion-timing);
+  --motion-background-color-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-background-color-delay: var(--motion-delay);
+  --motion-text-color-duration: var(--motion-duration);
+  --motion-text-color-timing: var(--motion-timing);
+  --motion-text-color-perceptual-duration-multiplier: var(--motion-perceptual-duration-multiplier);
+  --motion-text-color-delay: var(--motion-delay);
+  --motion-scale-in-animation: none;
+  --motion-translate-in-animation: none;
+  --motion-rotate-in-animation: none;
+  --motion-filter-in-animation: none;
+  --motion-opacity-in-animation: none;
+  --motion-background-color-in-animation: none;
+  --motion-text-color-in-animation: none;
+  --motion-scale-out-animation: none;
+  --motion-translate-out-animation: none;
+  --motion-rotate-out-animation: none;
+  --motion-filter-out-animation: none;
+  --motion-opacity-out-animation: none;
+  --motion-background-color-out-animation: none;
+  --motion-text-color-out-animation: none;
+  --motion-all-enter-animations: var(--motion-scale-in-animation), var(--motion-translate-in-animation), var(--motion-rotate-in-animation), var(--motion-filter-in-animation), var(--motion-opacity-in-animation), var(--motion-background-color-in-animation), var(--motion-text-color-in-animation);
+  --motion-all-exit-animations: var(--motion-scale-out-animation), var(--motion-translate-out-animation), var(--motion-rotate-out-animation), var(--motion-filter-out-animation), var(--motion-opacity-out-animation), var(--motion-background-color-out-animation), var(--motion-text-color-out-animation);
 }
 
 /* ! tailwindcss v3.4.13 | MIT License | https://tailwindcss.com */
@@ -751,6 +887,87 @@ select{
   outline: 1px auto -webkit-focus-ring-color;
 }
 
+:root{
+  --motion-default-timing: cubic-bezier(.165, .84, .44, 1);
+  --motion-bounce: linear(0, 0.004, 0.016, 0.035, 0.063, 0.098, 0.141 13.6%, 0.25, 0.391, 0.563, 0.765,1, 0.891 40.9%, 0.848, 0.813, 0.785, 0.766, 0.754, 0.75, 0.754, 0.766, 0.785,0.813, 0.848, 0.891 68.2%, 1 72.7%, 0.973, 0.953, 0.941, 0.938, 0.941, 0.953,0.973, 1, 0.988, 0.984, 0.988, 1);
+  --motion-spring-smooth: linear(0, 0.001 0.44%, 0.0045 0.94%, 0.0195 2.03%, 0.0446 3.19%, 0.0811 4.5%, 0.1598 6.82%, 0.3685 12.34%, 0.4693 15.17%, 0.5663, 0.6498 21.27%, 0.7215 24.39%, 0.7532 25.98%, 0.7829 27.65%, 0.8105, 0.8349 31.14%, 0.8573 32.95%, 0.8776 34.84%, 0.8964 36.87%, 0.9136 39.05%, 0.929 41.37%, 0.9421 43.77%, 0.9537 46.38%, 0.9636 49.14%, 0.9789 55.31%, 0.9888 62.35%, 0.9949 71.06%, 0.9982 82.52%, 0.9997 99.94%);
+  --motion-spring-snappy: linear(0, 0.0014, 0.0053 1.02%, 0.0126, 0.0227 2.18%, 0.0517 3.41%, 0.094 4.79%, 0.1865 7.26%, 0.4182 12.77%, 0.5246 15.46%, 0.6249, 0.7112, 0.7831 23.95%, 0.8146 25.4%, 0.844, 0.8699 28.45%, 0.8935, 0.9139 31.64%, 0.932, 0.9473, 0.9601 36.65%, 0.9714 38.47%, 0.9808 40.35%, 0.9948 44.49%, 1.0031 49.43%, 1.0057 53.35%, 1.0063 58.14%, 1.0014 80.78%, 1.0001 99.94%);
+  --motion-spring-bouncy: linear(0, 0.0018, 0.0069, 0.0151 1.74%, 0.0277 2.4%, 0.062 3.7%, 0.1115 5.15%, 0.2211 7.77%, 0.4778 13.21%, 0.5912 15.75%, 0.6987 18.44%, 0.7862 20.98%, 0.861 23.59%, 0.8926, 0.9205, 0.945 27.51%, 0.9671 28.89%, 0.9868, 1.003 31.79%, 1.0224 34.11%, 1.0358 36.58%, 1.0436 39.27%, 1.046 42.31%, 1.0446 44.71%, 1.0406 47.47%, 1.0118 61.84%, 1.0027 69.53%, 0.9981 80.49%, 0.9991 99.94%);
+  --motion-spring-bouncier: linear(0, 0.0023, 0.0088, 0.0194 1.59%, 0.035 2.17%, 0.078 3.33%, 0.1415 4.64%, 0.2054 5.75%, 0.2821 6.95%, 0.5912 11.45%, 0.7205 13.43%, 0.8393 15.45%, 0.936 17.39%, 0.9778, 1.015, 1.0477, 1.0759, 1.0998 22.22%, 1.1203, 1.1364, 1.1484 25.26%, 1.1586 26.61%, 1.1629 28.06%, 1.1613 29.56%, 1.1537 31.2%, 1.1434 32.6%, 1.1288 34.19%, 1.0508 41.29%, 1.0174 44.87%, 1.0025 46.89%, 0.9911 48.87%, 0.9826 50.9%, 0.9769 53.03%, 0.9735 56.02%, 0.9748 59.45%, 0.9964 72.64%, 1.0031 79.69%, 1.0042 86.83%, 1.0008 99.97%);
+  --motion-spring-bounciest: linear(0, 0.0032, 0.0131, 0.0294, 0.0524, 0.0824, 0.1192 1.54%, 0.2134 2.11%, 0.3102 2.59%, 0.4297 3.13%, 0.8732 4.95%, 1.0373, 1.1827 6.36%, 1.2972 7.01%, 1.3444, 1.3859, 1.4215, 1.4504, 1.4735, 1.4908, 1.5024, 1.5084 9.5%, 1.5091, 1.5061, 1.4993, 1.4886, 1.4745, 1.4565 11.11%, 1.4082 11.7%, 1.3585 12.2%, 1.295 12.77%, 1.0623 14.64%, 0.9773, 0.9031 16.08%, 0.8449 16.73%, 0.8014, 0.7701 17.95%, 0.7587, 0.7501, 0.7443, 0.7412 19.16%, 0.7421 19.68%, 0.7508 20.21%, 0.7672 20.77%, 0.7917 21.37%, 0.8169 21.87%, 0.8492 22.43%, 0.9681 24.32%, 1.0114, 1.0492 25.75%, 1.0789 26.41%, 1.1008, 1.1167, 1.1271, 1.1317 28.81%, 1.1314, 1.1271 29.87%, 1.1189 30.43%, 1.1063 31.03%, 1.0769 32.11%, 0.9941 34.72%, 0.9748 35.43%, 0.9597 36.09%, 0.9487, 0.9407, 0.9355, 0.933 38.46%, 0.9344 39.38%, 0.9421 40.38%, 0.9566 41.5%, 0.9989 44.12%, 1.0161 45.37%, 1.029 46.75%, 1.0341 48.1%, 1.0335 49.04%, 1.0295 50.05%, 1.0221 51.18%, 0.992 55.02%, 0.9854 56.38%, 0.9827 57.72%, 0.985 59.73%, 1.004 64.67%, 1.0088 67.34%, 1.0076 69.42%, 0.9981 74.28%, 0.9956 76.85%, 0.9961 79.06%, 1.0023 86.46%, 0.999 95.22%, 0.9994 100%);
+}
+
+.motion-preset-slide-up{
+  --motion-origin-translate-y: 25%;
+  --motion-origin-opacity: 0;
+  --motion-opacity-in-animation: motion-opacity-in calc(var(--motion-opacity-duration) * var(--motion-opacity-perceptual-duration-multiplier)) var(--motion-opacity-timing) var(--motion-opacity-delay) both;
+  --motion-translate-in-animation: motion-translate-in calc(var(--motion-translate-duration) * var(--motion-translate-perceptual-duration-multiplier)) var(--motion-translate-timing) var(--motion-translate-delay) both;
+  animation: var(--motion-all-enter-animations);
+}
+
+@keyframes RomboConfettiPop{
+  0%{
+    opacity: 0;
+    transform: scale(1);
+  }
+
+  33%{
+    opacity: 1;
+    transform: scale(1.15);
+  }
+
+  50%{
+    transform: scale(0.975);
+  }
+
+  65%{
+    transform: scale(1.025);
+  }
+
+  80%{
+    transform: scale(0.99);
+  }
+
+  87%{
+    transform: scale(1.01);
+  }
+
+  100%{
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes topfetti{
+  0%{
+    background-position: 5% 90%, 10% 90%, 10% 90%, 15% 90%, 25% 90%, 25% 90%, 40% 90%, 55% 90%, 70% 90%;
+  }
+
+  50%{
+    background-position: 0% 80%, 0% 20%, 10% 40%, 20% 0%, 30% 30%, 22% 50%, 50% 50%, 65% 20%, 90% 30%;
+  }
+
+  100%{
+    background-position: 0% 70%, 0% 10%, 10% 30%, 20% -10%, 30% 20%, 22% 40%, 50% 40%, 65% 10%, 90% 20%;
+    background-size: 0% 0%, 0% 0%, 0% 0%, 0% 0%, 0% 0%, 0% 0%;
+  }
+}
+
+@keyframes bottomfetti{
+  0%{
+    background-position: 10% -10%, 30% 10%, 55% -10%, 70% -10%, 85% -10%,70% -10%, 70% 0%;
+  }
+
+  50%{
+    background-position: 0% 80%, 20% 80%, 45% 60%, 60% 100%, 75% 70%, 95% 60%, 105% 0%;
+  }
+
+  100%{
+    background-position: 0% 90%, 20% 90%, 45% 70%, 60% 110%, 75% 80%, 95% 70%, 110% 10%;
+    background-size: 0% 0%, 0% 0%, 0% 0%, 0% 0%, 0% 0%, 0% 0%;
+  }
+}
+
 .fixed{
   position: fixed;
 }
@@ -779,10 +996,6 @@ select{
   left: 50%;
 }
 
-.left-full{
-  left: 100%;
-}
-
 .right-0{
   right: 0px;
 }
@@ -850,10 +1063,6 @@ select{
   margin-right: auto;
 }
 
-.-mr-20{
-  margin-right: -5rem;
-}
-
 .mb-1{
   margin-bottom: 0.25rem;
 }
@@ -950,10 +1159,6 @@ select{
   display: block;
 }
 
-.inline-block{
-  display: inline-block;
-}
-
 .flex{
   display: flex;
 }
@@ -962,18 +1167,10 @@ select{
   display: inline-flex;
 }
 
-.table{
-  display: table;
-}
-
 .grid{
   display: grid;
 }
 
-.inline-grid{
-  display: inline-grid;
-}
-
 .hidden{
   display: none;
 }
@@ -1046,10 +1243,6 @@ select{
   width: 0px;
 }
 
-.w-1\/2{
-  width: 50%;
-}
-
 .w-1\/3{
   width: 33.333333%;
 }
@@ -1119,10 +1312,6 @@ select{
   width: 100vw;
 }
 
-.min-w-full{
-  min-width: 100%;
-}
-
 .max-w-2xl{
   max-width: 42rem;
 }
@@ -1208,11 +1397,6 @@ select{
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-.-translate-x-\[70\%\]{
-  --tw-translate-x: -70%;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
 .-translate-x-px{
   --tw-translate-x: -1px;
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
@@ -1273,11 +1457,6 @@ select{
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-.translate-y-px{
-  --tw-translate-y: 1px;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
 .rotate-1{
   --tw-rotate: 1deg;
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
@@ -1335,20 +1514,10 @@ select{
   cursor: pointer;
 }
 
-.select-none{
-  -webkit-user-select: none;
-     -moz-user-select: none;
-          user-select: none;
-}
-
 .grid-cols-2{
   grid-template-columns: repeat(2, minmax(0, 1fr));
 }
 
-.grid-cols-3{
-  grid-template-columns: repeat(3, minmax(0, 1fr));
-}
-
 .flex-row{
   flex-direction: row;
 }
@@ -1464,12 +1633,6 @@ select{
   margin-bottom: calc(0.5rem * var(--tw-space-y-reverse));
 }
 
-.space-y-3 > :not([hidden]) ~ :not([hidden]){
-  --tw-space-y-reverse: 0;
-  margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
-  margin-bottom: calc(0.75rem * var(--tw-space-y-reverse));
-}
-
 .space-y-4 > :not([hidden]) ~ :not([hidden]){
   --tw-space-y-reverse: 0;
   margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse)));
@@ -1482,29 +1645,10 @@ select{
   margin-bottom: calc(1.5rem * var(--tw-space-y-reverse));
 }
 
-.divide-y > :not([hidden]) ~ :not([hidden]){
-  --tw-divide-y-reverse: 0;
-  border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
-  border-bottom-width: calc(1px * var(--tw-divide-y-reverse));
-}
-
-.divide-neutral-200 > :not([hidden]) ~ :not([hidden]){
-  --tw-divide-opacity: 1;
-  border-color: rgb(229 229 229 / var(--tw-divide-opacity));
-}
-
 .overflow-hidden{
   overflow: hidden;
 }
 
-.overflow-x-auto{
-  overflow-x: auto;
-}
-
-.whitespace-nowrap{
-  white-space: nowrap;
-}
-
 .rounded{
   border-radius: 0.25rem;
 }
@@ -1551,15 +1695,6 @@ select{
   border-color: rgb(37 99 235 / var(--tw-border-opacity));
 }
 
-.border-gray-100{
-  --tw-border-opacity: 1;
-  border-color: rgb(243 244 246 / var(--tw-border-opacity));
-}
-
-.border-gray-200\/70{
-  border-color: rgb(229 231 235 / 0.7);
-}
-
 .border-green-600{
   --tw-border-opacity: 1;
   border-color: rgb(22 163 74 / var(--tw-border-opacity));
@@ -1612,6 +1747,11 @@ select{
   border-color: rgb(228 228 231 / var(--tw-border-opacity));
 }
 
+.border-zinc-300{
+  --tw-border-opacity: 1;
+  border-color: rgb(212 212 216 / var(--tw-border-opacity));
+}
+
 .bg-blue-50{
   --tw-bg-opacity: 1;
   background-color: rgb(239 246 255 / var(--tw-bg-opacity));
@@ -1622,26 +1762,11 @@ select{
   background-color: rgb(37 99 235 / var(--tw-bg-opacity));
 }
 
-.bg-gray-100{
-  --tw-bg-opacity: 1;
-  background-color: rgb(243 244 246 / var(--tw-bg-opacity));
-}
-
-.bg-gray-900{
-  --tw-bg-opacity: 1;
-  background-color: rgb(17 24 39 / var(--tw-bg-opacity));
-}
-
 .bg-green-50{
   --tw-bg-opacity: 1;
   background-color: rgb(240 253 244 / var(--tw-bg-opacity));
 }
 
-.bg-green-500{
-  --tw-bg-opacity: 1;
-  background-color: rgb(34 197 94 / var(--tw-bg-opacity));
-}
-
 .bg-green-600{
   --tw-bg-opacity: 1;
   background-color: rgb(22 163 74 / var(--tw-bg-opacity));
@@ -1686,11 +1811,6 @@ select{
   background-color: rgb(254 252 232 / var(--tw-bg-opacity));
 }
 
-.bg-yellow-500{
-  --tw-bg-opacity: 1;
-  background-color: rgb(234 179 8 / var(--tw-bg-opacity));
-}
-
 .bg-yellow-600{
   --tw-bg-opacity: 1;
   background-color: rgb(202 138 4 / var(--tw-bg-opacity));
@@ -1884,11 +2004,6 @@ select{
   padding-bottom: 0.5rem;
 }
 
-.py-3{
-  padding-top: 0.75rem;
-  padding-bottom: 0.75rem;
-}
-
 .py-4{
   padding-top: 1rem;
   padding-bottom: 1rem;
@@ -1986,10 +2101,6 @@ select{
   text-align: center;
 }
 
-.text-right{
-  text-align: right;
-}
-
 .align-top{
   vertical-align: top;
 }
@@ -2134,16 +2245,6 @@ select{
   color: rgb(75 85 99 / var(--tw-text-opacity));
 }
 
-.text-gray-700{
-  --tw-text-opacity: 1;
-  color: rgb(55 65 81 / var(--tw-text-opacity));
-}
-
-.text-gray-900{
-  --tw-text-opacity: 1;
-  color: rgb(17 24 39 / var(--tw-text-opacity));
-}
-
 .text-green-500{
   --tw-text-opacity: 1;
   color: rgb(34 197 94 / var(--tw-text-opacity));
@@ -2268,10 +2369,6 @@ select{
   opacity: 1;
 }
 
-.opacity-50{
-  opacity: 0.5;
-}
-
 .opacity-60{
   opacity: 0.6;
 }
@@ -2336,12 +2433,6 @@ select{
   transition-duration: 150ms;
 }
 
-.transition-all{
-  transition-property: all;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 150ms;
-}
-
 .transition-colors{
   transition-property: color, background-color, border-color, text-decoration-color, fill, stroke;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
@@ -2380,6 +2471,124 @@ select{
   transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
 }
 
+@media screen and (prefers-reduced-motion: no-preference){
+  @keyframes motion-scale-in{
+    0%{
+      scale: var(--motion-origin-scale-x) var(--motion-origin-scale-y);
+    }
+
+    100%{
+      scale: 1 1;
+    }
+  }
+
+  @keyframes motion-scale-out{
+    0%{
+      scale: 1 1;
+    }
+
+    100%{
+      scale: var(--motion-end-scale-x) var(--motion-end-scale-y);
+    }
+  }
+
+  @keyframes motion-translate-in{
+    0%{
+      translate: var(--motion-origin-translate-x) var(--motion-origin-translate-y);
+    }
+
+    100%{
+      translate: 0 0;
+    }
+  }
+
+  @keyframes motion-translate-out{
+    0%{
+      translate: 0 0;
+    }
+
+    100%{
+      translate: var(--motion-end-translate-x) var(--motion-end-translate-y);
+    }
+  }
+
+  @keyframes motion-rotate-in{
+    0%{
+      rotate: var(--motion-origin-rotate);
+    }
+
+    100%{
+      rotate: 0;
+    }
+  }
+
+  @keyframes motion-rotate-out{
+    0%{
+      rotate: 0;
+    }
+
+    100%{
+      rotate: var(--motion-end-rotate);
+    }
+  }
+}
+
+@keyframes motion-filter-in{
+  0%{
+    filter: blur(var(--motion-origin-blur)) grayscale(var(--motion-origin-grayscale));
+  }
+
+  100%{
+    filter: blur(0) grayscale(0);
+  }
+}
+
+@keyframes motion-filter-out{
+  0%{
+    filter: blur(0) grayscale(0);
+  }
+
+  100%{
+    filter: blur(var(--motion-end-blur)) grayscale(var(--motion-end-grayscale));
+  }
+}
+
+@keyframes motion-opacity-in{
+  0%{
+    opacity: var(--motion-origin-opacity);
+  }
+}
+
+@keyframes motion-opacity-out{
+  100%{
+    opacity: var(--motion-end-opacity);
+  }
+}
+
+@keyframes motion-background-color-in{
+  0%{
+    background-color: var(--motion-origin-background-color);
+  }
+}
+
+@keyframes motion-background-color-out{
+  100%{
+    background-color: var(--motion-end-background-color);
+  }
+}
+
+@keyframes motion-text-color-in{
+  0%{
+    color: var(--motion-origin-text-color);
+  }
+}
+
+@keyframes motion-text-color-out{
+  100%{
+    color: var(--motion-end-text-color);
+  }
+}
+
 .\[animation-delay\:-7\.5s\]{
   animation-delay: -7.5s;
 }
@@ -2675,16 +2884,6 @@ input[type="search"]::-webkit-search-results-decoration {
   /* Firefox */
 }
 
-.placeholder\:text-neutral-400::-moz-placeholder{
-  --tw-text-opacity: 1;
-  color: rgb(163 163 163 / var(--tw-text-opacity));
-}
-
-.placeholder\:text-neutral-400::placeholder{
-  --tw-text-opacity: 1;
-  color: rgb(163 163 163 / var(--tw-text-opacity));
-}
-
 .placeholder\:text-neutral-500::-moz-placeholder{
   --tw-text-opacity: 1;
   color: rgb(115 115 115 / var(--tw-text-opacity));
@@ -2695,6 +2894,16 @@ input[type="search"]::-webkit-search-results-decoration {
   color: rgb(115 115 115 / var(--tw-text-opacity));
 }
 
+.placeholder\:text-zinc-400::-moz-placeholder{
+  --tw-text-opacity: 1;
+  color: rgb(161 161 170 / var(--tw-text-opacity));
+}
+
+.placeholder\:text-zinc-400::placeholder{
+  --tw-text-opacity: 1;
+  color: rgb(161 161 170 / var(--tw-text-opacity));
+}
+
 .before\:pointer-events-none::before{
   content: var(--tw-content);
   pointer-events: none;
@@ -2898,11 +3107,6 @@ input[type="search"]::-webkit-search-results-decoration {
   background-color: rgb(29 78 216 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-gray-50:hover{
-  --tw-bg-opacity: 1;
-  background-color: rgb(249 250 251 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-green-100:hover{
   --tw-bg-opacity: 1;
   background-color: rgb(220 252 231 / var(--tw-bg-opacity));
@@ -2963,6 +3167,11 @@ input[type="search"]::-webkit-search-results-decoration {
   background-color: rgb(161 98 7 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-zinc-50:hover{
+  --tw-bg-opacity: 1;
+  background-color: rgb(250 250 250 / var(--tw-bg-opacity));
+}
+
 .hover\:bg-zinc-800:hover{
   --tw-bg-opacity: 1;
   background-color: rgb(39 39 42 / var(--tw-bg-opacity));
@@ -2973,16 +3182,6 @@ input[type="search"]::-webkit-search-results-decoration {
   color: rgb(37 99 235 / var(--tw-text-opacity));
 }
 
-.hover\:text-blue-700:hover{
-  --tw-text-opacity: 1;
-  color: rgb(29 78 216 / var(--tw-text-opacity));
-}
-
-.hover\:text-gray-800:hover{
-  --tw-text-opacity: 1;
-  color: rgb(31 41 55 / var(--tw-text-opacity));
-}
-
 .hover\:text-green-600:hover{
   --tw-text-opacity: 1;
   color: rgb(22 163 74 / var(--tw-text-opacity));
@@ -3023,6 +3222,11 @@ input[type="search"]::-webkit-search-results-decoration {
   color: rgb(212 212 216 / var(--tw-text-opacity));
 }
 
+.hover\:text-zinc-800:hover{
+  --tw-text-opacity: 1;
+  color: rgb(39 39 42 / var(--tw-text-opacity));
+}
+
 .hover\:text-zinc-900:hover{
   --tw-text-opacity: 1;
   color: rgb(24 24 27 / var(--tw-text-opacity));
@@ -3041,6 +3245,11 @@ input[type="search"]::-webkit-search-results-decoration {
   border-color: rgb(212 212 212 / var(--tw-border-opacity));
 }
 
+.focus\:border-zinc-300:focus{
+  --tw-border-opacity: 1;
+  border-color: rgb(212 212 216 / var(--tw-border-opacity));
+}
+
 .focus\:bg-white:focus{
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -3071,11 +3280,6 @@ input[type="search"]::-webkit-search-results-decoration {
   --tw-ring-color: rgb(29 78 216 / var(--tw-ring-opacity));
 }
 
-.focus\:ring-gray-700:focus{
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(55 65 81 / var(--tw-ring-opacity));
-}
-
 .focus\:ring-green-100:focus{
   --tw-ring-opacity: 1;
   --tw-ring-color: rgb(220 252 231 / var(--tw-ring-opacity));
@@ -3209,12 +3413,6 @@ input[type="search"]::-webkit-search-results-decoration {
   }
 }
 
-@media not all and (min-width: 768px){
-  .max-md\:w-\[45\%\]{
-    width: 45%;
-  }
-}
-
 @media not all and (min-width: 640px){
   .max-sm\:order-1{
     order: 1;
@@ -3530,32 +3728,11 @@ input[type="search"]::-webkit-search-results-decoration {
   }
 }
 
-.\[\&\:has\(svg\)\]\:pl-11:has(svg){
-  padding-left: 2.75rem;
-}
-
 .\[\&\>div\]\:mx-3>div{
   margin-left: 0.75rem;
   margin-right: 0.75rem;
 }
 
-.\[\&\>svg\+div\]\:translate-y-\[-3px\]>svg+div{
-  --tw-translate-y: -3px;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
-.\[\&\>svg\]\:absolute>svg{
-  position: absolute;
-}
-
-.\[\&\>svg\]\:left-4>svg{
-  left: 1rem;
-}
-
-.\[\&\>svg\]\:top-4>svg{
-  top: 1rem;
-}
-
 .\[\&_\.active-breadcrumb\]\:font-medium .active-breadcrumb{
   font-weight: 500;
 }

pkg/nebula/components/blocks/alert.templ

@@ -1,67 +0,0 @@
-package blocks
-
-func Alert(variant Variant, icon Icon, title, message string) templ.Component {
-	return alertElement(variant.Attributes(), title, message, icon.Render())
-}
-
-templ alertElement(attrs templ.Attributes, title, message string, icon templ.Component) {
-	<div { attrs... }>
-		@icon
-		<h5 class="mb-1 font-medium leading-none tracking-tight">{ title }</h5>
-		<div class="text-sm opacity-70">{ message }</div>
-	</div>
-}
-
-type AlertVariant int
-
-const (
-	AlertVariant_Default AlertVariant = iota
-	AlertVariant_Info
-	AlertVariant_Error
-	AlertVariant_Success
-	AlertVariant_Warning
-	AlertVariant_Subtle_Info
-	AlertVariant_Subtle_Error
-	AlertVariant_Subtle_Success
-	AlertVariant_Subtle_Warning
-)
-
-func (v AlertVariant) Attributes() templ.Attributes {
-	switch v {
-	case AlertVariant_Info:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-blue-600 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Error:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-red-600 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Success:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-green-500 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Warning:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-yellow-500 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Subtle_Info:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-blue-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-blue-600",
-		}
-	case AlertVariant_Subtle_Error:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-red-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-red-600",
-		}
-	case AlertVariant_Subtle_Success:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-green-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-green-600",
-		}
-	case AlertVariant_Subtle_Warning:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-yellow-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-yellow-600",
-		}
-	}
-	return templ.Attributes{
-		"class": "relative w-full rounded-lg border bg-white p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-neutral-900",
-	}
-}

pkg/nebula/components/blocks/alert_templ.go

@@ -1,140 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.778
-package blocks
-
-//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"
-
-func Alert(variant Variant, icon Icon, title, message string) templ.Component {
-	return alertElement(variant.Attributes(), title, message, icon.Render())
-}
-
-func alertElement(attrs templ.Attributes, title, message string, icon templ.Component) 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("<div")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderAttributes(ctx, templ_7745c5c3_Buffer, attrs)
-		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 = icon.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<h5 class=\"mb-1 font-medium leading-none tracking-tight\">")
-		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: `pkg/nebula/components/blocks/alert.templ`, Line: 10, Col: 66}
-		}
-		_, 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("</h5><div class=\"text-sm opacity-70\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(message)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/blocks/alert.templ`, Line: 11, Col: 43}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-type AlertVariant int
-
-const (
-	AlertVariant_Default AlertVariant = iota
-	AlertVariant_Info
-	AlertVariant_Error
-	AlertVariant_Success
-	AlertVariant_Warning
-	AlertVariant_Subtle_Info
-	AlertVariant_Subtle_Error
-	AlertVariant_Subtle_Success
-	AlertVariant_Subtle_Warning
-)
-
-func (v AlertVariant) Attributes() templ.Attributes {
-	switch v {
-	case AlertVariant_Info:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-blue-600 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Error:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-red-600 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Success:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-green-500 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Warning:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-yellow-500 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-white",
-		}
-	case AlertVariant_Subtle_Info:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-blue-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-blue-600",
-		}
-	case AlertVariant_Subtle_Error:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-red-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-red-600",
-		}
-	case AlertVariant_Subtle_Success:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-green-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-green-600",
-		}
-	case AlertVariant_Subtle_Warning:
-		return templ.Attributes{
-			"class": "relative w-full rounded-lg border border-transparent bg-yellow-50 p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-yellow-600",
-		}
-	}
-	return templ.Attributes{
-		"class": "relative w-full rounded-lg border bg-white p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11 text-neutral-900",
-	}
-}
-
-var _ = templruntime.GeneratedTemplate

pkg/nebula/components/blocks/inputs.templ

@@ -1,29 +0,0 @@
-package blocks
-
-type InputState int
-
-const (
-	InputStateDefault InputState = iota
-	InputStateError
-	InputStateSuccess
-)
-
-templ TextInput(state InputState, label string, placeholder string) {
-	switch (state) {
-		case InputStateDefault:
-			<div class="flex flex-col space-y-1.5 p-6">
-				<label class="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="name">{ label }</label>
-				<input type="text" placeholder="{label}" id="name" value="{value}" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-neutral-300 ring-offset-background placeholder:text-neutral-400 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/>
-			</div>
-		case InputStateError:
-			<div class="flex flex-col space-y-1.5 p-6">
-				<label class="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="name">{ label }</label>
-				<input type="text" placeholder="{label}" id="name" value="{value}" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-neutral-300 ring-offset-background placeholder:text-neutral-400 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/>
-			</div>
-		case InputStateSuccess:
-			<div class="flex flex-col space-y-1.5 p-6">
-				<label class="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="name">{ label }</label>
-				<input type="text" placeholder="{label}" id="name" value="{value}" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-neutral-300 ring-offset-background placeholder:text-neutral-400 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/>
-			</div>
-	}
-}

pkg/nebula/components/blocks/inputs_templ.go

@@ -1,100 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.778
-package blocks
-
-//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"
-
-type InputState int
-
-const (
-	InputStateDefault InputState = iota
-	InputStateError
-	InputStateSuccess
-)
-
-func TextInput(state InputState, label string, placeholder 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)
-		switch state {
-		case InputStateDefault:
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"flex flex-col space-y-1.5 p-6\"><label class=\"text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70\" for=\"name\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var2 string
-			templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(label)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/blocks/inputs.templ`, Line: 15, Col: 128}
-			}
-			_, 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("</label> <input type=\"text\" placeholder=\"{label}\" id=\"name\" value=\"{value}\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-neutral-300 ring-offset-background placeholder:text-neutral-400 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		case InputStateError:
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"flex flex-col space-y-1.5 p-6\"><label class=\"text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70\" for=\"name\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var3 string
-			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(label)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/blocks/inputs.templ`, Line: 20, Col: 128}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label> <input type=\"text\" placeholder=\"{label}\" id=\"name\" value=\"{value}\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-neutral-300 ring-offset-background placeholder:text-neutral-400 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		case InputStateSuccess:
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"flex flex-col space-y-1.5 p-6\"><label class=\"text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70\" for=\"name\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var4 string
-			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(label)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/blocks/inputs.templ`, Line: 25, Col: 128}
-			}
-			_, 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("</label> <input type=\"text\" placeholder=\"{label}\" id=\"name\" value=\"{value}\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-neutral-300 ring-offset-background placeholder:text-neutral-400 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

pkg/nebula/components/blocks/radios.templ

@@ -1,37 +0,0 @@
-package blocks
-
-templ RadioGroup() {
-	<div
-		x-data="{
-    radioGroupSelectedValue: null,
-    radioGroupOptions: [
-        {
-            title: 'Email Address',
-            description: 'Get a login code to your email address.',
-            value: 'email'
-        },
-        {
-            title: 'Phone Number',
-            description: 'Get a login code to your phone number.',
-            value: 'phone'
-        },
-        {
-            title: 'Passkey',
-            description: 'Sign in with your passkey.',
-            value: 'passkey'
-        }
-    ]
-}"
-		class="space-y-3"
-	>
-		<template x-for="(option, index) in radioGroupOptions" :key="index">
-			<label @click="radioGroupSelectedValue=option.value" class="flex items-start p-5 space-x-3 bg-white border rounded-md shadow-sm hover:bg-gray-50 border-neutral-200/70">
-				<input type="radio" name="radio-group" :value="option.value" class="text-gray-900 translate-y-px focus:ring-gray-700"/>
-				<span class="relative flex flex-col text-left space-y-1.5 leading-none">
-					<span x-text="option.title" class="font-semibold"></span>
-					<span x-text="option.description" class="text-sm opacity-50"></span>
-				</span>
-			</label>
-		</template>
-	</div>
-}

pkg/nebula/components/blocks/radios_templ.go

@@ -1,40 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.778
-package blocks
-
-//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"
-
-func RadioGroup() 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("<div x-data=\"{\n    radioGroupSelectedValue: null,\n    radioGroupOptions: [\n        {\n            title: &#39;Email Address&#39;,\n            description: &#39;Get a login code to your email address.&#39;,\n            value: &#39;email&#39;\n        },\n        {\n            title: &#39;Phone Number&#39;,\n            description: &#39;Get a login code to your phone number.&#39;,\n            value: &#39;phone&#39;\n        },\n        {\n            title: &#39;Passkey&#39;,\n            description: &#39;Sign in with your passkey.&#39;,\n            value: &#39;passkey&#39;\n        }\n    ]\n}\" class=\"space-y-3\"><template x-for=\"(option, index) in radioGroupOptions\" :key=\"index\"><label @click=\"radioGroupSelectedValue=option.value\" class=\"flex items-start p-5 space-x-3 bg-white border rounded-md shadow-sm hover:bg-gray-50 border-neutral-200/70\"><input type=\"radio\" name=\"radio-group\" :value=\"option.value\" class=\"text-gray-900 translate-y-px focus:ring-gray-700\"> <span class=\"relative flex flex-col text-left space-y-1.5 leading-none\"><span x-text=\"option.title\" class=\"font-semibold\"></span> <span x-text=\"option.description\" class=\"text-sm opacity-50\"></span></span></label></template></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

pkg/nebula/components/blocks/tabs.templ

@@ -1,109 +0,0 @@
-package blocks
-
-templ Tabs() {
-	<div
-		x-data="{
-        tabSelected: 1,
-        tabId: $id('tabs'),
-        tabButtonClicked(tabButton){
-            this.tabSelected = tabButton.id.replace(this.tabId + '-', '');
-            this.tabRepositionMarker(tabButton);
-        },
-        tabRepositionMarker(tabButton){
-            this.$refs.tabMarker.style.width=tabButton.offsetWidth + 'px';
-            this.$refs.tabMarker.style.height=tabButton.offsetHeight + 'px';
-            this.$refs.tabMarker.style.left=tabButton.offsetLeft + 'px';
-        },
-        tabContentActive(tabContent){
-            return this.tabSelected == tabContent.id.replace(this.tabId + '-content-', '');
-        },
-        tabButtonActive(tabContent){
-            const tabId = tabContent.id.split('-').slice(-1);
-            return this.tabSelected == tabId;
-        }
-    }"
-		x-init="tabRepositionMarker($refs.tabButtons.firstElementChild);"
-		class="relative w-full max-w-sm"
-	>
-		<div x-ref="tabButtons" class="relative inline-grid items-center justify-center w-full h-10 grid-cols-3 p-1 text-gray-500 bg-white border border-gray-100 rounded-lg select-none">
-			<button :id="$id(tabId)" @click="tabButtonClicked($el);" type="button" :class="{ 'bg-gray-100 text-gray-700' : tabButtonActive($el) }" class="relative z-20 inline-flex items-center justify-center w-full h-8 px-3 text-sm font-medium transition-all rounded-md cursor-pointer whitespace-nowrap">Tab1</button>
-			<button :id="$id(tabId)" @click="tabButtonClicked($el);" type="button" :class="{ 'bg-gray-100 text-gray-700' : tabButtonActive($el) }" class="relative z-20 inline-flex items-center justify-center w-full h-8 px-3 text-sm font-medium transition-all rounded-md cursor-pointer whitespace-nowrap">Tab2</button>
-			<button :id="$id(tabId)" @click="tabButtonClicked($el);" type="button" :class="{ 'bg-gray-100 text-gray-700' : tabButtonActive($el) }" class="relative z-20 inline-flex items-center justify-center w-full h-8 px-3 text-sm font-medium transition-all rounded-md cursor-pointer whitespace-nowrap">Tab3</button>
-			<div x-ref="tabMarker" class="absolute left-0 z-10 w-1/2 h-full duration-300 ease-out" x-cloak><div class="w-full h-full bg-gray-100 rounded-md shadow-sm"></div></div>
-		</div>
-		<div class="relative flex items-center justify-center w-full p-5 mt-2 text-xs text-gray-400 border rounded-md content border-gray-200/70">
-			<div :id="$id(tabId + '-content')" x-show="tabContentActive($el)" class="relative">
-				@Table()
-			</div>
-			<div :id="$id(tabId + '-content')" x-show="tabContentActive($el)" class="relative" x-cloak>
-				And, this is the content for Tab2
-			</div>
-			<div :id="$id(tabId + '-content')" x-show="tabContentActive($el)" class="relative" x-cloak>
-				Finally, this is the content for Tab3
-			</div>
-		</div>
-	</div>
-}
-
-templ Table() {
-	<div class="flex flex-col">
-		<div class="overflow-x-auto">
-			<div class="inline-block min-w-full">
-				<div class="overflow-hidden">
-					<table class="min-w-full divide-y divide-neutral-200">
-						<thead>
-							<tr class="text-neutral-500">
-								<th class="px-5 py-3 text-xs font-medium text-left uppercase">Name</th>
-								<th class="px-5 py-3 text-xs font-medium text-left uppercase">Age</th>
-								<th class="px-5 py-3 text-xs font-medium text-left uppercase">Address</th>
-								<th class="px-5 py-3 text-xs font-medium text-right uppercase">Action</th>
-							</tr>
-						</thead>
-						<tbody class="divide-y divide-neutral-200">
-							<tr class="text-neutral-800">
-								<td class="px-5 py-4 text-sm font-medium whitespace-nowrap">Richard Hendricks</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">30</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">Pied Piper HQ, Palo Alto</td>
-								<td class="px-5 py-4 text-sm font-medium text-right whitespace-nowrap">
-									<a class="text-blue-600 hover:text-blue-700" href="#">Edit</a>
-								</td>
-							</tr>
-							<tr class="text-neutral-800">
-								<td class="px-5 py-4 text-sm font-medium whitespace-nowrap">Erlich Bachman</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">40</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">5230 Penfield Ave, Woodland Hills</td>
-								<td class="px-5 py-4 text-sm font-medium text-right whitespace-nowrap">
-									<a class="text-blue-600 hover:text-blue-700" href="#">Edit</a>
-								</td>
-							</tr>
-							<tr class="text-neutral-800">
-								<td class="px-5 py-4 text-sm font-medium whitespace-nowrap">Monica Hall</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">35</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">2030 Stewart Drive, Sunnyvale</td>
-								<td class="px-5 py-4 text-sm font-medium text-right whitespace-nowrap">
-									<a class="text-blue-600 hover:text-blue-700" href="#">Edit</a>
-								</td>
-							</tr>
-							<tr class="text-neutral-800">
-								<td class="px-5 py-4 text-sm font-medium whitespace-nowrap">Dinesh Chugtai</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">28</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">Pied Piper HQ, Palo Alto</td>
-								<td class="px-5 py-4 text-sm font-medium text-right whitespace-nowrap">
-									<a class="text-blue-600 hover:text-blue-700" href="#">Edit</a>
-								</td>
-							</tr>
-							<tr class="text-neutral-800">
-								<td class="px-5 py-4 text-sm font-medium whitespace-nowrap">Gilfoyle</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">32</td>
-								<td class="px-5 py-4 text-sm whitespace-nowrap">Pied Piper HQ, Palo Alto</td>
-								<td class="px-5 py-4 text-sm font-medium text-right whitespace-nowrap">
-									<a class="text-blue-600 hover:text-blue-700" href="#">Edit</a>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-	</div>
-}

pkg/nebula/components/blocks/tabs_templ.go

@@ -1,77 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.778
-package blocks
-
-//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"
-
-func Tabs() 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("<div x-data=\"{\n        tabSelected: 1,\n        tabId: $id(&#39;tabs&#39;),\n        tabButtonClicked(tabButton){\n            this.tabSelected = tabButton.id.replace(this.tabId + &#39;-&#39;, &#39;&#39;);\n            this.tabRepositionMarker(tabButton);\n        },\n        tabRepositionMarker(tabButton){\n            this.$refs.tabMarker.style.width=tabButton.offsetWidth + &#39;px&#39;;\n            this.$refs.tabMarker.style.height=tabButton.offsetHeight + &#39;px&#39;;\n            this.$refs.tabMarker.style.left=tabButton.offsetLeft + &#39;px&#39;;\n        },\n        tabContentActive(tabContent){\n            return this.tabSelected == tabContent.id.replace(this.tabId + &#39;-content-&#39;, &#39;&#39;);\n        },\n        tabButtonActive(tabContent){\n            const tabId = tabContent.id.split(&#39;-&#39;).slice(-1);\n            return this.tabSelected == tabId;\n        }\n    }\" x-init=\"tabRepositionMarker($refs.tabButtons.firstElementChild);\" class=\"relative w-full max-w-sm\"><div x-ref=\"tabButtons\" class=\"relative inline-grid items-center justify-center w-full h-10 grid-cols-3 p-1 text-gray-500 bg-white border border-gray-100 rounded-lg select-none\"><button :id=\"$id(tabId)\" @click=\"tabButtonClicked($el);\" type=\"button\" :class=\"{ &#39;bg-gray-100 text-gray-700&#39; : tabButtonActive($el) }\" class=\"relative z-20 inline-flex items-center justify-center w-full h-8 px-3 text-sm font-medium transition-all rounded-md cursor-pointer whitespace-nowrap\">Tab1</button> <button :id=\"$id(tabId)\" @click=\"tabButtonClicked($el);\" type=\"button\" :class=\"{ &#39;bg-gray-100 text-gray-700&#39; : tabButtonActive($el) }\" class=\"relative z-20 inline-flex items-center justify-center w-full h-8 px-3 text-sm font-medium transition-all rounded-md cursor-pointer whitespace-nowrap\">Tab2</button> <button :id=\"$id(tabId)\" @click=\"tabButtonClicked($el);\" type=\"button\" :class=\"{ &#39;bg-gray-100 text-gray-700&#39; : tabButtonActive($el) }\" class=\"relative z-20 inline-flex items-center justify-center w-full h-8 px-3 text-sm font-medium transition-all rounded-md cursor-pointer whitespace-nowrap\">Tab3</button><div x-ref=\"tabMarker\" class=\"absolute left-0 z-10 w-1/2 h-full duration-300 ease-out\" x-cloak><div class=\"w-full h-full bg-gray-100 rounded-md shadow-sm\"></div></div></div><div class=\"relative flex items-center justify-center w-full p-5 mt-2 text-xs text-gray-400 border rounded-md content border-gray-200/70\"><div :id=\"$id(tabId + &#39;-content&#39;)\" x-show=\"tabContentActive($el)\" class=\"relative\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Table().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div :id=\"$id(tabId + &#39;-content&#39;)\" x-show=\"tabContentActive($el)\" class=\"relative\" x-cloak>And, this is the content for Tab2</div><div :id=\"$id(tabId + &#39;-content&#39;)\" x-show=\"tabContentActive($el)\" class=\"relative\" x-cloak>Finally, this is the content for Tab3</div></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func Table() 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("<div class=\"flex flex-col\"><div class=\"overflow-x-auto\"><div class=\"inline-block min-w-full\"><div class=\"overflow-hidden\"><table class=\"min-w-full divide-y divide-neutral-200\"><thead><tr class=\"text-neutral-500\"><th class=\"px-5 py-3 text-xs font-medium text-left uppercase\">Name</th><th class=\"px-5 py-3 text-xs font-medium text-left uppercase\">Age</th><th class=\"px-5 py-3 text-xs font-medium text-left uppercase\">Address</th><th class=\"px-5 py-3 text-xs font-medium text-right uppercase\">Action</th></tr></thead> <tbody class=\"divide-y divide-neutral-200\"><tr class=\"text-neutral-800\"><td class=\"px-5 py-4 text-sm font-medium whitespace-nowrap\">Richard Hendricks</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">30</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">Pied Piper HQ, Palo Alto</td><td class=\"px-5 py-4 text-sm font-medium text-right whitespace-nowrap\"><a class=\"text-blue-600 hover:text-blue-700\" href=\"#\">Edit</a></td></tr><tr class=\"text-neutral-800\"><td class=\"px-5 py-4 text-sm font-medium whitespace-nowrap\">Erlich Bachman</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">40</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">5230 Penfield Ave, Woodland Hills</td><td class=\"px-5 py-4 text-sm font-medium text-right whitespace-nowrap\"><a class=\"text-blue-600 hover:text-blue-700\" href=\"#\">Edit</a></td></tr><tr class=\"text-neutral-800\"><td class=\"px-5 py-4 text-sm font-medium whitespace-nowrap\">Monica Hall</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">35</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">2030 Stewart Drive, Sunnyvale</td><td class=\"px-5 py-4 text-sm font-medium text-right whitespace-nowrap\"><a class=\"text-blue-600 hover:text-blue-700\" href=\"#\">Edit</a></td></tr><tr class=\"text-neutral-800\"><td class=\"px-5 py-4 text-sm font-medium whitespace-nowrap\">Dinesh Chugtai</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">28</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">Pied Piper HQ, Palo Alto</td><td class=\"px-5 py-4 text-sm font-medium text-right whitespace-nowrap\"><a class=\"text-blue-600 hover:text-blue-700\" href=\"#\">Edit</a></td></tr><tr class=\"text-neutral-800\"><td class=\"px-5 py-4 text-sm font-medium whitespace-nowrap\">Gilfoyle</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">32</td><td class=\"px-5 py-4 text-sm whitespace-nowrap\">Pied Piper HQ, Palo Alto</td><td class=\"px-5 py-4 text-sm font-medium text-right whitespace-nowrap\"><a class=\"text-blue-600 hover:text-blue-700\" href=\"#\">Edit</a></td></tr></tbody></table></div></div></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

pkg/nebula/components/blocks/video.templ

@@ -1,317 +0,0 @@
-package blocks
-
-templ Video() {
-	<div
-		x-data="{
-        sources: {
-            mp4: 'https://cdn.devdojo.com/pines/videos/coast.mp4',
-            webm: 'https://cdn.devdojo.com/pines/videos/coast.webm',
-            ogg: 'https://cdn.devdojo.com/pines/videos/coast.ogg'
-        },
-        playing: false,
-        controls: true,
-        muted: false,
-        muteForced: false,
-        fullscreen: false,
-        ended: false,
-        mouseleave: false,
-        autoHideControlsDelay: 3000,
-        controlsHideTimeout: null,
-        poster: null,
-        videoDuration: 0,
-        timeDurationString: '00:00',
-        timeElapsedString: '00:00',
-        showTime: false,
-        volume: 1,
-        volumeBeforeMute: 1,
-        videoPlayerReady: false,
-        timelineSeek(e) {
-            time = this.formatTime(Math.round(e.target.value));
-            this.timeElapsedString = `${time.minutes}:${time.seconds}`;
-        },
-        metaDataLoaded(event) {
-            this.videoDuration = event.target.duration;
-            this.$refs.videoProgress.setAttribute('max', this.videoDuration);
-
-            time = this.formatTime(Math.round(this.videoDuration));
-            this.timeDurationString = `${time.minutes}:${time.seconds}`;
-            this.showTime = true;
-            this.videoPlayerReady = true;
-        },
-        togglePlay(e) {
-            if (this.$refs.player.paused || this.$refs.player.ended) {
-                this.playing = true;
-                this.$refs.player.play();
-            } else {
-                this.$refs.player.pause();
-                this.playing = false;
-            }
-        },
-        toggleMute(){
-            this.muted = !this.muted;
-            this.$refs.player.muted = this.muted;
-            if(this.muted){
-                this.volumeBeforeMute = this.volume;
-                this.volume = 0;
-            } else {
-                this.volume = this.volumeBeforeMute;
-            }
-        },
-        timeUpdatedInterval() {
-            if (!this.$refs.videoProgress.getAttribute('max'))
-                this.$refs.videoProgress.setAttribute('max', $refs.player.duration);
-                this.$refs.videoProgress.value = this.$refs.player.currentTime;
-                time = this.formatTime(Math.round(this.$refs.player.currentTime));
-                this.timeElapsedString = `${time.minutes}:${time.seconds}`;
-        },
-        updateVolume(e) {
-            this.volume = e.target.value;
-            this.$refs.player.volume = this.volume;
-            if(this.volume == 0){
-                this.muted = true;
-            }
-
-            if(this.muted && this.volume > 0){
-                this.muted = false;
-            }
-        },
-        timelineClicked(e) {
-            rect = this.$refs.videoProgress.getBoundingClientRect();
-            pos = (e.pageX - rect.left) / this.$refs.videoProgress.offsetWidth;
-            this.$refs.player.currentTime = pos * this.$refs.player.duration;
-        },
-        handleFullscreen() {
-            if (document.fullscreenElement !== null) {
-                // The document is in fullscreen mode
-                document.exitFullscreen();
-            } else {
-                // The document is not in fullscreen mode
-                this.$refs.videoContainer.requestFullscreen();
-            }
-        },
-        mousemoveVideo() {
-            if(this.playing){
-                this.resetControlsTimeout();
-            } else {
-                this.controls=true;
-                clearTimeout(this.controlsHideTimeout);
-            }
-        },
-        videoEnded() {
-            this.ended = true;
-            this.playing = false;
-            this.$refs.player.currentTime = 0;
-        },
-        resetControlsTimeout() {
-            this.controls = true;
-            clearTimeout(this.controlsHideTimeout);
-            let that = this;
-            this.controlsHideTimeout = setTimeout(function(){ 
-                that.controls=false 
-            }, this.autoHideControlsDelay);
-        },
-        formatTime(timeInSeconds) {
-            result = new Date(timeInSeconds * 1000).toISOString().substring(11, 19);
-
-            return {
-                minutes: result.substring(3, 5),
-                seconds: result.substring(6, 8),
-            };
-        }
-    }"
-		x-init="
-
-        supportsVideo = document.createElement('video').canPlayType;
-        if (!supportsVideo) {
-            alert('This browser does not support the video element');
-        }
-
-        $refs.player.load();
-        // Hide the default player controls
-        $refs.player.controls = false;
-        
-        $watch('playing', (value) => {
-            if (value) {
-                ended = false;
-                controlsHideTimeout = setTimeout(() => {
-                    controls = false;
-                }, autoHideControlsDelay);
-            } else {
-                clearTimeout(controlsHideTimeout);
-                controls = true;
-            }
-        });
-
-        if (!document?.fullscreenEnabled) {
-            $refs.fullscreenButton.style.display = 'none';
-        }
-
-        document.addEventListener('fullscreenchange', (e) => {
-            fullscreen = !!document.fullscreenElement;
-        });
-
-    "
-		x-ref="videoContainer"
-		@mouseleave="mouseleave=true"
-		@mousemove="mousemoveVideo"
-		class="relative h-[360px] min-w-[640px] overflow-hidden rounded-md aspect-video"
-	>
-		<video
-			x-ref="player"
-			@loadedmetadata="metaDataLoaded"
-			@timeupdate="timeUpdatedInterval"
-			@ended="videoEnded"
-			preload="metadata"
-			:poster="poster"
-			class="relative z-10 object-cover w-full h-full bg-black"
-			crossorigin="anonymous"
-		>
-			<source :src="sources.mp4" type="video/mp4"/>
-			<source :src="sources.webm" type="video/webm"/>
-			<source :src="sources.ogg" type="video/ogg"/>
-		</video>
-		<div x-show="videoPlayerReady" class="absolute inset-0 w-full h-full">
-			<div x-ref="videoBackground" @click="togglePlay()" class="absolute inset-0 z-30 flex items-center justify-center w-full h-full bg-black bg-opacity-0 cursor-pointer group">
-				<div
-					x-show="playing"
-					x-transition:enter="transition ease-out duration-1000"
-					x-transition:enter-start="scale-50 opacity-100"
-					x-transition:enter-end="scale-100 opacity-0"
-					class="absolute z-20 flex items-center justify-center w-24 h-24 bg-blue-600 rounded-full opacity-0 bg-opacity-20"
-					x-cloak
-				>
-					<svg class="w-10 h-10 translate-x-0.5 text-white" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8.42737 3.41611C6.46665 2.24586 4.00008 3.67188 4.00007 5.9427L4 18.0572C3.99999 20.329 6.46837 21.7549 8.42907 20.5828L18.5698 14.5207C20.4775 13.3802 20.4766 10.6076 18.568 9.46853L8.42737 3.41611Z" fill="currentColor"></path></svg>
-				</div>
-				<div
-					x-show="!playing && !ended"
-					x-transition:enter="transition ease-out duration-1000"
-					x-transition:enter-start="scale-50 opacity-100"
-					x-transition:enter-end="scale-100 opacity-0"
-					class="absolute z-20 flex items-center justify-center w-24 h-24 bg-blue-600 rounded-full opacity-0 bg-opacity-20"
-					x-cloak
-				>
-					<svg class="w-10 h-10 text-white" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M8 3C8.55228 3 9 3.44772 9 4L9 20C9 20.5523 8.55228 21 8 21C7.44772 21 7 20.5523 7 20L7 4C7 3.44772 7.44772 3 8 3ZM16 3C16.5523 3 17 3.44772 17 4V20C17 20.5523 16.5523 21 16 21C15.4477 21 15 20.5523 15 20V4C15 3.44772 15.4477 3 16 3Z" fill="currentColor"></path></svg>
-				</div>
-				<div class="absolute z-10 duration-300 ease-out group-hover:scale-110">
-					<button
-						x-show="!playing"
-						x-transition:enter="transition ease-in delay-200 duration-300"
-						x-transition:enter-start="opacity-0 scale-75"
-						x-transition:enter-end="opacity-100 scale-100"
-						x-transition:leave="transition ease-out duration-300"
-						x-transition:leave-start="opacity-100"
-						x-transition:leave-end="opacity-0"
-						class="flex items-center justify-center w-12 h-12 text-white duration-150 ease-out bg-blue-600 rounded-full cursor-pointer bg-opacity-80"
-						type="button"
-					>
-						<svg class="w-5 h-5 translate-x-px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8.42737 3.41611C6.46665 2.24586 4.00008 3.67188 4.00007 5.9427L4 18.0572C3.99999 20.329 6.46837 21.7549 8.42907 20.5828L18.5698 14.5207C20.4775 13.3802 20.4766 10.6076 18.568 9.46853L8.42737 3.41611Z" fill="currentColor" x-cloak></path></svg>
-					</button>
-				</div>
-			</div>
-			<div
-				x-show="controls"
-				x-transition:enter="transition ease-out duration-300"
-				x-transition:enter-start="-translate-y-full"
-				x-transition:enter-end="translate-y-0"
-				x-transition:leave="transition ease-in duration-300"
-				x-transition:leave-start="translate-y-0"
-				x-transition:leave-end="-translate-y-full"
-				class="absolute top-0 left-0 z-20 w-full h-1/4 opacity-20 bg-gradient-to-b from-black to-transparent"
-				x-cloak
-			></div>
-			<div
-				x-show="controls"
-				x-transition:enter="transition ease-out duration-300"
-				x-transition:enter-start="translate-y-full"
-				x-transition:enter-end="translate-y-0"
-				x-transition:leave="transition ease-in duration-300"
-				x-transition:leave-start="translate-y-0"
-				x-transition:leave-end="translate-y-full"
-				class="absolute bottom-0 left-0 z-20 w-full h-1/4 opacity-20 bg-gradient-to-b from-transparent to-black"
-				x-cloak
-			></div>
-			<div
-				x-show="controls"
-				@click="resetControlsTimeout"
-				x-transition:enter="transition ease-out duration-300"
-				x-transition:enter-start="-translate-y-full"
-				x-transition:enter-end="translate-y-0"
-				x-transition:leave="transition ease-in duration-300"
-				x-transition:leave-start="translate-y-0"
-				x-transition:leave-end="-translate-y-full"
-				class="absolute top-0 left-0 z-40 flex items-center w-full h-12 text-white"
-				x-cloak
-			>
-				<div class="absolute right-0 top-0 mr-0.5 mt-0.5 flex items-center">
-					<div class="flex items-center h-auto group">
-						<button @click="toggleMute()" type="button" class="flex items-center justify-center w-6 h-auto duration-150 ease-out opacity-80 hover:opacity-100">
-							<svg x-show="!muted" class="w-[18px] h-[18px]" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" x-cloak><path d="M13.5 4.06c0-1.336-1.616-2.005-2.56-1.06l-4.5 4.5H4.508c-1.141 0-2.318.664-2.66 1.905A9.76 9.76 0 001.5 12c0 .898.121 1.768.35 2.595.341 1.24 1.518 1.905 2.659 1.905h1.93l4.5 4.5c.945.945 2.561.276 2.561-1.06V4.06zM18.584 5.106a.75.75 0 011.06 0c3.808 3.807 3.808 9.98 0 13.788a.75.75 0 11-1.06-1.06 8.25 8.25 0 000-11.668.75.75 0 010-1.06z"></path><path d="M15.932 7.757a.75.75 0 011.061 0 6 6 0 010 8.486.75.75 0 01-1.06-1.061 4.5 4.5 0 000-6.364.75.75 0 010-1.06z"></path></svg>
-							<svg x-show="muted" class="w-[18px] h-[18px]" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" x-cloak><path d="M13.5 4.06c0-1.336-1.616-2.005-2.56-1.06l-4.5 4.5H4.508c-1.141 0-2.318.664-2.66 1.905A9.76 9.76 0 001.5 12c0 .898.121 1.768.35 2.595.341 1.24 1.518 1.905 2.659 1.905h1.93l4.5 4.5c.945.945 2.561.276 2.561-1.06V4.06zM17.78 9.22a.75.75 0 10-1.06 1.06L18.44 12l-1.72 1.72a.75.75 0 001.06 1.06l1.72-1.72 1.72 1.72a.75.75 0 101.06-1.06L20.56 12l1.72-1.72a.75.75 0 00-1.06-1.06l-1.72 1.72-1.72-1.72z"></path></svg>
-						</button>
-						<div class="relative h-1.5 mx-0 group-hover:mx-1 rounded-full group-hover:w-12 invisible group-hover:visible w-0 ease-out duration-300">
-							<input
-								x-ref="volume"
-								@input="updateVolume(event)"
-								type="range"
-								min="0"
-								max="1"
-								:value="volume"
-								step="0.01"
-								class="w-full h-full appearance-none flex items-center cursor-pointer bg-transparent z-30
-                                [&::-webkit-slider-thumb]:bg-white [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:border-0 [&::-webkit-slider-thumb]:w-2 [&::-webkit-slider-thumb]:h-2 [&::-webkit-slider-thumb]:appearance-none
-                                [&::-moz-range-thumb]:bg-white [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:w-2 [&::-moz-range-thumb]:h-2 [&::-moz-range-thumb]:appearance-none
-                                [&::-ms-thumb]:bg-white [&::-ms-thumb]:rounded-full [&::-ms-thumb]:border-0 [&::-ms-thumb]:w-2 [&::-ms-thumb]:h-2 [&::-ms-thumb]:appearance-none
-                                [&::-webkit-slider-runnable-track]:bg-white [&::-webkit-slider-runnable-track]:bg-opacity-30 [&::-webkit-slider-runnable-track]:rounded-full [&::-webkit-slider-runnable-track]:overflow-hidden [&::-moz-range-track]:bg-neutral-200 [&::-moz-range-track]:rounded-full [&::-ms-track]:bg-neutral-200 [&::-ms-track]:rounded-full
-                                [&::-moz-range-progress]:bg-white [&::-moz-range-progress]:bg-opacity-80 [&::-moz-range-progress]:rounded-full [&::-ms-fill-lower]:bg-white [&::-ms-fill-lower]:bg-opacity-80 [&::-ms-fill-lower]:rounded-full [&::-webkit-slider-thumb]:shadow-[-995px_0px_0px_990px_rgba(255,_255,_255,_0.8)]
-                        "
-							/>
-						</div>
-					</div>
-					<button x-ref="fullscreenButton" @click="handleFullscreen" class="flex items-center justify-center w-10 h-10 duration-150 ease-out scale-90 opacity-80 hover:opacity-100 hover:scale-100" type="button">
-						<svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M6.72685 5C5.77328 5 5 5.77318 5 6.72727V9C5 9.55228 4.55228 10 4 10C3.44772 10 3 9.55228 3 9V6.72727C3 4.6689 4.66842 3 6.72685 3H9C9.55228 3 10 3.44772 10 4C10 4.55228 9.55228 5 9 5H6.72685ZM14 4C14 3.44772 14.4477 3 15 3H17.2727C19.3312 3 21 4.66876 21 6.72727V9C21 9.55228 20.5523 10 20 10C19.4477 10 19 9.55228 19 9V6.72727C19 5.77333 18.2267 5 17.2727 5H15C14.4477 5 14 4.55228 14 4ZM4 14C4.55228 14 5 14.4477 5 15V17.2727C5 18.2268 5.77328 19 6.72685 19H9C9.55228 19 10 19.4477 10 20C10 20.5523 9.55228 21 9 21H6.72685C4.66842 21 3 19.3311 3 17.2727V15C3 14.4477 3.44772 14 4 14ZM20 14C20.5523 14 21 14.4477 21 15V17.2727C21 19.3312 19.3312 21 17.2727 21H15C14.4477 21 14 20.5523 14 20C14 19.4477 14.4477 19 15 19H17.2727C18.2267 19 19 18.2267 19 17.2727V15C19 14.4477 19.4477 14 20 14Z" fill="currentColor"></path></svg>
-					</button>
-				</div>
-			</div>
-			<div
-				x-show="controls"
-				@click="resetControlsTimeout"
-				x-transition:enter="transition ease-out duration-300"
-				x-transition:enter-start="translate-y-full"
-				x-transition:enter-end="translate-y-0"
-				x-transition:leave="transition ease-in duration-300"
-				x-transition:leave-start="translate-y-0"
-				x-transition:leave-end="translate-y-full"
-				class="absolute bottom-0 left-0 z-40 w-full h-12"
-				x-cloak
-			>
-				<div class="absolute bottom-0 z-30 w-full px-2.5 -translate-y-8">
-					<div class="relative w-full h-1 rounded-full">
-						<input
-							x-ref="videoProgress"
-							@click="timelineClicked"
-							@input="timelineSeek(event)"
-							type="range"
-							min="0"
-							max="100"
-							value="0"
-							step="any"
-							class="w-full h-full appearance-none flex items-center cursor-pointer bg-transparent z-30
-                            [&::-webkit-slider-thumb]:bg-white [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:border-0 [&::-webkit-slider-thumb]:w-1.5 [&::-webkit-slider-thumb]:h-1.5 [&::-webkit-slider-thumb]:appearance-none
-                            [&::-moz-range-thumb]:bg-white [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:w-1.5 [&::-moz-range-thumb]:h-1.5 [&::-moz-range-thumb]:appearance-none
-                            [&::-ms-thumb]:bg-white [&::-ms-thumb]:rounded-full [&::-ms-thumb]:border-0 [&::-ms-thumb]:w-1.5 [&::-ms-thumb]:h-1.5 [&::-ms-thumb]:appearance-none
-                            [&::-webkit-slider-runnable-track]:bg-white [&::-webkit-slider-runnable-track]:bg-opacity-30 [&::-webkit-slider-runnable-track]:rounded-full [&::-webkit-slider-runnable-track]:overflow-hidden [&::-moz-range-track]:bg-neutral-200 [&::-moz-range-track]:rounded-full [&::-ms-track]:bg-neutral-200 [&::-ms-track]:rounded-full
-                            [&::-moz-range-progress]:bg-blue-600 [&::-moz-range-progress]:rounded-full [&::-ms-fill-lower]:bg-blue-600 [&::-ms-fill-lower]:rounded-full [&::-webkit-slider-thumb]:shadow-[-995px_0px_0px_990px_#2463eb]
-                    "
-						/>
-					</div>
-				</div>
-				<div class="absolute bottom-0 left-0 z-20 flex items-center w-full h-8 text-white">
-					<div x-show="showTime" class="flex items-center justify-between w-full mx-3 font-mono text-xs opacity-80 hover:opacity-100" x-cloak>
-						<time x-ref="timeElapsed" x-text="timeElapsedString">00:00</time>
-						<time x-ref="timeDuration" x-text="timeDurationString">00:00</time>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-}

pkg/nebula/components/home/footer.templ

@@ -1,6 +1,6 @@
 package home
 
-templ MarketingFooter() {
+templ Footer() {
 	<!-- Site footer -->
 	<footer>
 		<div class="max-w-5xl mx-auto px-4 sm:px-6">

pkg/nebula/components/home/footer_templ.go

@@ -8,7 +8,7 @@ package home
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-func MarketingFooter() templ.Component {
+func Footer() 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 {

pkg/nebula/components/home/header.templ

@@ -1,6 +1,6 @@
 package home
 
-templ MarketingHeader() {
+templ Header() {
 	<!-- Site header -->
 	<header class="absolute top-2 md:top-6 w-full z-30">
 		<div class="px-4 sm:px-6">
@@ -18,7 +18,7 @@ templ MarketingHeader() {
 						<!-- Desktop sign in links -->
 						<ul class="flex grow justify-end flex-wrap items-center">
 							<li>
-								<a class="text-sm font-medium text-zinc-500 hover:text-zinc-900 px-3 lg:px-5 py-2 flex items-center transition" href="/login">Log in</a>
+								<div class="text-sm cursor-pointer font-medium text-zinc-500 hover:text-zinc-900 px-3 lg:px-5 py-2 flex items-center transition" hx-swap="afterend" hx-get="/login">Log in</div>
 							</li>
 							<li class="ml-1">
 								<div class="btn-sm text-zinc-100 cursor-pointer bg-zinc-900 hover:bg-zinc-800 w-full shadow" hx-swap="afterend" hx-get="/register">Register</div>

pkg/nebula/components/home/header_templ.go

@@ -8,7 +8,7 @@ package home
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-func MarketingHeader() templ.Component {
+func Header() 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 {
@@ -29,7 +29,7 @@ func MarketingHeader() templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Site header --><header class=\"absolute top-2 md:top-6 w-full z-30\"><div class=\"px-4 sm:px-6\"><div class=\"max-w-3xl mx-auto\"><div class=\"flex items-center justify-between h-14 border border-transparent [background:linear-gradient(theme(colors.white),theme(colors.white))_padding-box,linear-gradient(120deg,theme(colors.zinc.300),theme(colors.zinc.100),theme(colors.zinc.300))_border-box] rounded-lg px-3\"><!-- Site branding --><div class=\"shrink-0 mr-4\"><!-- Logo --><a class=\"flex items-center justify-center bg-white w-8 h-8 rounded shadow-sm shadow-zinc-950/20\" href=\"/\"><img src=\"https://cdn.sonr.id/img/logo-zinc.svg\" width=\"24\" height=\"24\" alt=\"Logo\"></a></div><!-- Desktop navigation --><nav class=\"flex grow\"><!-- Desktop sign in links --><ul class=\"flex grow justify-end flex-wrap items-center\"><li><a class=\"text-sm font-medium text-zinc-500 hover:text-zinc-900 px-3 lg:px-5 py-2 flex items-center transition\" href=\"/login\">Log in</a></li><li class=\"ml-1\"><div class=\"btn-sm text-zinc-100 cursor-pointer bg-zinc-900 hover:bg-zinc-800 w-full shadow\" hx-swap=\"afterend\" hx-get=\"/register\">Register</div></li></ul></nav></div></div></div></header>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Site header --><header class=\"absolute top-2 md:top-6 w-full z-30\"><div class=\"px-4 sm:px-6\"><div class=\"max-w-3xl mx-auto\"><div class=\"flex items-center justify-between h-14 border border-transparent [background:linear-gradient(theme(colors.white),theme(colors.white))_padding-box,linear-gradient(120deg,theme(colors.zinc.300),theme(colors.zinc.100),theme(colors.zinc.300))_border-box] rounded-lg px-3\"><!-- Site branding --><div class=\"shrink-0 mr-4\"><!-- Logo --><a class=\"flex items-center justify-center bg-white w-8 h-8 rounded shadow-sm shadow-zinc-950/20\" href=\"/\"><img src=\"https://cdn.sonr.id/img/logo-zinc.svg\" width=\"24\" height=\"24\" alt=\"Logo\"></a></div><!-- Desktop navigation --><nav class=\"flex grow\"><!-- Desktop sign in links --><ul class=\"flex grow justify-end flex-wrap items-center\"><li><div class=\"text-sm cursor-pointer font-medium text-zinc-500 hover:text-zinc-900 px-3 lg:px-5 py-2 flex items-center transition\" hx-swap=\"afterend\" hx-get=\"/login\">Log in</div></li><li class=\"ml-1\"><div class=\"btn-sm text-zinc-100 cursor-pointer bg-zinc-900 hover:bg-zinc-800 w-full shadow\" hx-swap=\"afterend\" hx-get=\"/register\">Register</div></li></ul></nav></div></div></div></header>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

pkg/nebula/components/home/hero.templ

@@ -1,6 +1,9 @@
 package home
 
-import "github.com/onsonr/sonr/pkg/nebula/models"
+import (
+	"github.com/onsonr/sonr/pkg/nebula/components/ui"
+	"github.com/onsonr/sonr/pkg/nebula/models"
+)
 
 templ SectionHero(hero *models.Hero) {
 	<!-- Hero -->
@@ -24,12 +27,8 @@ templ SectionHero(hero *models.Hero) {
 							{ hero.Subtitle }
 						</p>
 						<div class="max-w-xs mx-auto sm:max-w-none sm:inline-flex sm:justify-center space-y-4 sm:space-y-0 sm:space-x-4">
-							<div>
+							@ui.PrimaryButton(hero.PrimaryButton.Href, hero.PrimaryButton.Text)
-								<div class="btn cursor-pointer text-zinc-100 bg-zinc-900 hover:bg-zinc-800 w-full shadow" hx-swap="afterend" hx-get={ hero.PrimaryButton.Href }>{ hero.PrimaryButton.Text }</div>
+							@ui.SecondaryButton(hero.SecondaryButton.Href, hero.SecondaryButton.Text)
-							</div>
-							<div>
-								<div class="btn cursor-pointer text-zinc-600 bg-white hover:text-zinc-900 w-full shadow" hx-swap="afterend" hx-get={ hero.SecondaryButton.Href }>{ hero.SecondaryButton.Text }</div>
-							</div>
 						</div>
 					</div>
 				</div>
@@ -42,9 +41,9 @@ templ SectionHero(hero *models.Hero) {
 
 templ heroImage(hero *models.Hero) {
 	<!-- Image -->
-	<div class="max-w-5xl mx-auto px-4 sm:px-6 flex justify-center pb-12 md:pb-20 relative before:absolute before:-top-12 before:w-96 before:h-96 before:bg-zinc-900 before:opacity-[.15] before:rounded-full before:blur-3xl before:-z-10 from-zinc-100 to-white">
+	<div class="max-w-5xl motion-preset-slide-up mx-auto px-4 sm:px-6 flex justify-center pb-12 md:pb-20 relative before:absolute before:-top-12 before:w-96 before:h-96 before:bg-zinc-900 before:opacity-[.15] before:rounded-full before:blur-3xl before:-z-10 from-zinc-100 to-white">
 		<img
-			class="rounded-lg"
+			class="rounded-lg "
 			src={ hero.Image.Src }
 			width={ hero.Image.Width }
 			height={ hero.Image.Height }

pkg/nebula/components/home/hero_templ.go

@@ -8,7 +8,10 @@ package home
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "github.com/onsonr/sonr/pkg/nebula/models"
+import (
+	"github.com/onsonr/sonr/pkg/nebula/components/ui"
+	"github.com/onsonr/sonr/pkg/nebula/models"
+)
 
 func SectionHero(hero *models.Hero) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
@@ -38,7 +41,7 @@ func SectionHero(hero *models.Hero) templ.Component {
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(hero.TitleFirst)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 14, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 17, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -51,7 +54,7 @@ func SectionHero(hero *models.Hero) templ.Component {
 		var templ_7745c5c3_Var3 string
 		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(hero.TitleEmphasis)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 16, Col: 28}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 19, Col: 28}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
@@ -64,7 +67,7 @@ func SectionHero(hero *models.Hero) templ.Component {
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(hero.TitleSecond)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 21, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 24, Col: 25}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
@@ -77,65 +80,25 @@ func SectionHero(hero *models.Hero) templ.Component {
 		var templ_7745c5c3_Var5 string
 		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(hero.Subtitle)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 24, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 27, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</p><div class=\"max-w-xs mx-auto sm:max-w-none sm:inline-flex sm:justify-center space-y-4 sm:space-y-0 sm:space-x-4\"><div><div class=\"btn cursor-pointer text-zinc-100 bg-zinc-900 hover:bg-zinc-800 w-full shadow\" hx-swap=\"afterend\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</p><div class=\"max-w-xs mx-auto sm:max-w-none sm:inline-flex sm:justify-center space-y-4 sm:space-y-0 sm:space-x-4\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Err = ui.PrimaryButton(hero.PrimaryButton.Href, hero.PrimaryButton.Text).Render(ctx, templ_7745c5c3_Buffer)
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hero.PrimaryButton.Href)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 28, Col: 149}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+		templ_7745c5c3_Err = ui.SecondaryButton(hero.SecondaryButton.Href, hero.SecondaryButton.Text).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var7 string
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(hero.PrimaryButton.Text)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 28, Col: 177}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div><div class=\"btn cursor-pointer text-zinc-600 bg-white hover:text-zinc-900 w-full shadow\" hx-swap=\"afterend\" hx-get=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hero.SecondaryButton.Href)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 31, Col: 150}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
-		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_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hero.SecondaryButton.Text)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 31, Col: 180}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -171,21 +134,21 @@ func heroImage(hero *models.Hero) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var10 == nil {
+		if templ_7745c5c3_Var6 == nil {
-			templ_7745c5c3_Var10 = templ.NopComponent
+			templ_7745c5c3_Var6 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Image --><div class=\"max-w-5xl mx-auto px-4 sm:px-6 flex justify-center pb-12 md:pb-20 relative before:absolute before:-top-12 before:w-96 before:h-96 before:bg-zinc-900 before:opacity-[.15] before:rounded-full before:blur-3xl before:-z-10 from-zinc-100 to-white\"><img class=\"rounded-lg\" src=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Image --><div class=\"max-w-5xl motion-preset-slide-up mx-auto px-4 sm:px-6 flex justify-center pb-12 md:pb-20 relative before:absolute before:-top-12 before:w-96 before:h-96 before:bg-zinc-900 before:opacity-[.15] before:rounded-full before:blur-3xl before:-z-10 from-zinc-100 to-white\"><img class=\"rounded-lg \" src=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var11 string
+		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hero.Image.Src)
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(hero.Image.Src)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 48, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 47, Col: 23}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -193,12 +156,12 @@ func heroImage(hero *models.Hero) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var12 string
+		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hero.Image.Width)
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hero.Image.Width)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 49, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 48, Col: 27}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -206,12 +169,12 @@ func heroImage(hero *models.Hero) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var13 string
+		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hero.Image.Height)
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hero.Image.Height)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 50, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/home/hero.templ`, Line: 49, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -239,9 +202,9 @@ func stats() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var14 == nil {
+		if templ_7745c5c3_Var10 == nil {
-			templ_7745c5c3_Var14 = templ.NopComponent
+			templ_7745c5c3_Var10 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Stats --><div class=\"max-w-4xl mx-auto px-4 sm:px-6 justify-center items-center\"><div class=\"max-w-sm mx-auto grid gap-12 sm:grid-cols-2 md:grid-cols-4 md:-mx-5 md:gap-0 items-end md:max-w-none\"><!-- 1st item --><div class=\"relative text-center md:px-5 after:hidden md:after:block after:absolute after:right-0 after:top-1/2 after:-translate-y-1/2 after:w-px after:h-8 after:border-l after:border-zinc-300 after:border-dashed last:after:hidden\"><h4 class=\"font-inter-tight text-2xl md:text-3xl font-bold tabular-nums mb-2\"><span x-data=\"counter(476)\" x-text=\"counterValue\">0</span>K</h4><p class=\"text-sm text-zinc-500\">Assets packed with power beyond your imagination.</p></div><!-- 2nd item --><div class=\"relative text-center md:px-5 after:hidden md:after:block after:absolute after:right-0 after:top-1/2 after:-translate-y-1/2 after:w-px after:h-8 after:border-l after:border-zinc-300 after:border-dashed last:after:hidden\"><h4 class=\"font-inter-tight text-2xl md:text-3xl font-bold tabular-nums mb-2\"><span x-data=\"counter(1.44)\" x-text=\"counterValue\">0</span>K</h4><p class=\"text-sm text-zinc-500\">Assets packed with power beyond your imagination.</p></div><!-- 3rd item --><div class=\"relative text-center md:px-5 after:hidden md:after:block after:absolute after:right-0 after:top-1/2 after:-translate-y-1/2 after:w-px after:h-8 after:border-l after:border-zinc-300 after:border-dashed last:after:hidden\"><h4 class=\"font-inter-tight text-2xl md:text-3xl font-bold tabular-nums mb-2\"><span x-data=\"counter(1.5)\" x-text=\"counterValue\">0</span>M+</h4><p class=\"text-sm text-zinc-500\">Assets packed with power beyond your imagination.</p></div><!-- 4th item --><div class=\"relative text-center md:px-5 after:hidden md:after:block after:absolute after:right-0 after:top-1/2 after:-translate-y-1/2 after:w-px after:h-8 after:border-l after:border-zinc-300 after:border-dashed last:after:hidden\"><h4 class=\"font-inter-tight text-2xl md:text-3xl font-bold tabular-nums mb-2\"><span x-data=\"counter(750)\" x-text=\"counterValue\">0</span>K</h4><p class=\"text-sm text-zinc-500\">Assets packed with power beyond your imagination.</p></div></div>")

pkg/nebula/components/home/highlights.templ

@@ -144,14 +144,6 @@ templ Highlights() {
 										height="360"
 										alt="Feature 01"
 									/>
-									<img
-										class="absolute top-0 left-full mix-blend-exclusion -translate-x-[70%] -mr-20 max-md:w-[45%]"
-										src="https://cdn.sonr.id/img/secure-keys.svg"
-										width="224"
-										height="224"
-										alt="Illustration"
-										aria-hidden="true"
-									/>
 								</div>
 							</div>
 							<!-- Item 2 -->
@@ -173,14 +165,6 @@ templ Highlights() {
 										height="360"
 										alt="Feature 02"
 									/>
-									<img
-										class="absolute top-0 left-full mix-blend-exclusion -translate-x-[70%] -mr-20 max-md:w-[45%]"
-										src="https://cdn.sonr.id/img/secure-keys.svg"
-										width="224"
-										height="224"
-										alt="Illustration"
-										aria-hidden="true"
-									/>
 								</div>
 							</div>
 							<!-- Item 3 -->
@@ -202,14 +186,6 @@ templ Highlights() {
 										height="360"
 										alt="Feature 03"
 									/>
-									<img
-										class="absolute top-0 left-full mix-blend-exclusion -translate-x-[70%] -mr-20 max-md:w-[45%]"
-										src="https://cdn.sonr.id/img/secure-keys.svg"
-										width="224"
-										height="224"
-										alt="Illustration"
-										aria-hidden="true"
-									/>
 								</div>
 							</div>
 							<!-- Item 4 -->
@@ -231,14 +207,6 @@ templ Highlights() {
 										height="360"
 										alt="Feature 04"
 									/>
-									<img
-										class="absolute top-0 left-full mix-blend-exclusion -translate-x-[70%] -mr-20 max-md:w-[45%]"
-										src="https://cdn.sonr.id/img/secure-keys.svg"
-										width="224"
-										height="224"
-										alt="Illustration"
-										aria-hidden="true"
-									/>
 								</div>
 							</div>
 						</div>

pkg/nebula/components/home/view.templ

@@ -5,15 +5,15 @@ import (
 	"github.com/onsonr/sonr/pkg/nebula/models"
 )
 
-templ View(hero *models.Hero) {
+templ View(home *models.Home) {
 	@blocks.LayoutNoBody("Sonr.ID", true) {
-		@MarketingHeader()
+		@Header()
-		@SectionHero(hero)
+		@SectionHero(home.Hero)
 		@Highlights()
 		@Features()
 		@Bento()
 		@Lowlights()
 		@CallToAction()
-		@MarketingFooter()
+		@Footer()
 	}
 }

pkg/nebula/components/home/view_templ.go

@@ -13,7 +13,7 @@ import (
 	"github.com/onsonr/sonr/pkg/nebula/models"
 )
 
-func View(hero *models.Hero) templ.Component {
+func View(home *models.Home) 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 {
@@ -46,7 +46,7 @@ func View(hero *models.Hero) templ.Component {
 				}()
 			}
 			ctx = templ.InitializeContext(ctx)
-			templ_7745c5c3_Err = MarketingHeader().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = Header().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -54,7 +54,7 @@ func View(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = SectionHero(hero).Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = SectionHero(home.Hero).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -102,7 +102,7 @@ func View(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = MarketingFooter().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = Footer().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}

pkg/nebula/components/login/modal.templ

@@ -16,7 +16,6 @@ templ Modal(c echo.Context) {
     "
 		@keydown.escape="fullscreenModal=false"
 	>
-		<button @click="fullscreenModal=true" class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors bg-white border rounded-md hover:bg-neutral-100 active:bg-white focus:bg-white focus:outline-none focus:ring-2 focus:ring-neutral-200/60 focus:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none">Preview</button>
 		<template x-teleport="body">
 			<div
 				x-show="fullscreenModal"

pkg/nebula/components/login/view.templ

@@ -11,7 +11,6 @@ templ View(c echo.Context) {
 			@blocks.H1("Sonr.ID")
 			@blocks.Text("Neo-tree is a file manager for NeoFS.")
 			@blocks.Spacer()
-			@blocks.RadioGroup()
 			@blocks.Spacer()
 			@blocks.Button(blocks.GET("/", "#login-view")) {
 				@blocks.Text("Cancel")

pkg/nebula/components/login/view_templ.go

@@ -82,14 +82,6 @@ func View(c echo.Context) templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = blocks.RadioGroup().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 = blocks.Spacer().Render(ctx, templ_7745c5c3_Buffer)
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err

pkg/nebula/components/profile/view.templ

@@ -9,7 +9,6 @@ templ View(c echo.Context) {
 	@blocks.Layout("Sonr.ID", true) {
 		@blocks.Card("profile-view", blocks.SizeLarge) {
 			@blocks.ProfileCard()
-			@blocks.Tabs()
 		}
 	}
 }

pkg/nebula/components/profile/view_templ.go

@@ -62,14 +62,6 @@ func View(c echo.Context) 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
-				}
-				templ_7745c5c3_Err = blocks.Tabs().Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
 				return templ_7745c5c3_Err
 			})
 			templ_7745c5c3_Err = blocks.Card("profile-view", blocks.SizeLarge).Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer)

pkg/nebula/components/register/modal.templ

@@ -3,13 +3,12 @@ package register
 import (
 	"github.com/labstack/echo/v4"
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
-	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
 )
 
 templ Modal(c echo.Context) {
 	<div
 		x-data="{ modalOpen: true }"
-		@keydown.escape.window="modalOpen = false"
+		@keydown.escape="modalOpen=false"
 		:class="{ 'z-40': modalOpen }"
 		class="relative w-auto h-auto"
 	>
@@ -47,7 +46,7 @@ templ Modal(c echo.Context) {
 						<p>Enter your account information below to create your account.</p>
 					</div>
 					@blocks.Breadcrumbs()
-					@basicInfoForm(formstate.Initial)
+					@basicInfoForm()
 					@blocks.Spacer()
 					<div class="flex flex-col-reverse sm:flex-row sm:justify-between sm:space-x-2">
 						<button @click="modalOpen=false" type="button" class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors border rounded-md focus:outline-none focus:ring-2 focus:ring-neutral-100 focus:ring-offset-2">Cancel</button>

pkg/nebula/components/register/modal_templ.go

@@ -11,7 +11,6 @@ import templruntime "github.com/a-h/templ/runtime"
 import (
 	"github.com/labstack/echo/v4"
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
-	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
 )
 
 func Modal(c echo.Context) templ.Component {
@@ -35,7 +34,7 @@ func Modal(c echo.Context) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div x-data=\"{ modalOpen: true }\" @keydown.escape.window=\"modalOpen = false\" :class=\"{ &#39;z-40&#39;: modalOpen }\" class=\"relative w-auto h-auto\"><template x-teleport=\"body\"><div x-show=\"modalOpen\" class=\"fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen\" x-cloak><div x-show=\"modalOpen\" x-transition:enter=\"ease-out duration-300\" x-transition:enter-start=\"opacity-0\" x-transition:enter-end=\"opacity-100\" x-transition:leave=\"ease-in duration-300\" x-transition:leave-start=\"opacity-100\" x-transition:leave-end=\"opacity-0\" @click=\"modalOpen=false\" class=\"absolute inset-0 w-full h-full bg-zinc-900 bg-opacity-50 backdrop-blur-sm\"></div><div x-show=\"modalOpen\" x-trap.inert.noscroll=\"modalOpen\" x-transition:enter=\"ease-out duration-300\" x-transition:enter-start=\"opacity-0 scale-90\" x-transition:enter-end=\"opacity-100 scale-100\" x-transition:leave=\"ease-in duration-200\" x-transition:leave-start=\"opacity-100 scale-100\" x-transition:leave-end=\"opacity-0 scale-90\" class=\"relative w-full py-6 bg-white shadow-md px-7 bg-opacity-90 drop-shadow-md backdrop-blur-sm sm:max-w-lg sm:rounded-lg\"><div class=\"flex items-center justify-between pb-3\"><h3 class=\"text-lg font-semibold\">Account Registration</h3><button @click=\"modalOpen=false\" class=\"absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-zinc-600 rounded-full hover:text-zinc-800 hover:bg-zinc-50\"><svg class=\"w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke-width=\"1.5\" stroke=\"currentColor\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M6 18L18 6M6 6l12 12\"></path></svg></button></div><div class=\"relative w-auto pb-8\"><p>Enter your account information below to create your account.</p></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div x-data=\"{ modalOpen: true }\" @keydown.escape=\"modalOpen=false\" :class=\"{ &#39;z-40&#39;: modalOpen }\" class=\"relative w-auto h-auto\"><template x-teleport=\"body\"><div x-show=\"modalOpen\" class=\"fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen\" x-cloak><div x-show=\"modalOpen\" x-transition:enter=\"ease-out duration-300\" x-transition:enter-start=\"opacity-0\" x-transition:enter-end=\"opacity-100\" x-transition:leave=\"ease-in duration-300\" x-transition:leave-start=\"opacity-100\" x-transition:leave-end=\"opacity-0\" @click=\"modalOpen=false\" class=\"absolute inset-0 w-full h-full bg-zinc-900 bg-opacity-50 backdrop-blur-sm\"></div><div x-show=\"modalOpen\" x-trap.inert.noscroll=\"modalOpen\" x-transition:enter=\"ease-out duration-300\" x-transition:enter-start=\"opacity-0 scale-90\" x-transition:enter-end=\"opacity-100 scale-100\" x-transition:leave=\"ease-in duration-200\" x-transition:leave-start=\"opacity-100 scale-100\" x-transition:leave-end=\"opacity-0 scale-90\" class=\"relative w-full py-6 bg-white shadow-md px-7 bg-opacity-90 drop-shadow-md backdrop-blur-sm sm:max-w-lg sm:rounded-lg\"><div class=\"flex items-center justify-between pb-3\"><h3 class=\"text-lg font-semibold\">Account Registration</h3><button @click=\"modalOpen=false\" class=\"absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-zinc-600 rounded-full hover:text-zinc-800 hover:bg-zinc-50\"><svg class=\"w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke-width=\"1.5\" stroke=\"currentColor\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M6 18L18 6M6 6l12 12\"></path></svg></button></div><div class=\"relative w-auto pb-8\"><p>Enter your account information below to create your account.</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -43,7 +42,7 @@ func Modal(c echo.Context) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = basicInfoForm(formstate.Initial).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = basicInfoForm().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

pkg/nebula/components/register/view.templ

@@ -1,31 +1,11 @@
 package register
 
-import (
+templ basicInfoForm() {
-	"github.com/labstack/echo/v4"
+	<div class="border rounded-lg shadow-sm bg-card text-zinc-900">
-	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
+		<div class="flex flex-col space-y-1.5 p-6"></div>
-	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
+		<div class="p-6 pt-0 space-y-2">
-)
+			<div class="space-y-1"><label class="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="name">Name</label><input type="text" id="name" placeholder="Adam Wathan" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/></div>
-
+			<div class="space-y-1"><label class="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="username">Handle</label><input type="text" id="handle" placeholder="angelo.snr" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/></div>
-templ View(c echo.Context) {
+		</div>
-	@blocks.Layout("Sonr.ID", true) {
+	</div>
-		@blocks.Card("register-view", blocks.SizeMedium) {
-			@blocks.Spacer()
-			@blocks.Breadcrumbs()
-			@basicInfoForm(formstate.Initial)
-			@blocks.Spacer()
-		}
-	}
-}
-
-templ basicInfoForm(state formstate.FormState) {
-	switch (state) {
-		default:
-			<div class="border rounded-lg shadow-sm bg-card text-zinc-900">
-				<div class="flex flex-col space-y-1.5 p-6"></div>
-				<div class="p-6 pt-0 space-y-2">
-					<div class="space-y-1"><label class="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="name">Name</label><input type="text" id="name" placeholder="Adam Wathan" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/></div>
-					<div class="space-y-1"><label class="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="username">Handle</label><input type="text" id="handle" placeholder="angelo.snr" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/></div>
-				</div>
-			</div>
-	}
 }

pkg/nebula/components/register/view_templ.go

@@ -8,13 +8,7 @@ package register
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import (
+func basicInfoForm() templ.Component {
-	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
-	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
-)
-
-func View(c echo.Context) 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 {
@@ -35,67 +29,7 @@ func View(c echo.Context) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"border rounded-lg shadow-sm bg-card text-zinc-900\"><div class=\"flex flex-col space-y-1.5 p-6\"></div><div class=\"p-6 pt-0 space-y-2\"><div class=\"space-y-1\"><label class=\"text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70\" for=\"name\">Name</label><input type=\"text\" id=\"name\" placeholder=\"Adam Wathan\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"></div><div class=\"space-y-1\"><label class=\"text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70\" for=\"username\">Handle</label><input type=\"text\" id=\"handle\" placeholder=\"angelo.snr\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"></div></div></div>")
-			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 {
-				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 := 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 {
-					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_Err = blocks.Spacer().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 = blocks.Breadcrumbs().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 = basicInfoForm(formstate.Initial).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 = blocks.Spacer().Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				return templ_7745c5c3_Err
-			})
-			templ_7745c5c3_Err = blocks.Card("register-view", blocks.SizeMedium).Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			return templ_7745c5c3_Err
-		})
-		templ_7745c5c3_Err = blocks.Layout("Sonr.ID", true).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -103,36 +37,4 @@ func View(c echo.Context) templ.Component {
 	})
 }
 
-func basicInfoForm(state formstate.FormState) 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)
-		switch state {
-		default:
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"border rounded-lg shadow-sm bg-card text-zinc-900\"><div class=\"flex flex-col space-y-1.5 p-6\"></div><div class=\"p-6 pt-0 space-y-2\"><div class=\"space-y-1\"><label class=\"text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70\" for=\"name\">Name</label><input type=\"text\" id=\"name\" placeholder=\"Adam Wathan\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"></div><div class=\"space-y-1\"><label class=\"text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70\" for=\"username\">Handle</label><input type=\"text\" id=\"handle\" placeholder=\"angelo.snr\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md peer border-zinc-300 ring-offset-background placeholder:text-zinc-400 focus:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"></div></div></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
 var _ = templruntime.GeneratedTemplate

pkg/nebula/components/ui/button.templ

@@ -0,0 +1,13 @@
+package ui
+
+templ PrimaryButton(href string, text string) {
+	<div>
+		<div class="btn cursor-pointer text-zinc-100 bg-zinc-900 hover:bg-zinc-800 w-full shadow" hx-swap="afterend" hx-get={ href }>{ text }</div>
+	</div>
+}
+
+templ SecondaryButton(href string, text string) {
+	<div>
+		<div class="btn cursor-pointer text-zinc-600 bg-white hover:text-zinc-900 w-full shadow" hx-swap="afterend" hx-get={ href }>{ text }</div>
+	</div>
+}

pkg/nebula/components/ui/button_templ.go

@@ -0,0 +1,121 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.778
+package ui
+
+//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"
+
+func PrimaryButton(href string, 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_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("<div><div class=\"btn cursor-pointer text-zinc-100 bg-zinc-900 hover:bg-zinc-800 w-full shadow\" hx-swap=\"afterend\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(href)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/ui/button.templ`, Line: 5, Col: 124}
+		}
+		_, 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
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(text)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/ui/button.templ`, Line: 5, Col: 133}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func SecondaryButton(href string, 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_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("<div><div class=\"btn cursor-pointer text-zinc-600 bg-white hover:text-zinc-900 w-full shadow\" hx-swap=\"afterend\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(href)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/ui/button.templ`, Line: 11, Col: 123}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		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_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(text)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/nebula/components/ui/button.templ`, Line: 11, Col: 132}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

pkg/nebula/models/Bento.pkl.go

@@ -0,0 +1,12 @@
+// 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"`
+}

pkg/nebula/models/CallToAction.pkl.go

@@ -0,0 +1,12 @@
+// 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"`
+}

pkg/nebula/models/Feature.pkl.go

@@ -0,0 +1,12 @@
+// 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"`
+}

pkg/nebula/models/Features.pkl.go

@@ -0,0 +1,10 @@
+// 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"`
+}

pkg/nebula/models/Form.pkl.go

@@ -0,0 +1,10 @@
+// Code generated from Pkl module `models`. DO NOT EDIT.
+package models
+
+type Form interface {
+	GetTitle() string
+
+	GetDescription() string
+
+	GetInputs() []*Input
+}

pkg/nebula/models/Hero.pkl.go

@@ -15,4 +15,6 @@ type Hero struct {
 	SecondaryButton *Button `pkl:"secondaryButton"`
 
 	Image *Image `pkl:"image"`
+
+	Stats []*Stat `pkl:"stats"`
 }

pkg/nebula/models/Highlight.pkl.go

@@ -0,0 +1,10 @@
+// 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"`
+}

pkg/nebula/models/Highlights.pkl.go

@@ -0,0 +1,10 @@
+// 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"`
+}

pkg/nebula/models/Home.pkl.go

@@ -0,0 +1,6 @@
+// Code generated from Pkl module `models`. DO NOT EDIT.
+package models
+
+type Home struct {
+	Hero *Hero `pkl:"hero"`
+}

pkg/nebula/models/Input.pkl.go

@@ -1,10 +1,12 @@
 // 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 string `pkl:"type"`
+	Type inputtype.InputType `pkl:"type"`
 
 	Placeholder string `pkl:"placeholder"`
 
@@ -14,5 +16,5 @@ type Input struct {
 
 	Help *string `pkl:"help"`
 
-	Required bool `pkl:"required"`
+	Required *bool `pkl:"required"`
 }