Skip to content

Commit ebb89ed

Browse files
authored
Merge pull request #77 from admin-golang/infinity-scrolling-improvements
templates: infinity scrolling ui and types improvements.
2 parents 1e1abd0 + 8ba8e32 commit ebb89ed

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

examples/infinity-scrolling/main.go

+5-12
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,22 @@ package main
33
import (
44
"log"
55
"net/http"
6-
"net/url"
76

87
"github.com/admin-golang/admin"
98
"github.com/admin-golang/admin/icon"
109
"github.com/admin-golang/admin/layout"
1110
)
1211

13-
func NewSubscribeFormPage() (admin.Pager, error) {
14-
sideFormBackgroundImage, err := url.Parse("https://source.unsplash.com/random/?golang")
15-
if err != nil {
16-
return nil, err
17-
}
18-
19-
return admin.NewSideFormPage(admin.SideFormPageConfig{
20-
BackgroundImage: sideFormBackgroundImage,
12+
func NewInfinityListPage() (admin.Pager, error) {
13+
return admin.NewIInfinityListPage(admin.IInfinityListPageConfig{
2114
PageConfig: admin.PageConfig{
2215
Icon: icon.Icon{
2316
Type: icon.Email,
2417
},
2518
IsDefault: true,
2619
ID: "Home",
2720
URL: "/",
28-
Type: admin.SideFormPage,
21+
Type: admin.InfinityListPage,
2922
},
3023
Form: admin.Form{
3124
ID: "Text",
@@ -44,13 +37,13 @@ func NewSubscribeFormPage() (admin.Pager, error) {
4437
}
4538

4639
func main() {
47-
subscribeFormPage, err := NewSubscribeFormPage()
40+
infinityListPage, err := NewInfinityListPage()
4841
if err != nil {
4942
log.Fatal(err)
5043
}
5144

5245
pages := admin.Pages{
53-
subscribeFormPage,
46+
infinityListPage,
5447
}
5548

5649
admin := admin.New(&admin.Config{

templates/materialUI.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -1933,14 +1933,17 @@ function [[ .ID ]]InfinityList({ handleSetAppState }) {
19331933
control={<Checkbox value="remember" color="primary" />}
19341934
label="Remember me"
19351935
/>*/}
1936+
[[ if eq .Form.Submit.Label "" ]]
1937+
[[ else ]]
19361938
<Button
19371939
type="submit"
19381940
fullWidth
19391941
variant="contained"
19401942
sx={{ mt: 3, mb: 2 }}
19411943
>
19421944
[[ .Form.Submit.Label ]]
1943-
</Button>
1945+
</Button>
1946+
[[ end ]]
19441947
<Grid container>
19451948
<Grid item xs>
19461949
{/*<Link href="#" variant="body2">

0 commit comments

Comments
 (0)