Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat UI reborn #540

Merged
merged 9 commits into from
Sep 3, 2024
Merged

Feat UI reborn #540

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
78defc3
fix: https://theplanttokyo.atlassian.net/browse/KAK-3012
danni-cool Aug 30, 2024
866ddbc
fix: https://theplanttokyo.atlassian.net/browse/KAK-3012
danni-cool Aug 30, 2024
251dacc
Merge branch 'feat-ui-reborn' of github.com:qor5/admin into feat-ui-r…
danni-cool Aug 30, 2024
7f528aa
chore: 🤖 update the version of x
danni-cool Aug 30, 2024
9403a58
chore: 🤖 update the version of x
danni-cool Aug 30, 2024
dac4541
chore: 🤖 review code
danni-cool Sep 2, 2024
5f44098
test: Coverage test
danni-cool Sep 2, 2024
9eb112e
test: Improve test cases
danni-cool Sep 3, 2024
e0c80a9
test: improve test case
danni-cool Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
github.com/qor5/x/v3 v3.0.8
github.com/qor5/x/v3 v3.0.9-0.20240830095515-24fddd1fdf8f
github.com/samber/lo v1.47.0
github.com/shurcooL/sanitized_anchor_name v1.0.0
github.com/spf13/cast v1.6.0
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,10 @@ github.com/qor5/web/v3 v3.0.7 h1:1+Ezbl+1m9oZ4S1kcFKybyi6at6qxoY7eJqjb3JETQQ=
github.com/qor5/web/v3 v3.0.7/go.mod h1:32vdHHcZb2JimlcaclW9hLUyimdXjrllZDHTh3rl6d0=
github.com/qor5/x/v3 v3.0.8 h1:orSn34zBSBlAvumWyvmPxjXb8blJ2qGKHZy+8x4Y0gQ=
github.com/qor5/x/v3 v3.0.8/go.mod h1:a+cSXd5UjIOgzhhpvfDxDUdjmKLKeDLeoubcQ9dkxtE=
github.com/qor5/x/v3 v3.0.9-0.20240830065723-63a1ee683f35 h1:S0PNHelYvywRb1gnytDIeU6ICHcpXGK2CYTHSk1HiIY=
github.com/qor5/x/v3 v3.0.9-0.20240830065723-63a1ee683f35/go.mod h1:a+cSXd5UjIOgzhhpvfDxDUdjmKLKeDLeoubcQ9dkxtE=
github.com/qor5/x/v3 v3.0.9-0.20240830095515-24fddd1fdf8f h1:tUAw2vElX+1hHdrzIu+P3H9+BAGnDbXBqI3gPgGNznE=
github.com/qor5/x/v3 v3.0.9-0.20240830095515-24fddd1fdf8f/go.mod h1:a+cSXd5UjIOgzhhpvfDxDUdjmKLKeDLeoubcQ9dkxtE=
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=
Expand Down
2 changes: 1 addition & 1 deletion presets/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ var Messages_en_US = &Messages{
EditingObjectTitleTemplate: "Editing {modelName} {id}",
ListingObjectTitleTemplate: "Listing {modelName}",
DetailingObjectTitleTemplate: "{modelName} {id}",
FiltersClear: "Clear Filters",
FiltersClear: "Reset",
FiltersAdd: "Add Filters",
FilterApply: "Apply",
FilterByTemplate: "Filter by {filter}",
Expand Down
5 changes: 1 addition & 4 deletions presets/row_menu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,7 @@
return nil
}
return VListItem(
web.Slot(
VIcon(b.icon),
).Name("prepend"),

h.If(b.icon != "", web.Slot(VIcon(b.icon)).Name("prepend")),

Check warning on line 140 in presets/row_menu.go

View check run for this annotation

Codecov / codecov/patch

presets/row_menu.go#L140 

Added line #L140 was not covered by tests
VListItemTitle(h.Text(i18n.PT(ctx.R, ModelsI18nModuleKey, strcase.ToCamel(b.rmb.mb.label+" RowMenuItem"), b.name))),
).Attr("@click", web.Plaid().
EventFunc(b.eventID).
Expand Down
Loading