From b1e54648435ded91d7ca4a939b04a74f696a9197 Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Sat, 5 Oct 2024 12:41:47 -0400 Subject: [PATCH] feat: update UIUX PKL to utilize optional fields --- Makefile | 8 +- pkg/nebula/bun.lockb | Bin 48162 -> 48173 bytes pkg/nebula/nebula.pkl | 194 -------------------------------- {deploy/config => pkl}/DWN.pkl | 0 {deploy/config => pkl}/ORM.pkl | 0 {deploy/config => pkl}/Txns.pkl | 0 {deploy/config => pkl}/UIUX.pkl | 55 +-------- 7 files changed, 7 insertions(+), 250 deletions(-) rename {deploy/config => pkl}/DWN.pkl (100%) rename {deploy/config => pkl}/ORM.pkl (100%) rename {deploy/config => pkl}/Txns.pkl (100%) rename {deploy/config => pkl}/UIUX.pkl (74%) diff --git a/Makefile b/Makefile index 3eb6b51b3..b09a7528b 100644 --- a/Makefile +++ b/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" diff --git a/pkg/nebula/bun.lockb b/pkg/nebula/bun.lockb index 37a7645a877b1fddd6b8beb82011ed4cc73242a3..ea81fae4b46fd8e5fc06ac7caa97412877ee6df3 100755 GIT binary patch delta 3891 zcmai0dvKK16~FgO7WR@C33+{4LU;th0D-VsHcKF%fmA3p3RFZ5U<0fWNJ2soyP{-M zffzz~c!CV5D34SWDvww@D=-?h&QP_=DA1xdjs3$;d8p}FS!=Mr^F45;qwPQUe7|$f zJ+FK2{m%Yt+HbCD+i#ao@3K?q zgT{g18zV#p=zXz5B!Vt!Xb3he5uzLXLBNYZ6=2rDnzHPw>sFcs(NiuTR{sg%|~I zY^TMR*HzsgV#f~vb7CE)y+#qlMQbKpXm$0Y_Q(OzIZF6 z#j7iq1RI1n0?c~7pd3gUlsV&Nw!Tw=dBDuC39eoijGrik<9G%oYZ9mRP(46wd?i(CIr8_^q-Ff{AnMBrtXUqc8t6f2z+1^!P*6#x4a_#n5bSp6OZ4BoPwmK;XlpW560@Fd+mVw2f zyz&1S3hxjEf;fnBE5 zY51lQRzKB)ay5gXd~Q%PFHBx%ee8@_8Kj8Ykbk5oR-FRMkPlG^>mMkh43(-0aT_+p zk{nV*fdPg*L?Nu{6d7P>Dwe((P$Fw65ND{9xL}1)jiD~(SDypjZf-1%^Q);YAtswL z8RwS|QXt+?&w*D8o{LJM|97A=pniKrh({Q6i6C3M3nHB88F-S1pcU3iYXC^*emAFOB2?zl>5K z#gHWwN-@+gQGTmJrOAHvGSC$0^`|BvZbA0y;$5m7i0jp#Ybl#4GRRPG*gTDMcl9x% z)9zw9pF*jIYDH^voY;@Z&QLVfkRA%88S-`tVckHHG((-k1-b=V(yVeW1=0<-Z@Jq2l`bF5Em?#3n7nEAPb$9Mh|6`xE{e> zy^~K$oyFHo(*SQ7kGFsgU`qlF*r-2oT|Wex2$^;A{cvF{gi5L+pj%BDqgEhxY@PJG zK%6^5O!jN8O!{VUiCjj3Y(wqG)54weNItixL z@1@y(nL?2vhPpG$;- z#62L)yKxz)1V~ZWAiv7PZ;lae1NJQkVh`3a?x)ZQL;5I!wV9$L40UBF`UmnD^A7rl zp=>lYp;$gfkz7MXfb${64bAkc&uoOZ0o|NNp^@Cjk&%XaVz~8cApbPK`V=T&+5|$s zhi)>|DZF#@!9y*T-!&)~cbiUU7Rx0R7-h)A6vBFmB3M^;Mn}C}=sq56z1vjp9!kxhulm(qVl_xbi z>UPnyOWp2AkPtu8)KmEdtINF3j^NZBk29^z99vkib#&3s-4YLksX2%GHt3!TAhx>w zUmefBk{$CaO)m20d-KuJ`>0@}E<34lWBL&6ISobrmnP&FPV4!qYz`C)^C#pNOc1Q1 zdz^7;^{mL%v40wO81e$hC-B?Zxp55MsqT#zJkAJEU>qFz@T19DwmWDoqO+THT!%}W zbdNJ=T&j8V$-6(B^S15FC&W6+Y1VztVB&ecvHQi(ek+_?6Vt_gnbn)GZygrhhZaPTJS3%Pu+zEqg=@5B8=MjeI}%X=wTKCvq;` z^f|P8Nj>J3_t8|Wi>Uswa&TV7x{eZBbdNK~jX8H<_1Tpt7GQS)b{Aj*qtX^#wopY& zxzCx}4y;)FKED}mk28nmji34LwTjeU81h?3;-~Sgx@QLZk2~qru}@ws zo|iex4%CY>(vnuMtfyVAUd^3E@3h|L^V`a;OWTj1x_G8rlPE|&jzl=~T66!K_m&?x z@tkRdRC&jxWATedHJrY zkM~}M6?OnQXQx{^Qe&Izf1F`EJp;|d6lwFym*`4cIp)OTt-9Por?Kv$Rag&F%hoaK z3Vs*(J%(B0m6Pd9NTyTVHr?Y)dm9HXsIJ~1pR%$kKyBxfu}$|mGvo{L=dXV^{am3b zH{;ZCG5HG4USECcK8#hZ`RJ$2!o z57-*o6=|o^!tJ`pnJMSb`LKLp@0p(Oy?sSHw(FXfMMt)0`s@)h+*d7+)eSGZ2sIyy zi?%-wFMP(=zFD{Y^}E|UG`R;H{E5O{)cCmW`701VLrd>@QHCB^fLyos8JeMkW=yEHqgH{)K{EB1`?-}u$8qO`t*A9ob zn~v_#eLo^czdAGO<)!z|`((;%W!PC{?aZS-SiUj)*5^*WB`&E5a&8OkTucRz>vAsr z3|ahO{-&0dr88>ZE1&x4)~}zbv*UvmQ!aDpU08AE=6l|nH1{8~qL-m%orSGRz7c*5c@5?%95(`(j_J0YLpNj$iD<-z0;sOhDZgI4ZjRN)1AO%VM z(@~na??q6KaDc_X2h3isgR;GAT}}NXpj@sEZj-J6M!wZSPm0+|iJ497POFz9FV`Phnd$|P!0pT z45{7lOM069G#ixjoC3<{1~uctc$ybQj*661DCE-R#}vjIM}DQtatdJmkV04$g|QZs zKU$aDDS$PGLeaY8VFW#h&XY69AET=#TrFI?U<4gkKJ_iovp|uQALCPloI*Tl$YhL9 zmXg1{uC{@f51y0qp??`@1W-FhGL6FRby-6GSY7U;0M^?Siq%zb+>T#BE1qg%eUiu@ zr#q!fh}m>Z<;pn}iqqw83diZ{Z{Tt?4#WQwsOT^tN$~Gn05rtdv5&&>y1E2B7E;8D zNc!OPI1)3D1weU^&;bh}O61W>{sdk2p+JJ}oQdKOp*EGP4&opCa*&Mn$y?;_s7o&e zI_hd63U5{@Kf$No1{wmrD5?Sa9*Dgpb{y#mK>AmaS>1fwZ-Q;jwaB1UGn5VDV(Is@#Ig|<)0~l)k7hy6Dgdm zt39~h9FU~rU3}^m&|shls_E!cz3{@BGTFhWW&m-)BDoN95Ba;Ivl8j$u6fQ%+|uXx zq|_()_q1VvxAej*zy`1-76vR7MO@cYK!YGNPyUBT2$fX*adGg8fQ(TPh#i|JeFBJc zM~DeN$Act#kdh~-l0Q{fuj5f+Q4|+fode>-QB;G>lJRhuCS`Pv)ac2WJk=+o00b;L4JE`qJ+z7(B zAT2<7K#Goc@+lAAB}TXs*f$M`J(y?tIt6;_vM+_OE~9WyU0v;tCW1V|xQOX#s2vTB z&6TfEsF$wZ0nUIF*EHFuzOfJ<2()xG1$uKchkEO3eGl{LKovUs)FmLlVG{^VA9zex z@8X%81Rg4?d`?#{TyQ#;oGT}jzmF~(DS-8_6v8^aIo#(=mg}uZ^Vz0FuE(j#6-oD} z23^9ji-E^WKu79yi_u<1KzVJ*#NL<2e&t4ls=0NNQWDx$!m`RyW?= z+xT8;#BUt(MQ?^T15N%KWv7abwR}Hf92B!M24-Xq6s)4T z?P;m9AapDJ%l>aeo(cItA&RJZRX;pdS5{qe+Y>;hzNh!H6$xD}chH(Z=T~dE6E{|C zZhOwSvGC-ZlUv7~v3z9;N#k~c|U_^m* z8ff7f&25f8BDk#Gv^R&=?JYC>8&U43U28OXgpNYXn$UtN-i|rFKkKy}TG<(cIF}3b z4`{WLTI-e1(NL@tXwlk2a6ZIZL9w-(+aBZkUEE!He!=0X*qw>pnHaz*zgCmWsi?Lv z+aB6>&tLMZz{8?cXhFvdC-zvkqN(IuU;mhpv43EOPl&5@xz;OFC}CZpOr@9BX>un8 z@V_sOt50m_Wf!}s1?*P(VV&l-$FRNwp8nVUqQpBeg$`p?!mb>siXfE!rS#?LA zpZCp@rarP>Ys z)Kz>lcvNADR}P@tkmOKIgXXq}y;U8imX@xR+ste-QQOg^H)z@R2>JW=Up)MA_{A(k zZp0afi^*4T?DEq0zj?R$AS70~HL7p$BCg{Ng|dp`H}>o4$2*Tl`_V}G-N{!fwp}{= zIa@=!B5g&}HfnBrq?|PFLgBPKr&@mUcAYkD)ExITI=C@8+nOMQZKblQqQ{7@pq7o| zqV3;;7e3?r50=h7F?sV|him``pQGRrs(w{-Uj*W3Xx0lKpV$%K=yb@Bz`+MGc#ZmR z(%d{B^6Z)!efvh=k%^HGc@uKHO~FxAyh)QQXeqSpi8i%IOV5u~4{lk$b~wBZbZC>7 z{WEg(t39ILoHb?QxCGOJwn1 z^Eb52EbU2qirn_~$a_00toUHXkjq5+6jto9`GrpgkH20Jz6mY!ECl9Z(j0d^ltRhw z`0nP^98M@%@G$Gstx(I%$l{mq42>Zz`{(3Y!XBviK6YiUENGgHJAg~e$(*I_q`B<@ zx-9I!UpRlf8*m!lj|sRbDHr6X_$=`f-{h|ZeD{4DQ$~K zVhA(V;w_%EejUxe{CeWjJ(J$eP_e;G!*wj{w`XiHJE=e4-U{tZ6@ Bq0j&T diff --git a/pkg/nebula/nebula.pkl b/pkg/nebula/nebula.pkl index 6371412fc..06ac65c5b 100644 --- a/pkg/nebula/nebula.pkl +++ b/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"; - }; - }; - } }; diff --git a/deploy/config/DWN.pkl b/pkl/DWN.pkl similarity index 100% rename from deploy/config/DWN.pkl rename to pkl/DWN.pkl diff --git a/deploy/config/ORM.pkl b/pkl/ORM.pkl similarity index 100% rename from deploy/config/ORM.pkl rename to pkl/ORM.pkl diff --git a/deploy/config/Txns.pkl b/pkl/Txns.pkl similarity index 100% rename from deploy/config/Txns.pkl rename to pkl/Txns.pkl diff --git a/deploy/config/UIUX.pkl b/pkl/UIUX.pkl similarity index 74% rename from deploy/config/UIUX.pkl rename to pkl/UIUX.pkl index a7add44df..681d74bfb 100644 --- a/deploy/config/UIUX.pkl +++ b/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 + highlights: Listing } - -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 - resourcesLinks: Listing -} - class Home { hero: Hero - highlights: Listing - features: Listing - bento: Bento - lowlights: Listing - callToAction: CallToAction - footer: Footer } home : Home