Merge pull request #519 from qor5/feat-ui-reborn

Feat UI reborn
qor5 · Aug 23, 2024 · b651b7c · b651b7c
2 parents 08fb15c + 0b4ab92
commit b651b7c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/pquerna/otp v1.4.0
 	github.com/qor/oss v0.0.0-20240729105053-88484a799a79
 	github.com/qor5/web/v3 v3.0.7-0.20240823021609-53fc3c71f073
-	github.com/qor5/x/v3 v3.0.8-0.20240822084601-035b0043ea88
+	github.com/qor5/x/v3 v3.0.8-0.20240823085854-aeb16cd90fe1
 	github.com/samber/lo v1.47.0
 	github.com/shurcooL/sanitized_anchor_name v1.0.0
 	github.com/spf13/cast v1.6.0

diff --git a/go.sum b/go.sum
@@ -321,6 +321,8 @@ github.com/qor5/web/v3 v3.0.7-0.20240823021609-53fc3c71f073 h1:RUarY7aCCG6s5lLdY
 github.com/qor5/web/v3 v3.0.7-0.20240823021609-53fc3c71f073/go.mod h1:32vdHHcZb2JimlcaclW9hLUyimdXjrllZDHTh3rl6d0=
 github.com/qor5/x/v3 v3.0.8-0.20240822084601-035b0043ea88 h1:BF/DFxKPKZbnjZsmbhr6LfR1tmerNBvhADu0gIy13HI=
 github.com/qor5/x/v3 v3.0.8-0.20240822084601-035b0043ea88/go.mod h1:aLBRfhcgVnpGmMOTyXLCoOyPOYUpYNZ9T8YyNPqCuVM=
+github.com/qor5/x/v3 v3.0.8-0.20240823085854-aeb16cd90fe1 h1:B82jNhB62Evg1KAL0I64Y9MOY2NowPsD4rk51LIDEgQ=
+github.com/qor5/x/v3 v3.0.8-0.20240823085854-aeb16cd90fe1/go.mod h1:aLBRfhcgVnpGmMOTyXLCoOyPOYUpYNZ9T8YyNPqCuVM=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=

diff --git a/presets/detailing.go b/presets/detailing.go
@@ -256,7 +256,7 @@ func (b *DetailingBuilder) defaultPageFunc(ctx *web.EventContext) (r web.PageRes
 			actionButtonsCompo,
 			tabsContent,
 		),
-	).Fluid(true).Class("px-0 pt-0")
+	).Fluid(true).Class("px-0 pt-0 detailing-page-wrap")
 
 	return
 }
@@ -305,7 +305,7 @@ func (b *DetailingBuilder) showInDrawer(ctx *web.EventContext) (r web.EventRespo
 	comp := web.Scope(
 		VLayout(
 			VAppBar(
-				VAppBarTitle(header).Class("pl-2"),
+				VAppBarTitle(header).Class("pl-2 drawer-title"),
 				VBtn("").Icon("mdi-close").
 					Attr("@click.stop", closeBtnVarScript),
 			).Color("white").Elevation(0),

diff --git a/presets/listing_compo.go b/presets/listing_compo.go
@@ -159,7 +159,7 @@ func (c *ListingCompo) MarshalHTML(ctx context.Context) (r []byte, err error) {
 			h.Div(
 				c.toolbarSearch(ctx),
 			),
-			VCardText().Class("px-2 pt-2").Children(
+			VCardText().Class("list-table-wrap").Children(
 				c.dataTable(ctx),
 			),
 			h.Div(

diff --git a/presets/nested_many.go b/presets/nested_many.go
@@ -119,7 +119,7 @@ func (b *ListingBuilder) nestedManyComponent(evCtx *web.EventContext,
 		return r, err
 	}
 	if titleCompo == nil {
-		titleCompo = h.Div().Attr("v-pre", true).Text(title)
+		titleCompo = h.H2(title).Attr("v-pre", true).Class("section-title")
 	}
 
 	evCtx.WithContextValue(ctxInDialog, true)
@@ -137,8 +137,8 @@ func (b *ListingBuilder) nestedManyComponent(evCtx *web.EventContext,
 		}
 	}
 	return web.Scope().VSlot("{ form }").Children(
-		VCard().Elevation(0).Children(
-			VCardTitle().Class("d-flex align-center").Children(
+		h.Div(
+			h.Div().Class("d-flex align-center section-title-wrap mb-0").Children(		
 				titleCompo,
 				VSpacer(),
 				h.Div().Id(compo.ActionsComponentTeleportToID()),