bump: version 0.5.8 → 0.5.9

.cz.toml

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

.github/workflows/publish-assets.yml

@@ -37,7 +37,7 @@ jobs:
           r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
           r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
           r2-bucket: pkljar
-          source-dir: deploy/config
+          source-dir: pkl
           destination-dir: .
 
   upload_nebula_cdn:

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 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

Makefile

@@ -315,10 +315,10 @@ nebula:
 
 pkl:
 	@echo "(pkl) Building PKL"
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./deploy/config/DWN.pkl
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./deploy/config/ORM.pkl
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./deploy/config/Txns.pkl
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./deploy/config/UIUX.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/DWN.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/ORM.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/Txns.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/UIUX.pkl
 
 start-caddy:
 	@echo "(start-caddy) Starting caddy"

configs/logs.json

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

devbox.json

@@ -43,6 +43,9 @@
       "build:nebula": [
         "make nebula"
       ],
+      "build:motr": [
+        "make motr"
+      ],
       "build:sonrd": [
         "make motr",
         "make build"
@@ -61,33 +64,11 @@
       "gen:templ": [
         "make templ"
       ],
-      "start:hway": [
-        "make templ",
-        "make hway",
-        "make start-hway"
-      ],
-      "start:testnet": [
-        "make templ",
-        "make install",
-        "make sh-testnet"
-      ],
       "start": [
         "process-compose up -f ./deploy/testnet/process-compose.yaml"
       ],
       "stop": [
         "process-compose down -f ./deploy/testnet/process-compose.yaml"
-      ],
-      "test:e2e": [
-        "make templ",
-        "make test-e2e"
-      ],
-      "test:unit": [
-        "make templ",
-        "make test-unit"
-      ],
-      "test": [
-        "make templ",
-        "make test"
       ]
     }
   }

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/dwn.pkl

@@ -0,0 +1,31 @@
+amends "https://pkl.sh/DWN.pkl";
+
+dwn = new Config {
+	ipfs = new IPFS {
+		apiUrl = "https://api.sonr-ipfs.land";
+		gatewayUrl = "https://ipfs.sonr.land";
+	};
+	sonr = new Sonr {
+		apiUrl = "https://api.sonr.land";
+		grpcUrl = "https://grpc.sonr.land";
+		rpcUrl = "https://rpc.sonr.land";
+		webSocketUrl = "wss://rpc.sonr.land/ws";
+		chainId = "sonr";
+	};
+	motr = new Motr {
+		keyshare = JSON.parse(keyshare);
+		address = address;
+		origin = "sonr.id";
+	};
+	schema = new Schema {
+		version = 1;
+		account = "account";
+		asset = "asset";
+		chain = "chain";
+		credential = "credential";
+		jwk = "jwk";
+		grant = "grant";
+		keyshare = "keyshare";
+		profile = "profile";
+	};
+};

pkg/nebula/models/Feature.pkl.go

@@ -6,7 +6,7 @@ type Feature struct {
 
 	Description string `pkl:"description"`
 
-	Icon string `pkl:"icon"`
+	Icon *string `pkl:"icon"`
 
 	Image *Image `pkl:"image"`
 }

pkg/nebula/models/Highlights.pkl.go

@@ -6,5 +6,5 @@ type Highlights struct {
 
 	Subheading string `pkl:"subheading"`
 
-	Highlights []*Highlight `pkl:"highlights"`
+	Highlights []*Feature `pkl:"highlights"`
 }

pkg/nebula/models/Home.pkl.go

@@ -3,16 +3,4 @@ package models
 
 type Home struct {
 	Hero *Hero `pkl:"hero"`
-
-	Highlights []*Highlight `pkl:"highlights"`
-
-	Features []*Features `pkl:"features"`
-
-	Bento *Bento `pkl:"bento"`
-
-	Lowlights []*Lowlights `pkl:"lowlights"`
-
-	CallToAction *CallToAction `pkl:"callToAction"`
-
-	Footer *Footer `pkl:"footer"`
 }

pkg/nebula/models/init.pkl.go

