Skip to content

Refactor some frontend problems #32646

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

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Refactor some frontend problems #32646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd42259
fix
wxiaoguang Nov 26, 2024
83ced77
Merge branch 'main' into refactor-common-button
wxiaoguang Nov 26, 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 routers/web/admin/emails.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func ActivateEmail(ctx *context.Context) {

// DeleteEmail serves a POST request for delete a user's email
func DeleteEmail(ctx *context.Context) {
u, err := user_model.GetUserByID(ctx, ctx.FormInt64("Uid"))
u, err := user_model.GetUserByID(ctx, ctx.FormInt64("uid"))
if err != nil || u == nil {
ctx.ServerError("GetUserByID", err)
return
Expand Down
4 changes: 2 additions & 2 deletions routers/web/devtest/devtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ func List(ctx *context.Context) {
var subNames []string
for _, tmplName := range templateNames {
subName := strings.TrimSuffix(tmplName, ".tmpl")
if subName != "list" {
if !strings.HasPrefix(subName, "devtest-") {
subNames = append(subNames, subName)
}
}
ctx.Data["SubNames"] = subNames
ctx.HTML(http.StatusOK, "devtest/list")
ctx.HTML(http.StatusOK, "devtest/devtest-list")
}

func FetchActionTest(ctx *context.Context) {
Expand Down
55 changes: 20 additions & 35 deletions templates/admin/emails/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,21 @@
<td>{{svg (Iif .IsPrimary "octicon-check" "octicon-x")}}</td>
<td>
{{if .CanChange}}
<a class="link-email-action" href data-uid="{{.UID}}"
data-email="{{.Email}}"
data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
<a class="show-modal" href data-modal="#change-email-modal" data-modal-uid="{{.UID}}"
data-modal-email="{{.Email}}"
data-modal-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
data-modal-activate="{{if .IsActivated}}0{{else}}1{{end}}">
{{svg (Iif .IsActivated "octicon-check" "octicon-x")}}
</a>
{{else}}
{{svg (Iif .IsActivated "octicon-check" "octicon-x")}}
{{end}}
</td>
<td>
<div class="tw-flex tw-gap-2">
<a class="delete-button" href="" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-data-uid="{{.UID}}">{{svg "octicon-trash"}}</a>
</div>
<a class="link-action negative" href data-url="{{$.Link}}/delete?id={{.ID}}&uid={{.UID}}"
data-modal-confirm-header="{{ctx.Locale.Tr "admin.emails.delete"}}"
data-modal-confirm-content="{{ctx.Locale.Tr "admin.emails.delete_desc"}}"
>{{svg "octicon-trash"}}</a>
</td>
</tr>
{{end}}
Expand All @@ -77,40 +78,24 @@
<div class="header">
{{ctx.Locale.Tr "admin.emails.change_email_header"}}
</div>
<div class="content">
<form class="content ui form" action="{{AppSubUrl}}/-/admin/emails/activate" method="post">
<p class="center">{{ctx.Locale.Tr "admin.emails.change_email_text"}}</p>

<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/-/admin/emails/activate" method="post">
{{$.CsrfTokenHtml}}
{{$.CsrfTokenHtml}}

<input type="hidden" id="query-sort" name="sort" value="{{.SortType}}">
<input type="hidden" id="query-keyword" name="q" value="{{.Keyword}}">
<input type="hidden" id="query-primary" name="is_primary" value="{{.IsPrimary}}" required>
<input type="hidden" id="query-activated" name="is_activated" value="{{.IsActivated}}" required>
<input type="hidden" name="sort" value="{{.SortType}}">
<input type="hidden" name="q" value="{{.Keyword}}">
<input type="hidden" name="is_primary" value="{{.IsPrimary}}">
<input type="hidden" name="is_activated" value="{{.IsActivated}}">

<input type="hidden" id="form-uid" name="uid" value="" required>
<input type="hidden" id="form-email" name="email" value="" required>
<input type="hidden" id="form-primary" name="primary" value="" required>
<input type="hidden" id="form-activate" name="activate" value="" required>
<input type="hidden" name="uid">
<input type="hidden" name="email">
<input type="hidden" name="primary">
<input type="hidden" name="activate">

<div class="center">
{{template "base/modal_actions_confirm" .}}
</div>
</form>
</div>
{{template "base/modal_actions_confirm" .}}
</form>
</div>

</div>

<div class="ui g-modal-confirm delete modal">
<div class="header">
{{svg "octicon-trash"}}
{{ctx.Locale.Tr "admin.emails.delete"}}
</div>
<div class="content">
{{ctx.Locale.Tr "admin.emails.delete_desc"}}
</div>
{{template "base/modal_actions_confirm" .}}
</div>

{{template "admin/layout_footer" .}}
3 changes: 3 additions & 0 deletions templates/devtest/devtest-footer.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{{/* TODO: the devtest.js is isolated from index.js, so no module is shared and many index.js functions do not work in devtest.ts */}}
<script src="{{AssetUrlPrefix}}/js/devtest.js?v={{AssetVersion}}"></script>
{{template "base/footer" dict}}
2 changes: 2 additions & 0 deletions templates/devtest/devtest-header.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{{template "base/head" dict}}
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
6 changes: 2 additions & 4 deletions templates/devtest/list.tmpl → templates/devtest/devtest-list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{template "base/head" .}}

{{template "devtest/devtest-header"}}
<ul>
{{range .SubNames}}
<li><a href="{{AppSubUrl}}/devtest/{{.}}">{{.}}</a></li>
Expand All @@ -11,5 +10,4 @@ ul {
line-height: 2em;
}
</style>

{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
5 changes: 3 additions & 2 deletions templates/devtest/fetch-action.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "devtest/devtest-header"}}
<div class="page-content devtest ui container">
{{template "base/alert" .}}
<div>
Expand All @@ -11,6 +11,7 @@
<button class="link-action" data-url="fetch-action-test?k=1">test action</button>
<button class="link-action" data-url="fetch-action-test?k=1" data-modal-confirm="confirm?">test with confirm</button>
<button class="ui red button link-action" data-url="fetch-action-test?k=1" data-modal-confirm="confirm?">test with risky confirm</button>
<button class="ui button link-action" data-url="fetch-action-test?k=1" data-modal-confirm-header="confirm header" data-modal-confirm-content="confirm content">test with confirm header</button>
</div>
</div>
<div>
Expand Down Expand Up @@ -41,4 +42,4 @@
border: 1px red dashed; /* show the border for demo purpose */
}
</style>
{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
5 changes: 2 additions & 3 deletions templates/devtest/flex-list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{template "base/head" .}}
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
{{template "devtest/devtest-header"}}
<div class="page-content devtest">
<div class="ui container">
<h1>Flex List (standalone)</h1>
Expand Down Expand Up @@ -112,4 +111,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
5 changes: 2 additions & 3 deletions templates/devtest/fomantic-dropdown.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{template "base/head" .}}
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
{{template "devtest/devtest-header"}}
<div class="page-content devtest ui container">
<div>
<h2>Dropdown</h2>
Expand Down Expand Up @@ -128,4 +127,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
28 changes: 25 additions & 3 deletions templates/devtest/fomantic-modal.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{template "base/head" .}}
{{template "devtest/devtest-header"}}
<div class="page-content devtest ui container">
{{template "base/alert" .}}
<div class="modal-buttons flex-text-block tw-flex-wrap"></div>
<script type="module">
for (const el of $('.ui.modal')) {
for (const el of $('.ui.modal:not([data-skip-button])')) {
const $btn = $('<button class="ui button">').text(`${el.id}`).on('click', () => {
$(el).modal({onApprove() {alert('confirmed')}}).modal('show');
});
Expand Down Expand Up @@ -69,5 +69,27 @@
<div class="content">hello, this is the modal dialog content, this is a dangerous operation</div>
{{template "base/modal_actions_confirm" (dict "ModalButtonDangerText" "I know and must do this is dangerous operation")}}
</div>

<div class="divider"></div>

<button class="show-modal" data-modal="#test-modal-fill-values"
data-modal-fill-by-id="value for id"
data-modal-fill-by-name="value for name"
data-modal-fill-by-class="value for class"
data-modal-p="value for tag"
data-modal-a.text-content="fill with attr"
>test-modal-fill-values</button>

<div id="test-modal-fill-values" class="ui mini modal" data-skip-button>
<div class="header">Modal dialog (fill values)</div>
<form class="content">
<div id="fill-by-id"></div>
<input name="fill-by-name">
<div class="fill-by-class"></div>
<p></p>
<a href="#">link</a>
{{template "base/modal_actions_confirm" dict}}
</form>
</div>
</div>
{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
5 changes: 2 additions & 3 deletions templates/devtest/gitea-ui.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{template "base/head" .}}
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
{{template "devtest/devtest-header"}}
<div class="page-content devtest ui container">
<div>
<h1>Link</h1>
Expand Down Expand Up @@ -193,4 +192,4 @@
<button class="{{if true}}tw-bg-red{{end}} tw-p-5 tw-border tw-rounded hover:tw-bg-blue active:tw-bg-yellow">Button</button>
</div>
</div>
{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
16 changes: 16 additions & 0 deletions templates/devtest/global-button.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{template "devtest/devtest-header"}}
<div class="page-content devtest ui container">
<div>
<h1>Show/Hide panel</h1>
<div>
<!-- to test Space/Enter also works on non-button buttons with children -->
<div tabindex="0" class="ui button show-panel toggle" data-panel="#devtest-panel-show-hide"><span>Toggle panel 1</span></div>
<span tabindex="0" class="ui button show-panel" data-panel="#devtest-panel-show-hide"><span>Show panel 1</span></span>
</div>
<div id="devtest-panel-show-hide">
<div>Panel 1 content</div>
<div class="ui button hide-panel" data-panel-closest="div">Hide panel 1</div>
</div>
</div>
</div>
{{template "devtest/devtest-footer"}}
5 changes: 2 additions & 3 deletions templates/devtest/label.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{template "base/head" .}}
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
{{template "devtest/devtest-header"}}
<div class="page-content devtest ui container">
<div>
<h1>Label</h1>
Expand All @@ -24,4 +23,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
4 changes: 2 additions & 2 deletions templates/devtest/tmplerr.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "devtest/devtest-header"}}
<div class="page-content devtest">
<div class="tw-flex">
<div class="tw-w-4/5">
Expand All @@ -9,4 +9,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
8 changes: 2 additions & 6 deletions templates/devtest/toast.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{template "base/head" .}}

{{template "devtest/devtest-header"}}
<div>
<h1>Toast</h1>
<div>
Expand All @@ -9,7 +8,4 @@
<button class="ui button toast-test-button" data-toast-level="error" data-toast-message="very looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong message">Show Error Toast (long)</button>
</div>
</div>

<script src="{{AssetUrlPrefix}}/js/devtest.js?v={{AssetVersion}}"></script>

{{template "base/footer" .}}
{{template "devtest/devtest-footer"}}
13 changes: 0 additions & 13 deletions web_src/js/features/admin/emails.ts
View file
Open in desktop

This file was deleted.

Loading
Loading