@@ -10,15 +10,9 @@ func init() {
 	pkl.RegisterMapping("models#Button", Button{})
 	pkl.RegisterMapping("models#Image", Image{})
 	pkl.RegisterMapping("models#Stat", Stat{})
-	pkl.RegisterMapping("models#Highlight", Highlight{})
-	pkl.RegisterMapping("models#Features", Features{})
-	pkl.RegisterMapping("models#Bento", Bento{})
-	pkl.RegisterMapping("models#Lowlights", Lowlights{})
-	pkl.RegisterMapping("models#CallToAction", CallToAction{})
-	pkl.RegisterMapping("models#Footer", Footer{})
-	pkl.RegisterMapping("models#SocialLink", SocialLink{})
-	pkl.RegisterMapping("models#Link", Link{})
 	pkl.RegisterMapping("models#Input", Input{})
+	pkl.RegisterMapping("models#Link", Link{})
+	pkl.RegisterMapping("models#SocialLink", SocialLink{})
 	pkl.RegisterMapping("models#Feature", Feature{})
 	pkl.RegisterMapping("models#Highlights", Highlights{})
 }

pkg/nebula/nebula.pkl

@@ -36,198 +36,4 @@ home = new Home {
 			}
 		};
 	};
-
-	// Highlights
-	highlights {
-		new Highlight {
-			title = "Simplified";
-			description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-			image = new Image {
-				src = "https://cdn.sonr.id/img/highlight-1.svg";
-				width = "500";
-				height = "500";
-			};
-		};
-		new Highlight {
-			title = "Simplified";
-			description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-			image = new Image {
-				src = "https://cdn.sonr.id/img/highlight-2.svg";
-				width = "500";
-				height = "500";
-			};
-		};
-	};	
-
-	// Features
-	features {
-		new Features {
-			title = "Simplified";
-			description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-			image = new Image {
-				src = "https://cdn.sonr.id/img/feature-1.svg";
-				width = "500";
-				height = "500";
-			};
-		};
-		new Features {
-			title = "Simplified";
-			description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-			image = new Image {
-				src = "https://cdn.sonr.id/img/feature-2.svg";
-				width = "500";
-				height = "500";
-			};
-		};
-		new Features {
-			title = "Simplified";
-			description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-			image = new Image {
-				src = "https://cdn.sonr.id/img/feature-3.svg";
-				width = "500";
-				height = "500";
-			};
-		};
-	};
-
-	// Bento
-	bento = new Bento {
-		title = "Simplified";
-		description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-		primaryButton = new Button {
-			text = "Get Started";
-			href = "/register";
-		};
-		secondaryButton = new Button {
-			text = "Learn More";
-			href = "/about";
-		};
-	};
-
-	// Lowlights
-	lowlights {
-		new Lowlights {
-			title = "Simplified";
-			description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-			image = new Image {
-				src = "https://cdn.sonr.id/img/lowlight-1.svg";
-				width = "500";
-				height = "500";
-			};
-		};
-		new Lowlights {
-			title = "Simplified";
-			description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-			image = new Image {
-				src = "https://cdn.sonr.id/img/lowlight-2.svg";
-				width = "500";
-				height = "500";
-			};
-		};
-	};	
-
-	// Call to Action
-	callToAction = new CallToAction {
-		title = "Simplified";
-		description = "Sonr is a modern re-imagination of online user identity, empowering users to take ownership of their digital footprint and unlocking a new era of self-sovereignty.";
-		primaryButton = new Button {
-			text = "Get Started";
-			href = "/register";
-		};
-		secondaryButton = new Button {
-			text = "Learn More";
-			href = "/about";
-		};
-	};
-
-	// Footer
-	footer = new Footer {
-		logo = new Image {
-			src = "https://cdn.sonr.id/img/logo.svg";
-			width = "500";
-			height = "500";
-		};
-
-		mediumLink = new SocialLink {
-			link = new Link {
-				text = "Medium";
-				href = "https://medium.com/sonr-io";
-			};
-			icon = "https://cdn.sonr.id/img/medium.svg";
-		};
-
-		twitterLink = new SocialLink {
-			link = new Link {
-				text = "Twitter";
-				href = "https://twitter.com/sonr";
-			};
-			icon = "https://cdn.sonr.id/img/twitter.svg";
-		};
-
-		discordLink = new SocialLink {
-			link = new Link {
-				text = "Discord";
-				href = "https://discord.com/invite/sonr";
-			};
-			icon = "https://cdn.sonr.id/img/discord.svg";
-		};
-
-		githubLink = new SocialLink {
-			link = new Link {
-				text = "GitHub";
-				href = "https://github.com/sonr-io";
-			};
-			icon = "https://cdn.sonr.id/img/github.svg";
-		};
-
-		companyLinks {
-			new Link {
-				text = "About";
-				href = "https://sonr.io/about";
-			};
-			new Link {
-				text = "Careers";
-				href = "https://sonr.io/careers";
-			};
-			new Link {
-				text = "Partners";
-				href = "https://sonr.io/partners";
-			};
-			new Link {
-				text = "Investors";
-				href = "https://sonr.io/investors";
-			};
-			new Link {
-				text = "Newsroom";
-				href = "https://sonr.io/newsroom";
-			};
-			new Link {
-				text = "Blog";
-				href = "https://sonr.io/blog";
-			};
-		};
-
-		resourcesLinks {
-			new Link {
-				text = "Docs";
-				href = "https://docs.sonr.io";
-			};
-			new Link {
-				text = "Whitepaper";
-				href = "https://sonr.io/whitepaper";
-			};
-			new Link {
-				text = "FAQ";
-				href = "https://sonr.io/faq";
-			};
-			new Link {
-				text = "Terms of Service";
-				href = "https://sonr.io/terms";
-			};
-			new Link {
-				text = "Privacy Policy";
-				href = "https://sonr.io/privacy";
-			};
-		};
-	}	
 };

pkl/DWN.pkl

@@ -6,92 +6,43 @@ import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl"
 
 typealias JSON = String
 
-class JsonField extends go.Field {
-  structTags {
-    ["json"] = "%{name},omitempty"
-  }
-}
-
 class Config {
-  @JsonField
   ipfs: IPFS
-
-  @JsonField
   sonr: Sonr
-
-  @JsonField
   motr: Motr
-
-  @JsonField
   schema: Schema
-
-  @JsonField
   proxyUrl: String
 }
 
 class IPFS {
-  @JsonField
   apiUrl: String
-  
-  @JsonField
   gatewayUrl: String
 }
 
 class Motr {
-  @JsonField
   keyshare: JSON
-  
-  @JsonField
   address: String
-  
-  @JsonField
   origin: String
 }
 
 class Schema {
   version: Int
-
-  @JsonField
   account: String
-  
-  @JsonField
   asset: String
-  
-  @JsonField
   chain: String
-  
-  @JsonField
   credential: String
-
-  @JsonField
   jwk: String
-  
-  @JsonField
   grant: String
-  
-  @JsonField
   keyshare: String
-
-  @JsonField
   profile: String
 }
 
 class Sonr {
-  @JsonField
   apiUrl: String
-
-  @JsonField
   grpcUrl: String
-
-  @JsonField
   rpcUrl: String
-
-  @JsonField
   webSocketUrl: String
-
-  @JsonField
   chainId: String
 }
 
-
-
+dwn : Config

pkl/UIUX.pkl

@@ -54,14 +54,8 @@ class SocialLink {
 class Feature {
 	title: String
 	description: String
-	icon: String
-	image: Image
-}
-
-class Highlight {
-	title: String
-	description: String
-	image: Image
+	icon: String?
+	image: Image?
 }
 
 class Stat {
@@ -87,53 +81,10 @@ class Hero {
 class Highlights {
 	heading: String
 	subheading: String
-	highlights: Listing<Highlight>
+	highlights: Listing<Feature>
 }
-
-class Features {
-	title: String
-	description: String
-	image: Image
-}
-
-class Bento {
-	title: String
-	description: String
-	primaryButton: Button
-	secondaryButton: Button
-}
-
-class Lowlights {
-	title: String
-	description: String
-	image: Image
-}
-
-class CallToAction {
-	title: String
-	description: String
-	primaryButton: Button
-	secondaryButton: Button
-}
-
-class Footer {
-	logo: Image
-	mediumLink: SocialLink
-	twitterLink: SocialLink
-	discordLink: SocialLink
-	githubLink: SocialLink
-	companyLinks: Listing<Link>
-	resourcesLinks: Listing<Link>
-}
-
 class Home {
 	hero: Hero
-	highlights: Listing<Highlight>
-	features: Listing<Features>
-	bento: Bento
-	lowlights: Listing<Lowlights>
-	callToAction: CallToAction
-	footer: Footer
 }
 
 home : Home