From 9fc1ceede1c67b5489acf989c049f189f87716ae Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 1 Mar 2024 22:52:43 +0100 Subject: [PATCH 01/18] deduplicate search translations --- options/locale/locale_en-US.ini | 46 ++++++------------- templates/admin/base/search.tmpl | 2 +- templates/admin/emails/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/repo/search.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- templates/code/searchcombo.tmpl | 7 +-- templates/code/searchform.tmpl | 10 ++-- templates/explore/repo_list.tmpl | 2 +- templates/explore/repo_search.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/explore/user_list.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/org/team/repositories.tmpl | 2 +- templates/package/shared/list.tmpl | 2 +- templates/package/shared/versionlist.tmpl | 2 +- templates/projects/list.tmpl | 2 +- templates/repo/branch/list.tmpl | 4 +- templates/repo/commits_table.tmpl | 4 +- templates/repo/home.tmpl | 4 +- templates/repo/issue/search.tmpl | 2 +- templates/repo/search.tmpl | 17 +++---- templates/repo/settings/collaboration.tmpl | 4 +- templates/repo/settings/protected_branch.tmpl | 12 ++--- templates/repo/settings/tags.tmpl | 4 +- templates/shared/actions/runner_list.tmpl | 2 +- templates/shared/issuelist.tmpl | 2 +- templates/shared/searchinput.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/dashboard/repolist.tmpl | 2 +- 32 files changed, 65 insertions(+), 91 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6d4e109e1dc66..1e54a39405acf 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -142,6 +142,19 @@ confirm_delete_selected = Confirm to delete all selected items? name = Name value = Value +[search] +search = Search +search_kind = Search %s... +type_tooltip = Search type +fuzzy = Fuzzy +fuzzy_tooltip = Include results that also match the search term closely +match = Match +match_tooltip = Include only results that match the exact search term +no_results = No %s matching your search term found. +unavailable = %s is currently not available. Please contact your site administrator. +kind.code = Code search +kind.keyword = Searching by keyword + [aria] navbar = Navigation Bar footer = Footer @@ -316,7 +329,6 @@ collaborative_repos = Collaborative Repositories my_orgs = My Organizations my_mirrors = My Mirrors view_home = View %s -search_repos = Find a repository… filter = Other Filters filter_by_team_repositories = Filter by team repositories feed_of = Feed of "%s" @@ -337,20 +349,8 @@ issues.in_your_repos = In your repositories repos = Repositories users = Users organizations = Organizations -search = Search go_to = Go to code = Code -search.type.tooltip = Search type -search.fuzzy = Fuzzy -search.fuzzy.tooltip = Include results that also matches the search term closely -search.match = Match -search.match.tooltip = Include only results that matches the exact search term -code_search_unavailable = Currently code search is not available. Please contact your site administrator. -repo_no_results = No matching repositories found. -user_no_results = No matching users found. -org_no_results = No matching organizations found. -code_no_results = No source code matching your search term found. -code_search_results = Search results for "%s" code_last_indexed_at = Last indexed %s relevant_repositories_tooltip = Repositories that are forks or that have no topic, no icon, and no description are hidden. relevant_repositories = Only relevant repositories are being shown, show unfiltered results. @@ -1282,9 +1282,7 @@ commits.desc = Browse source code change history. commits.commits = Commits commits.no_commits = No commits in common. "%s" and "%s" have entirely different histories. commits.nothing_to_compare = These branches are equal. -commits.search = Search commits… commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-01-13". -commits.find = Search commits.search_all = All Branches commits.author = Author commits.message = Message @@ -1458,7 +1456,6 @@ issues.filter_sort.moststars = Most stars issues.filter_sort.feweststars = Fewest stars issues.filter_sort.mostforks = Most forks issues.filter_sort.fewestforks = Fewest forks -issues.keyword_search_unavailable = Searching by keyword is currently not available. Please contact your site administrator. issues.action_open = Open issues.action_close = Close issues.action_label = Label @@ -1989,17 +1986,6 @@ contributors.contribution_type.commits = Commits contributors.contribution_type.additions = Additions contributors.contribution_type.deletions = Deletions -search = Search -search.search_repo = Search repository -search.type.tooltip = Search type -search.fuzzy = Fuzzy -search.fuzzy.tooltip = Include results that also matches the search term closely -search.match = Match -search.match.tooltip = Include only results that matches the exact search term -search.results = Search results for "%s" in %s -search.code_no_results = No source code matching your search term found. -search.code_search_unavailable = Currently code search is not available. Please contact your site administrator. - settings = Settings settings.desc = Settings is where you can manage the settings for the repository settings.options = Repository @@ -2152,7 +2138,6 @@ settings.delete_collaborator = Remove settings.collaborator_deletion = Remove Collaborator settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue? settings.remove_collaborator_success = The collaborator has been removed. -settings.search_user_placeholder = Search user… settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator. settings.change_team_access_not_allowed = Changing team access for repository has been restricted to organization owner settings.team_not_in_organization = The team is not in the same organization as the repository @@ -2160,7 +2145,6 @@ settings.teams = Teams settings.add_team = Add Team settings.add_team_duplicate = Team already has the repository settings.add_team_success = The team now have access to the repository. -settings.search_team = Search Team… settings.change_team_permission_tip = Team's permission is set on the team setting page and can't be changed per repository settings.delete_team_tip = This team has access to all repositories and can't be removed settings.remove_team_success = The team's access to the repository has been removed. @@ -2313,9 +2297,7 @@ settings.protect_whitelist_committers = Whitelist Restricted Push settings.protect_whitelist_committers_desc = Only whitelisted users or teams will be allowed to push to this branch (but not force push). settings.protect_whitelist_deploy_keys = Whitelist deploy keys with write access to push. settings.protect_whitelist_users = Whitelisted users for pushing: -settings.protect_whitelist_search_users = Search users… settings.protect_whitelist_teams = Whitelisted teams for pushing: -settings.protect_whitelist_search_teams = Search teams… settings.protect_merge_whitelist_committers = Enable Merge Whitelist settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users or teams to merge pull requests into this branch. settings.protect_merge_whitelist_users = Whitelisted users for merging: @@ -2560,7 +2542,6 @@ branch.default_deletion_failed = Branch "%s" is the default branch. It cannot be branch.restore = Restore Branch "%s" branch.download = Download Branch "%s" branch.rename = Rename Branch "%s" -branch.search = Search Branch branch.included_desc = This branch is part of the default branch branch.included = Included branch.create_new_branch = Create branch from branch: @@ -2705,7 +2686,6 @@ teams.write_permission_desc = This team grants Write access: me teams.admin_permission_desc = This team grants Admin access: members can read from, push to and add collaborators to team repositories. teams.create_repo_permission_desc = Additionally, this team grants Create repository permission: members can create new repositories in organization. teams.repositories = Team Repositories -teams.search_repo_placeholder = Search repository… teams.remove_all_repos_title = Remove all team repositories teams.remove_all_repos_desc = This will remove all repositories from the team. teams.add_all_repos_title = Add all repositories diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index 0fecb61d9e367..d070baac77393 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -2,7 +2,7 @@
{{template "shared/searchinput" dict "Value" .Keyword}} - +
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index bcd80368e663c..4ae3d6e59c9d6 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -8,7 +8,7 @@
{{template "shared/searchinput" dict "Value" .Keyword}} - +
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index cf860dab2ab1a..bcfa6edb07a55 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -22,7 +22,7 @@ {{$type.Name}} {{end}} - + diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl index 247ec5491a87f..7093fd49ccbec 100644 --- a/templates/admin/repo/search.tmpl +++ b/templates/admin/repo/search.tmpl @@ -2,7 +2,7 @@
{{template "shared/searchinput" dict "Value" .Keyword}} - +
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index fb4f16791da84..fd6d252132d7f 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -11,7 +11,7 @@
- +
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 8fdc80fc70494..fd494525e3914 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -55,7 +55,7 @@
{{template "shared/searchinput" dict "Value" .Keyword}} - +
diff --git a/templates/code/searchcombo.tmpl b/templates/code/searchcombo.tmpl index d451bc0ad8cea..780713d7c6b93 100644 --- a/templates/code/searchcombo.tmpl +++ b/templates/code/searchcombo.tmpl @@ -3,15 +3,12 @@
{{if .CodeIndexerUnavailable}}
-

{{ctx.Locale.Tr "explore.code_search_unavailable"}}

+

{{ctx.Locale.Tr "search.unavailable" (ctx.Locale.Tr "search.kind.code")}}

{{else if .SearchResults}} -

- {{ctx.Locale.Tr "explore.code_search_results" .Keyword}} -

{{template "code/searchresults" .}} {{else if .Keyword}} -
{{ctx.Locale.Tr "explore.code_no_results"}}
+
{{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.code")}}
{{end}}
{{template "base/paginate" .}} diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl index fae1340046838..6bdc8849586e2 100644 --- a/templates/code/searchform.tmpl +++ b/templates/code/searchform.tmpl @@ -1,14 +1,14 @@
{{template "shared/searchinput" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}} -
+
{{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{ctx.Locale.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}
+
{{ctx.Locale.Tr (printf "search.%s" (or .queryType "fuzzy"))}}
-
{{ctx.Locale.Tr "explore.search.fuzzy"}}
-
{{ctx.Locale.Tr "explore.search.match"}}
+
{{ctx.Locale.Tr "search.fuzzy"}}
+
{{ctx.Locale.Tr "search.match"}}
- +
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index c51dcaa3ffda2..843ab25d4e530 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -58,7 +58,7 @@
{{else}}
- {{ctx.Locale.Tr "explore.repo_no_results"}} + {{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.repos")}}
{{end}} diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index e268670e93ee9..60a2c0bddad33 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -9,7 +9,7 @@ {{else if .TabName}} {{end}} - + diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 2bb5f319d13fb..30a51ed24995e 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -2,7 +2,7 @@
{{template "shared/searchinput" dict "Value" .Keyword}} - +
diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index 0d661d53cbaf7..051fad360a5e0 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -26,6 +26,6 @@ {{else}} -
{{ctx.Locale.Tr "explore.user_no_results"}}
+
{{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.users")}}
{{end}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index adaf83ae155e5..774ce5f187ac9 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -14,7 +14,7 @@ diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 5a32eea64fa79..3c9d516c4684f 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -14,7 +14,7 @@ {{.CsrfTokenHtml}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 51e080f495167..66606b8767c2a 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -10,7 +10,7 @@ {{$type.Name}} {{end}} - + {{end}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index eee952c096e88..eb8a4abe6a58c 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -15,7 +15,7 @@ {{end}} - +
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 30fbd498a4ec6..66d4032a46184 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -24,7 +24,7 @@
{{template "shared/searchinput" dict "Value" .Keyword}} -
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 46503cb5df300..03faa34fb1121 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -75,9 +75,9 @@
- +
- +
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 054a3f6bec8bb..9fc50e440b68b 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -12,14 +12,14 @@ {{if .PageIsCommits}}
- +
- +
{{else if .IsDiffCompare}} {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 2c08fb02d5f24..15127c85c7050 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -15,8 +15,8 @@
-
- +
+ {{if .CodeIndexerUnavailable}} {{svg "octicon-alert"}} {{end}} diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 361f16fd3b1e6..af3355b856465 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -13,6 +13,6 @@ {{if .PageIsIssueList}} {{end}} - +
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 7b3ad7282ecc4..840b8cba5a853 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -5,13 +5,13 @@
- -
+ +
{{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{ctx.Locale.Tr (printf "repo.search.%s" (or .queryType "fuzzy"))}}
+
{{ctx.Locale.Tr (printf "search.%s" (or .queryType "fuzzy"))}}
-
{{ctx.Locale.Tr "repo.search.fuzzy"}}
-
{{ctx.Locale.Tr "repo.search.match"}}
+
{{ctx.Locale.Tr "search.fuzzy"}}
+
{{ctx.Locale.Tr "search.match"}}
@@ -20,12 +20,9 @@
{{if .CodeIndexerUnavailable}}
-

{{ctx.Locale.Tr "repo.search.code_search_unavailable"}}

+

{{ctx.Locale.Tr "search.unavailable" (ctx.Locale.Tr "search.kind.code")}}

{{else if .Keyword}} -

- {{ctx.Locale.Tr "repo.search.results" .Keyword .RepoLink .RepoName}} -

{{if .SearchResults}}
{{range $term := .SearchResultLanguages}} @@ -65,7 +62,7 @@
{{template "base/paginate" .}} {{else}} -
{{ctx.Locale.Tr "repo.search.code_no_results"}}
+
{{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.code")}}
{{end}} {{end}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 19abf1bee8a54..02679804834c9 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -42,7 +42,7 @@ {{.CsrfTokenHtml}}
@@ -90,7 +90,7 @@
{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 6bbcc9f6ec00e..106a21fd53f69 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -52,7 +52,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
{{range .Users}}
@@ -67,7 +67,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
{{range .Teams}}
@@ -113,7 +113,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
{{range .Users}}
@@ -128,7 +128,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
{{range .Teams}}
@@ -210,7 +210,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
{{range .Users}}
@@ -225,7 +225,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
{{range .Teams}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index e4fcf2ee6bead..e4c4e7049f701 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -28,7 +28,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
{{range .Users}}
@@ -43,7 +43,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
{{range .Teams}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 0e8f3cb874ddc..c5bed9f5f863e 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -36,7 +36,7 @@
{{template "shared/searchinput" dict "Value" .Keyword}} - +
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index e8a0079c1cdbe..5ff69ce0d3fce 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -153,7 +153,7 @@ {{end}} {{if .IssueIndexerUnavailable}}
-

{{ctx.Locale.Tr "repo.issues.keyword_search_unavailable"}}

+

{{ctx.Locale.Tr "search.unavailable" (ctx.Locale.Tr "search.kind.keyword")}}

{{end}}
diff --git a/templates/shared/searchinput.tmpl b/templates/shared/searchinput.tmpl index 48b288c299e46..700cca2423efe 100644 --- a/templates/shared/searchinput.tmpl +++ b/templates/shared/searchinput.tmpl @@ -1 +1 @@ - + diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 82622366e73bc..73465556496c0 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -52,7 +52,7 @@ {{template "shared/searchinput" dict "Value" $.Keyword}} - +
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 737a0f7e2b4d5..a6477870a1a71 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -52,7 +52,7 @@ {{template "shared/searchinput" dict "Value" $.Keyword}} - +
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index ed6f906822801..7724cc5d6a066 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -9,7 +9,7 @@ const data = { textOrganization: {{ctx.Locale.Tr "organization"}}, textMyRepos: {{ctx.Locale.Tr "home.my_repos"}}, textNewRepo: {{ctx.Locale.Tr "new_repo"}}, - textSearchRepos: {{ctx.Locale.Tr "home.search_repos"}}, + textSearchRepos: {{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "home.my_repos")}}, textFilter: {{ctx.Locale.Tr "home.filter"}}, textShowArchived: {{ctx.Locale.Tr "home.show_archived"}}, textShowPrivate: {{ctx.Locale.Tr "home.show_private"}}, From 0827d70b9167531cf071dff76d158468f09795f5 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 9 Mar 2024 12:18:16 +0100 Subject: [PATCH 02/18] WIP --- templates/admin/base/search.tmpl | 4 +- templates/admin/emails/list.tmpl | 4 +- templates/admin/packages/list.tmpl | 4 +- templates/admin/repo/search.tmpl | 29 +++++++++++++ templates/admin/repo/unadopted.tmpl | 2 +- templates/admin/user/list.tmpl | 4 +- templates/code/searchform.tmpl | 6 +-- templates/explore/repo_search.tmpl | 42 +++++++++++++++++++ templates/explore/search.tmpl | 4 +- templates/package/shared/list.tmpl | 4 +- templates/package/shared/versionlist.tmpl | 4 +- templates/projects/list.tmpl | 6 +-- templates/repo/issue/search.tmpl | 4 +- templates/shared/actions/runner_list.tmpl | 4 +- templates/shared/repo_search.tmpl | 4 +- templates/shared/search/button.tmpl | 1 + .../{searchinput.tmpl => search/input.tmpl} | 2 +- templates/user/dashboard/issues.tmpl | 4 +- templates/user/dashboard/milestones.tmpl | 4 +- 19 files changed, 103 insertions(+), 33 deletions(-) create mode 100644 templates/admin/repo/search.tmpl create mode 100644 templates/explore/repo_search.tmpl create mode 100644 templates/shared/search/button.tmpl rename templates/shared/{searchinput.tmpl => search/input.tmpl} (57%) diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index d070baac77393..b2125814a034d 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -1,8 +1,8 @@
- {{template "shared/searchinput" dict "Value" .Keyword}} - + {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index e74cc6cb26d42..4a6991912409b 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -7,8 +7,8 @@
- {{template "shared/searchinput" dict "Value" .Keyword}} - + {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index c2244e5b347d9..3d40f79277c84 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -14,7 +14,7 @@
- {{template "shared/searchinput" dict "Value" .Query}} + {{template "shared/search/input" dict "Value" .Query}} - + {{template "shared/search/button"}}
diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl new file mode 100644 index 0000000000000..650bc99e8bc66 --- /dev/null +++ b/templates/admin/repo/search.tmpl @@ -0,0 +1,29 @@ +
+
+
+ {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}} +
+
+ +
+ + {{ctx.Locale.Tr "repo.issues.filter_sort"}} + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+ {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.by_size"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_by_size"}} +
+
+
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index fd6d252132d7f..3e246e428e83e 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -11,7 +11,7 @@
- + {{template "shared/search/button"}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 07f9395fa1e8f..c343573ca525e 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -54,8 +54,8 @@
- {{template "shared/searchinput" dict "Value" .Keyword}} - + {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}}
diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl index 6bdc8849586e2..732f7c5324b6f 100644 --- a/templates/code/searchform.tmpl +++ b/templates/code/searchform.tmpl @@ -1,7 +1,7 @@
- {{template "shared/searchinput" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}} -
+ {{template "shared/search/input" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}} +
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{ctx.Locale.Tr (printf "search.%s" (or .queryType "fuzzy"))}}
@@ -9,6 +9,6 @@
{{ctx.Locale.Tr "search.match"}}
- + {{template "shared/search/button"}}
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl new file mode 100644 index 0000000000000..0895eee7b32e5 --- /dev/null +++ b/templates/explore/repo_search.tmpl @@ -0,0 +1,42 @@ +
+
+ + +
+ {{template "shared/search/input" dict "Value" .Keyword}} + {{if .PageIsExploreRepositories}} + + {{else if .TabName}} + + {{end}} + {{template "shared/search/button"}} +
+
+ +
+ + {{ctx.Locale.Tr "repo.issues.filter_sort"}} + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+ {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{if not .DisableStars}} + {{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}} + {{end}} + {{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}} +
+
+
+{{if and .PageIsExploreRepositories .OnlyShowRelevant}} +
+ {{ctx.Locale.Tr "explore.relevant_repositories" (printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))}} +
+{{end}} +
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 30a51ed24995e..9215950b7fe18 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,8 +1,8 @@
- {{template "shared/searchinput" dict "Value" .Keyword}} - + {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}}
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index bb5504d579994..b32cd6edfbde0 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -2,7 +2,7 @@ {{if .HasPackages}}
- {{template "shared/searchinput" dict "Value" .Query}} + {{template "shared/search/input" dict "Value" .Query}} - + {{template "shared/search/button"}}
{{end}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 0656a61c72b63..1f313d396b57f 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,7 +1,7 @@

{{.PackageDescriptor.Package.Name}} / {{ctx.Locale.Tr "packages.versions"}}

- {{template "shared/searchinput" dict "Value" .Query}} + {{template "shared/search/input" dict "Value" .Query}} {{end}} - + {{template "shared/search/button"}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 897147a240951..12459b84ab89d 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -23,10 +23,8 @@
- {{template "shared/searchinput" dict "Value" .Keyword}} - + {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}}
diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index af3355b856465..4727b26154fb7 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -9,10 +9,10 @@ {{end}} - {{template "shared/searchinput" dict "Value" .Keyword}} + {{template "shared/search/input" dict "Value" .Keyword}} {{if .PageIsIssueList}} {{end}} - + {{template "shared/search/button"}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index c5bed9f5f863e..8511830ed4151 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -35,8 +35,8 @@
- {{template "shared/searchinput" dict "Value" .Keyword}} - + {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}}
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl index 2ea4bfaad79e9..4037ed4b6fc29 100644 --- a/templates/shared/repo_search.tmpl +++ b/templates/shared/repo_search.tmpl @@ -2,13 +2,13 @@
{{if .Language}}{{end}}
- {{template "shared/searchinput" dict "Value" .Keyword}} + {{template "shared/search/input" dict "Value" .Keyword}} {{if .PageIsExploreRepositories}} {{else if .TabName}} {{end}} - + {{template "shared/search/button"}}
diff --git a/templates/shared/search/button.tmpl b/templates/shared/search/button.tmpl new file mode 100644 index 0000000000000..dadb37eba808b --- /dev/null +++ b/templates/shared/search/button.tmpl @@ -0,0 +1 @@ + diff --git a/templates/shared/searchinput.tmpl b/templates/shared/search/input.tmpl similarity index 57% rename from templates/shared/searchinput.tmpl rename to templates/shared/search/input.tmpl index 700cca2423efe..a715203ce64ca 100644 --- a/templates/shared/searchinput.tmpl +++ b/templates/shared/search/input.tmpl @@ -1 +1 @@ - + diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 2a3174f97bfe8..0fbf9a7361b4f 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -50,9 +50,9 @@ - {{template "shared/searchinput" dict "Value" $.Keyword}} + {{template "shared/search/input" dict "Value" $.Keyword}} - + {{template "shared/search/button"}}
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index cf08ebf3aaa6b..278d10c54148c 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -51,8 +51,8 @@ - {{template "shared/searchinput" dict "Value" $.Keyword}} - + {{template "shared/search/input" dict "Value" $.Keyword}} + {{template "shared/search/button"}}
From 64d0b72dcb64f68be200ac3af75e216803c50e15 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 9 Mar 2024 15:21:47 +0100 Subject: [PATCH 03/18] WIP --- options/locale/locale_en-US.ini | 1 + package-lock.json | 323 ++++++++++++++++-------------- routers/web/repo/commit.go | 2 +- templates/repo/branch/list.tmpl | 245 +++++++++++----------- templates/repo/commits_table.tmpl | 39 ++-- templates/repo/home.tmpl | 4 +- templates/repo/search.tmpl | 15 +- 7 files changed, 318 insertions(+), 311 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ba0c4e0d637e4..38de2b2c7e4e2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1325,6 +1325,7 @@ commits.commits = Commits commits.no_commits = No commits in common. "%s" and "%s" have entirely different histories. commits.nothing_to_compare = These branches are equal. commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-01-13". +commits.search_branch = This Branch commits.search_all = All Branches commits.author = Author commits.message = Message diff --git a/package-lock.json b/package-lock.json index 6a6eb4b947836..eb5407b05dc70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1459,9 +1459,9 @@ "dev": true }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz", - "integrity": "sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.1.tgz", + "integrity": "sha512-iU2Sya8hNn1LhsYyf0N+L4Gf9Qc+9eBTJJJsaOGUp+7x4n2M9dxTt8UvhJl3oeftSjblSlpCfvjA/IfP3g5VjQ==", "cpu": [ "arm" ], @@ -1472,9 +1472,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz", - "integrity": "sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.1.tgz", + "integrity": "sha512-wlzcWiH2Ir7rdMELxFE5vuM7D6TsOcJ2Yw0c3vaBR3VOsJFVTx9xvwnAvhgU5Ii8Gd6+I11qNHwndDscIm0HXg==", "cpu": [ "arm64" ], @@ -1485,9 +1485,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz", - "integrity": "sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.1.tgz", + "integrity": "sha512-YRXa1+aZIFN5BaImK+84B3uNK8C6+ynKLPgvn29X9s0LTVCByp54TB7tdSMHDR7GTV39bz1lOmlLDuedgTwwHg==", "cpu": [ "arm64" ], @@ -1498,9 +1498,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz", - "integrity": "sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.1.tgz", + "integrity": "sha512-opjWJ4MevxeA8FhlngQWPBOvVWYNPFkq6/25rGgG+KOy0r8clYwL1CFd+PGwRqqMFVQ4/Qd3sQu5t7ucP7C/Uw==", "cpu": [ "x64" ], @@ -1511,9 +1511,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz", - "integrity": "sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.1.tgz", + "integrity": "sha512-uBkwaI+gBUlIe+EfbNnY5xNyXuhZbDSx2nzzW8tRMjUmpScd6lCQYKY2V9BATHtv5Ef2OBq6SChEP8h+/cxifQ==", "cpu": [ "arm" ], @@ -1524,9 +1524,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz", - "integrity": "sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.1.tgz", + "integrity": "sha512-0bK9aG1kIg0Su7OcFTlexkVeNZ5IzEsnz1ept87a0TUgZ6HplSgkJAnFpEVRW7GRcikT4GlPV0pbtVedOaXHQQ==", "cpu": [ "arm64" ], @@ -1537,9 +1537,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz", - "integrity": "sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.1.tgz", + "integrity": "sha512-qB6AFRXuP8bdkBI4D7UPUbE7OQf7u5OL+R94JE42Z2Qjmyj74FtDdLGeriRyBDhm4rQSvqAGCGC01b8Fu2LthQ==", "cpu": [ "arm64" ], @@ -1550,9 +1550,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz", - "integrity": "sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.1.tgz", + "integrity": "sha512-sHig3LaGlpNgDj5o8uPEoGs98RII8HpNIqFtAI8/pYABO8i0nb1QzT0JDoXF/pxzqO+FkxvwkHZo9k0NJYDedg==", "cpu": [ "riscv64" ], @@ -1563,9 +1563,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz", - "integrity": "sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.1.tgz", + "integrity": "sha512-nD3YcUv6jBJbBNFvSbp0IV66+ba/1teuBcu+fBBPZ33sidxitc6ErhON3JNavaH8HlswhWMC3s5rgZpM4MtPqQ==", "cpu": [ "x64" ], @@ -1576,9 +1576,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz", - "integrity": "sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.1.tgz", + "integrity": "sha512-7/XVZqgBby2qp/cO0TQ8uJK+9xnSdJ9ct6gSDdEr4MfABrjTyrW6Bau7HQ73a2a5tPB7hno49A0y1jhWGDN9OQ==", "cpu": [ "x64" ], @@ -1589,9 +1589,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz", - "integrity": "sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.1.tgz", + "integrity": "sha512-CYc64bnICG42UPL7TrhIwsJW4QcKkIt9gGlj21gq3VV0LL6XNb1yAdHVp1pIi9gkts9gGcT3OfUYHjGP7ETAiw==", "cpu": [ "arm64" ], @@ -1602,9 +1602,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz", - "integrity": "sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.1.tgz", + "integrity": "sha512-LN+vnlZ9g0qlHGlS920GR4zFCqAwbv2lULrR29yGaWP9u7wF5L7GqWu9Ah6/kFZPXPUkpdZwd//TNR+9XC9hvA==", "cpu": [ "ia32" ], @@ -1615,9 +1615,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz", - "integrity": "sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.1.tgz", + "integrity": "sha512-n+vkrSyphvmU0qkQ6QBNXCGr2mKjhP08mPRM/Xp5Ck2FV4NrHU+y6axzDeixUrCBHVUS51TZhjqrKBBsHLKb2Q==", "cpu": [ "x64" ], @@ -2235,9 +2235,9 @@ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==" }, "node_modules/@types/node": { - "version": "20.11.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz", - "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==", + "version": "20.11.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.25.tgz", + "integrity": "sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==", "dependencies": { "undici-types": "~5.26.4" } @@ -2280,16 +2280,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz", - "integrity": "sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.1.tgz", + "integrity": "sha512-zioDz623d0RHNhvx0eesUmGfIjzrk18nSBC8xewepKXbBvN/7c1qImV7Hg8TI1URTxKax7/zxfxj3Uph8Chcuw==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "7.1.0", - "@typescript-eslint/type-utils": "7.1.0", - "@typescript-eslint/utils": "7.1.0", - "@typescript-eslint/visitor-keys": "7.1.0", + "@typescript-eslint/scope-manager": "7.1.1", + "@typescript-eslint/type-utils": "7.1.1", + "@typescript-eslint/utils": "7.1.1", + "@typescript-eslint/visitor-keys": "7.1.1", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2315,15 +2315,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.1.0.tgz", - "integrity": "sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.1.1.tgz", + "integrity": "sha512-ZWUFyL0z04R1nAEgr9e79YtV5LbafdOtN7yapNbn1ansMyaegl2D4bL7vHoJ4HPSc4CaLwuCVas8CVuneKzplQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.1.0", - "@typescript-eslint/types": "7.1.0", - "@typescript-eslint/typescript-estree": "7.1.0", - "@typescript-eslint/visitor-keys": "7.1.0", + "@typescript-eslint/scope-manager": "7.1.1", + "@typescript-eslint/types": "7.1.1", + "@typescript-eslint/typescript-estree": "7.1.1", + "@typescript-eslint/visitor-keys": "7.1.1", "debug": "^4.3.4" }, "engines": { @@ -2343,13 +2343,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz", - "integrity": "sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.1.1.tgz", + "integrity": "sha512-cirZpA8bJMRb4WZ+rO6+mnOJrGFDd38WoXCEI57+CYBqta8Yc8aJym2i7vyqLL1vVYljgw0X27axkUXz32T8TA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.1.0", - "@typescript-eslint/visitor-keys": "7.1.0" + "@typescript-eslint/types": "7.1.1", + "@typescript-eslint/visitor-keys": "7.1.1" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2360,13 +2360,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz", - "integrity": "sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.1.1.tgz", + "integrity": "sha512-5r4RKze6XHEEhlZnJtR3GYeCh1IueUHdbrukV2KSlLXaTjuSfeVF8mZUVPLovidCuZfbVjfhi4c0DNSa/Rdg5g==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.1.0", - "@typescript-eslint/utils": "7.1.0", + "@typescript-eslint/typescript-estree": "7.1.1", + "@typescript-eslint/utils": "7.1.1", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2387,9 +2387,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.1.0.tgz", - "integrity": "sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.1.1.tgz", + "integrity": "sha512-KhewzrlRMrgeKm1U9bh2z5aoL4s7K3tK5DwHDn8MHv0yQfWFz/0ZR6trrIHHa5CsF83j/GgHqzdbzCXJ3crx0Q==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2400,13 +2400,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz", - "integrity": "sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.1.tgz", + "integrity": "sha512-9ZOncVSfr+sMXVxxca2OJOPagRwT0u/UHikM2Rd6L/aB+kL/QAuTnsv6MeXtjzCJYb8PzrXarypSGIPx3Jemxw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.1.0", - "@typescript-eslint/visitor-keys": "7.1.0", + "@typescript-eslint/types": "7.1.1", + "@typescript-eslint/visitor-keys": "7.1.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2428,17 +2428,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.1.0.tgz", - "integrity": "sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.1.1.tgz", + "integrity": "sha512-thOXM89xA03xAE0lW7alstvnyoBUbBX38YtY+zAUcpRPcq9EIhXPuJ0YTv948MbzmKh6e1AUszn5cBFK49Umqg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.1.0", - "@typescript-eslint/types": "7.1.0", - "@typescript-eslint/typescript-estree": "7.1.0", + "@typescript-eslint/scope-manager": "7.1.1", + "@typescript-eslint/types": "7.1.1", + "@typescript-eslint/typescript-estree": "7.1.1", "semver": "^7.5.4" }, "engines": { @@ -2453,12 +2453,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz", - "integrity": "sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.1.tgz", + "integrity": "sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/types": "7.1.1", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2558,9 +2558,9 @@ } }, "node_modules/@vitest/snapshot/node_modules/magic-string": { - "version": "0.30.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", - "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -2649,9 +2649,9 @@ } }, "node_modules/@vue/compiler-sfc/node_modules/magic-string": { - "version": "0.30.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", - "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -3563,9 +3563,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001591", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz", - "integrity": "sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==", + "version": "1.0.30001596", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001596.tgz", + "integrity": "sha512-zpkZ+kEr6We7w63ORkoJ2pOfBwBkY/bJrG/UZ90qNb45Isblu8wzDgevEOrRL1r9dWayHjYiiyCMEXPn4DweGQ==", "funding": [ { "type": "opencollective", @@ -4855,9 +4855,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.690", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.690.tgz", - "integrity": "sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==" + "version": "1.4.699", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.699.tgz", + "integrity": "sha512-I7q3BbQi6e4tJJN5CRcyvxhK0iJb34TV8eJQcgh+fR2fQ8miMgZcEInckCo1U9exDHbfz7DLDnFn8oqH/VcRKw==" }, "node_modules/elkjs": { "version": "0.9.2", @@ -6512,9 +6512,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", - "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.3.tgz", + "integrity": "sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==", "dependencies": { "resolve-pkg-maps": "^1.0.0" }, @@ -7031,9 +7031,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", - "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz", + "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -7271,10 +7271,13 @@ } }, "node_modules/is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", "dev": true, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7384,10 +7387,13 @@ } }, "node_modules/is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", "dev": true, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7474,10 +7480,13 @@ } }, "node_modules/is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", "dev": true, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7495,13 +7504,16 @@ } }, "node_modules/is-weakset": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -11568,9 +11580,9 @@ } }, "node_modules/terser": { - "version": "5.28.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.28.1.tgz", - "integrity": "sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==", + "version": "5.29.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz", + "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==", "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -11956,9 +11968,9 @@ } }, "node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz", + "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", "devOptional": true, "peer": true, "bin": { @@ -12160,9 +12172,9 @@ } }, "node_modules/vite": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.4.tgz", - "integrity": "sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.5.tgz", + "integrity": "sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==", "dev": true, "dependencies": { "esbuild": "^0.19.3", @@ -12263,9 +12275,9 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz", - "integrity": "sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.1.tgz", + "integrity": "sha512-ggqQKvx/PsB0FaWXhIvVkSWh7a/PCLQAsMjBc+nA2M8Rv2/HG0X6zvixAB7KyZBRtifBUhy5k8voQX/mRnABPg==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -12278,19 +12290,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.12.0", - "@rollup/rollup-android-arm64": "4.12.0", - "@rollup/rollup-darwin-arm64": "4.12.0", - "@rollup/rollup-darwin-x64": "4.12.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.12.0", - "@rollup/rollup-linux-arm64-gnu": "4.12.0", - "@rollup/rollup-linux-arm64-musl": "4.12.0", - "@rollup/rollup-linux-riscv64-gnu": "4.12.0", - "@rollup/rollup-linux-x64-gnu": "4.12.0", - "@rollup/rollup-linux-x64-musl": "4.12.0", - "@rollup/rollup-win32-arm64-msvc": "4.12.0", - "@rollup/rollup-win32-ia32-msvc": "4.12.0", - "@rollup/rollup-win32-x64-msvc": "4.12.0", + "@rollup/rollup-android-arm-eabi": "4.12.1", + "@rollup/rollup-android-arm64": "4.12.1", + "@rollup/rollup-darwin-arm64": "4.12.1", + "@rollup/rollup-darwin-x64": "4.12.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.12.1", + "@rollup/rollup-linux-arm64-gnu": "4.12.1", + "@rollup/rollup-linux-arm64-musl": "4.12.1", + "@rollup/rollup-linux-riscv64-gnu": "4.12.1", + "@rollup/rollup-linux-x64-gnu": "4.12.1", + "@rollup/rollup-linux-x64-musl": "4.12.1", + "@rollup/rollup-win32-arm64-msvc": "4.12.1", + "@rollup/rollup-win32-ia32-msvc": "4.12.1", + "@rollup/rollup-win32-x64-msvc": "4.12.1", "fsevents": "~2.3.2" } }, @@ -12360,9 +12372,9 @@ } }, "node_modules/vitest/node_modules/magic-string": { - "version": "0.30.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", - "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -12802,15 +12814,18 @@ } }, "node_modules/which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", "dev": true, "dependencies": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13015,9 +13030,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.0.tgz", - "integrity": "sha512-j9iR8g+/t0lArF4V6NE/QCfT+CO7iLqrXAHZbJdo+LfjqP1vR8Fg5bSiaq6Q2lOD1AUEVrEVIgABvBFYojJVYQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz", + "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==", "bin": { "yaml": "bin.mjs" }, diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index 16da917d222c1..1b99f4183c3b1 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -203,7 +203,7 @@ func SearchCommits(ctx *context.Context) { ctx.Data["Keyword"] = query if all { - ctx.Data["All"] = "checked" + ctx.Data["All"] = true } ctx.Data["Username"] = ctx.Repo.Owner.Name ctx.Data["Reponame"] = ctx.Repo.Repository.Name diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 8e4112370f620..ebf35f4e078e3 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -67,140 +67,139 @@
{{end}} - {{if .Branches}} -

-
- {{ctx.Locale.Tr "repo.branches"}} -
-
-
-
- -
- -
+

+
+ {{ctx.Locale.Tr "repo.branches"}} +
+

+ +
+
+
+ {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/button"}}
-

+ +
-
- - - {{range .Branches}} - - + + {{end}} + +
- {{if .DBBranch.IsDeleted}} -
- {{.DBBranch.Name}} - +
+ + + {{range .Branches}} + + + - - + - + - - {{end}} - -
+ {{if .DBBranch.IsDeleted}} +
+ {{.DBBranch.Name}} + +
+

{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}

+ {{else}} +
+ {{if .IsProtected}}{{svg "octicon-shield-lock"}}{{end}} + {{.DBBranch.Name}} + + {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} +
+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

+ {{end}} + 		+ {{if and (not .DBBranch.IsDeleted) $.DefaultBranchBranch}} +
+
+
{{.CommitsBehind}}
+ {{/* old code bears 0/0.0 = NaN output, so it might output invalid "width: NaNpx", it just works and doesn't caues any problem. */}} +
-

{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}

- {{else}} -
- {{if .IsProtected}}{{svg "octicon-shield-lock"}}{{end}} - {{.DBBranch.Name}} - - {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} +
+
{{.CommitsAhead}}
+
-

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

+
{{end}} -
- {{if and (not .DBBranch.IsDeleted) $.DefaultBranchBranch}} -
-
-
{{.CommitsBehind}}
- {{/* old code bears 0/0.0 = NaN output, so it might output invalid "width: NaNpx", it just works and doesn't caues any problem. */}} -
-
-
-
{{.CommitsAhead}}
-
-
-
- {{end}} - 		- {{if not .LatestPullRequest}} - {{if .IsIncluded}} - - {{svg "octicon-git-pull-request"}} {{ctx.Locale.Tr "repo.branch.included"}} - - {{else if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} - - - - {{end}} - {{else if and .LatestPullRequest.HasMerged .MergeMovedOn}} - {{if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} - - - - {{end}} - {{else}} - {{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}} - {{if .LatestPullRequest.HasMerged}} - {{svg "octicon-git-merge" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.pulls.merged"}} - {{else if .LatestPullRequest.Issue.IsClosed}} - {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.closed_title"}} - {{else}} - {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.open_title"}} - {{end}} + + {{if not .LatestPullRequest}} + {{if .IsIncluded}} + + {{svg "octicon-git-pull-request"}} {{ctx.Locale.Tr "repo.branch.included"}} + + {{else if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} + + + {{end}} - - {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted)}} - + {{else if and .LatestPullRequest.HasMerged .MergeMovedOn}} + {{if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} + + + {{end}} - {{if $.EnableFeed}} - {{svg "octicon-rss"}} + {{else}} + {{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}} + {{if .LatestPullRequest.HasMerged}} + {{svg "octicon-git-merge" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.pulls.merged"}} + {{else if .LatestPullRequest.Issue.IsClosed}} + {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.closed_title"}} + {{else}} + {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.open_title"}} {{end}} - {{if and (not .DBBranch.IsDeleted) (not $.DisableDownloadSourceArchives)}} -
- {{svg "octicon-download"}} -
- {{svg "octicon-file-zip"}} ZIP - {{svg "octicon-file-zip"}} TAR.GZ -
+ {{end}} +
+ {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted)}} + + {{end}} + {{if $.EnableFeed}} + {{svg "octicon-rss"}} + {{end}} + {{if and (not .DBBranch.IsDeleted) (not $.DisableDownloadSourceArchives)}} +
+ {{svg "octicon-download"}} +
+ {{svg "octicon-file-zip"}} ZIP + {{svg "octicon-file-zip"}} TAR.GZ
- {{end}} - {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted) (not $.IsMirror)}} -
+ {{end}} + {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted) (not $.IsMirror)}} + + {{end}} + {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} + {{if .DBBranch.IsDeleted}} + + {{else}} + {{end}} - {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} - {{if .DBBranch.IsDeleted}} - - {{else}} - - {{end}} - {{end}} -
-
- {{template "base/paginate" .}} - {{end}} + {{end}} +
+
+ {{template "base/paginate" .}}
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index b5c05499ca086..a51e7ad44d41c 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -8,27 +8,34 @@ {{ctx.Locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} {{end}}
-
- {{if .PageIsCommits}} -
-
- -
- -
- - -
- -
- {{else if .IsDiffCompare}} + {{if .IsDiffCompare}} +
{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} ... {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} - {{end}} -
+
+ {{end}} +{{if .PageIsCommits}} +
+
+
+ {{template "shared/search/input" dict "Value" .Keyword}} +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{if .All}}{{ctx.Locale.Tr "repo.commits.search_all"}}{{else}}{{ctx.Locale.Tr "repo.commits.search_branch"}}{{end}}
+
+
{{ctx.Locale.Tr "repo.commits.search_branch"}}
+
{{ctx.Locale.Tr "repo.commits.search_all"}}
+
+
+ {{template "shared/search/button" (ctx.Locale.Tr "repo.commits.search.tooltip")}} +
+
+
+{{end}} + {{if and .Commits (gt .CommitCount 0)}} {{template "repo/commits_list" .}} {{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 3307bd507f639..7730b3ad4e8db 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -20,9 +20,7 @@ {{if .CodeIndexerUnavailable}} {{svg "octicon-alert"}} {{end}} - + {{template "shared/search/button"}}
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 076e84231c283..c365ad511a2bd 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -3,20 +3,7 @@ {{template "repo/header" .}}
-
-
- -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{ctx.Locale.Tr (printf "search.%s" (or .queryType "fuzzy"))}}
-
-
{{ctx.Locale.Tr "search.fuzzy"}}
-
{{ctx.Locale.Tr "search.match"}}
-
-
- -
-
+ {{template "code/searchform" .}}
{{if .CodeIndexerUnavailable}}
From d647d6a10ed46d8143583f99de1afb3faaa1cc80 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 9 Mar 2024 15:25:22 +0100 Subject: [PATCH 04/18] WIP --- templates/admin/repo/search.tmpl | 29 --------------------- templates/explore/repo_search.tmpl | 42 ------------------------------ 2 files changed, 71 deletions(-) delete mode 100644 templates/admin/repo/search.tmpl delete mode 100644 templates/explore/repo_search.tmpl diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl deleted file mode 100644 index 650bc99e8bc66..0000000000000 --- a/templates/admin/repo/search.tmpl +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
- {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
-
- -
- - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
- {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.by_size"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_by_size"}} -
-
-
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl deleted file mode 100644 index 0895eee7b32e5..0000000000000 --- a/templates/explore/repo_search.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -
-
- - -
- {{template "shared/search/input" dict "Value" .Keyword}} - {{if .PageIsExploreRepositories}} - - {{else if .TabName}} - - {{end}} - {{template "shared/search/button"}} -
-
- -
- - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
- {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{if not .DisableStars}} - {{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}} - {{end}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}} -
-
-
-{{if and .PageIsExploreRepositories .OnlyShowRelevant}} -
- {{ctx.Locale.Tr "explore.relevant_repositories" (printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))}} -
-{{end}} -
From 11dca6e55d51c3b31bf291787a251ac3a080556c Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 9 Mar 2024 15:26:28 +0100 Subject: [PATCH 05/18] WIP --- package-lock.json | 323 ++++++++++++++++++++++------------------------ 1 file changed, 154 insertions(+), 169 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb5407b05dc70..6a6eb4b947836 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1459,9 +1459,9 @@ "dev": true }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.1.tgz", - "integrity": "sha512-iU2Sya8hNn1LhsYyf0N+L4Gf9Qc+9eBTJJJsaOGUp+7x4n2M9dxTt8UvhJl3oeftSjblSlpCfvjA/IfP3g5VjQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz", + "integrity": "sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==", "cpu": [ "arm" ], @@ -1472,9 +1472,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.1.tgz", - "integrity": "sha512-wlzcWiH2Ir7rdMELxFE5vuM7D6TsOcJ2Yw0c3vaBR3VOsJFVTx9xvwnAvhgU5Ii8Gd6+I11qNHwndDscIm0HXg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz", + "integrity": "sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==", "cpu": [ "arm64" ], @@ -1485,9 +1485,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.1.tgz", - "integrity": "sha512-YRXa1+aZIFN5BaImK+84B3uNK8C6+ynKLPgvn29X9s0LTVCByp54TB7tdSMHDR7GTV39bz1lOmlLDuedgTwwHg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz", + "integrity": "sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==", "cpu": [ "arm64" ], @@ -1498,9 +1498,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.1.tgz", - "integrity": "sha512-opjWJ4MevxeA8FhlngQWPBOvVWYNPFkq6/25rGgG+KOy0r8clYwL1CFd+PGwRqqMFVQ4/Qd3sQu5t7ucP7C/Uw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz", + "integrity": "sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==", "cpu": [ "x64" ], @@ -1511,9 +1511,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.1.tgz", - "integrity": "sha512-uBkwaI+gBUlIe+EfbNnY5xNyXuhZbDSx2nzzW8tRMjUmpScd6lCQYKY2V9BATHtv5Ef2OBq6SChEP8h+/cxifQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz", + "integrity": "sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==", "cpu": [ "arm" ], @@ -1524,9 +1524,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.1.tgz", - "integrity": "sha512-0bK9aG1kIg0Su7OcFTlexkVeNZ5IzEsnz1ept87a0TUgZ6HplSgkJAnFpEVRW7GRcikT4GlPV0pbtVedOaXHQQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz", + "integrity": "sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==", "cpu": [ "arm64" ], @@ -1537,9 +1537,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.1.tgz", - "integrity": "sha512-qB6AFRXuP8bdkBI4D7UPUbE7OQf7u5OL+R94JE42Z2Qjmyj74FtDdLGeriRyBDhm4rQSvqAGCGC01b8Fu2LthQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz", + "integrity": "sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==", "cpu": [ "arm64" ], @@ -1550,9 +1550,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.1.tgz", - "integrity": "sha512-sHig3LaGlpNgDj5o8uPEoGs98RII8HpNIqFtAI8/pYABO8i0nb1QzT0JDoXF/pxzqO+FkxvwkHZo9k0NJYDedg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz", + "integrity": "sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==", "cpu": [ "riscv64" ], @@ -1563,9 +1563,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.1.tgz", - "integrity": "sha512-nD3YcUv6jBJbBNFvSbp0IV66+ba/1teuBcu+fBBPZ33sidxitc6ErhON3JNavaH8HlswhWMC3s5rgZpM4MtPqQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz", + "integrity": "sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==", "cpu": [ "x64" ], @@ -1576,9 +1576,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.1.tgz", - "integrity": "sha512-7/XVZqgBby2qp/cO0TQ8uJK+9xnSdJ9ct6gSDdEr4MfABrjTyrW6Bau7HQ73a2a5tPB7hno49A0y1jhWGDN9OQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz", + "integrity": "sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==", "cpu": [ "x64" ], @@ -1589,9 +1589,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.1.tgz", - "integrity": "sha512-CYc64bnICG42UPL7TrhIwsJW4QcKkIt9gGlj21gq3VV0LL6XNb1yAdHVp1pIi9gkts9gGcT3OfUYHjGP7ETAiw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz", + "integrity": "sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==", "cpu": [ "arm64" ], @@ -1602,9 +1602,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.1.tgz", - "integrity": "sha512-LN+vnlZ9g0qlHGlS920GR4zFCqAwbv2lULrR29yGaWP9u7wF5L7GqWu9Ah6/kFZPXPUkpdZwd//TNR+9XC9hvA==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz", + "integrity": "sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==", "cpu": [ "ia32" ], @@ -1615,9 +1615,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.1.tgz", - "integrity": "sha512-n+vkrSyphvmU0qkQ6QBNXCGr2mKjhP08mPRM/Xp5Ck2FV4NrHU+y6axzDeixUrCBHVUS51TZhjqrKBBsHLKb2Q==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz", + "integrity": "sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==", "cpu": [ "x64" ], @@ -2235,9 +2235,9 @@ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==" }, "node_modules/@types/node": { - "version": "20.11.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.25.tgz", - "integrity": "sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==", + "version": "20.11.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz", + "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==", "dependencies": { "undici-types": "~5.26.4" } @@ -2280,16 +2280,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.1.tgz", - "integrity": "sha512-zioDz623d0RHNhvx0eesUmGfIjzrk18nSBC8xewepKXbBvN/7c1qImV7Hg8TI1URTxKax7/zxfxj3Uph8Chcuw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz", + "integrity": "sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "7.1.1", - "@typescript-eslint/type-utils": "7.1.1", - "@typescript-eslint/utils": "7.1.1", - "@typescript-eslint/visitor-keys": "7.1.1", + "@typescript-eslint/scope-manager": "7.1.0", + "@typescript-eslint/type-utils": "7.1.0", + "@typescript-eslint/utils": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2315,15 +2315,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.1.1.tgz", - "integrity": "sha512-ZWUFyL0z04R1nAEgr9e79YtV5LbafdOtN7yapNbn1ansMyaegl2D4bL7vHoJ4HPSc4CaLwuCVas8CVuneKzplQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.1.0.tgz", + "integrity": "sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.1.1", - "@typescript-eslint/types": "7.1.1", - "@typescript-eslint/typescript-estree": "7.1.1", - "@typescript-eslint/visitor-keys": "7.1.1", + "@typescript-eslint/scope-manager": "7.1.0", + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/typescript-estree": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0", "debug": "^4.3.4" }, "engines": { @@ -2343,13 +2343,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.1.1.tgz", - "integrity": "sha512-cirZpA8bJMRb4WZ+rO6+mnOJrGFDd38WoXCEI57+CYBqta8Yc8aJym2i7vyqLL1vVYljgw0X27axkUXz32T8TA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz", + "integrity": "sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.1.1", - "@typescript-eslint/visitor-keys": "7.1.1" + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2360,13 +2360,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.1.1.tgz", - "integrity": "sha512-5r4RKze6XHEEhlZnJtR3GYeCh1IueUHdbrukV2KSlLXaTjuSfeVF8mZUVPLovidCuZfbVjfhi4c0DNSa/Rdg5g==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz", + "integrity": "sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.1.1", - "@typescript-eslint/utils": "7.1.1", + "@typescript-eslint/typescript-estree": "7.1.0", + "@typescript-eslint/utils": "7.1.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2387,9 +2387,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.1.1.tgz", - "integrity": "sha512-KhewzrlRMrgeKm1U9bh2z5aoL4s7K3tK5DwHDn8MHv0yQfWFz/0ZR6trrIHHa5CsF83j/GgHqzdbzCXJ3crx0Q==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.1.0.tgz", + "integrity": "sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2400,13 +2400,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.1.tgz", - "integrity": "sha512-9ZOncVSfr+sMXVxxca2OJOPagRwT0u/UHikM2Rd6L/aB+kL/QAuTnsv6MeXtjzCJYb8PzrXarypSGIPx3Jemxw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz", + "integrity": "sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.1.1", - "@typescript-eslint/visitor-keys": "7.1.1", + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2428,17 +2428,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.1.1.tgz", - "integrity": "sha512-thOXM89xA03xAE0lW7alstvnyoBUbBX38YtY+zAUcpRPcq9EIhXPuJ0YTv948MbzmKh6e1AUszn5cBFK49Umqg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.1.0.tgz", + "integrity": "sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.1.1", - "@typescript-eslint/types": "7.1.1", - "@typescript-eslint/typescript-estree": "7.1.1", + "@typescript-eslint/scope-manager": "7.1.0", + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/typescript-estree": "7.1.0", "semver": "^7.5.4" }, "engines": { @@ -2453,12 +2453,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.1.tgz", - "integrity": "sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz", + "integrity": "sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.1.1", + "@typescript-eslint/types": "7.1.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2558,9 +2558,9 @@ } }, "node_modules/@vitest/snapshot/node_modules/magic-string": { - "version": "0.30.8", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", - "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "version": "0.30.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", + "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -2649,9 +2649,9 @@ } }, "node_modules/@vue/compiler-sfc/node_modules/magic-string": { - "version": "0.30.8", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", - "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "version": "0.30.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", + "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -3563,9 +3563,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001596", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001596.tgz", - "integrity": "sha512-zpkZ+kEr6We7w63ORkoJ2pOfBwBkY/bJrG/UZ90qNb45Isblu8wzDgevEOrRL1r9dWayHjYiiyCMEXPn4DweGQ==", + "version": "1.0.30001591", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz", + "integrity": "sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==", "funding": [ { "type": "opencollective", @@ -4855,9 +4855,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.699", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.699.tgz", - "integrity": "sha512-I7q3BbQi6e4tJJN5CRcyvxhK0iJb34TV8eJQcgh+fR2fQ8miMgZcEInckCo1U9exDHbfz7DLDnFn8oqH/VcRKw==" + "version": "1.4.690", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.690.tgz", + "integrity": "sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==" }, "node_modules/elkjs": { "version": "0.9.2", @@ -6512,9 +6512,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.3.tgz", - "integrity": "sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", + "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", "dependencies": { "resolve-pkg-maps": "^1.0.0" }, @@ -7031,9 +7031,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz", - "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -7271,13 +7271,10 @@ } }, "node_modules/is-map": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", - "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", "dev": true, - "engines": { - "node": ">= 0.4" - }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7387,13 +7384,10 @@ } }, "node_modules/is-set": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", - "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", "dev": true, - "engines": { - "node": ">= 0.4" - }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7480,13 +7474,10 @@ } }, "node_modules/is-weakmap": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", - "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", "dev": true, - "engines": { - "node": ">= 0.4" - }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7504,16 +7495,13 @@ } }, "node_modules/is-weakset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", - "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -11580,9 +11568,9 @@ } }, "node_modules/terser": { - "version": "5.29.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz", - "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==", + "version": "5.28.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.28.1.tgz", + "integrity": "sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==", "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -11968,9 +11956,9 @@ } }, "node_modules/typescript": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz", - "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "devOptional": true, "peer": true, "bin": { @@ -12172,9 +12160,9 @@ } }, "node_modules/vite": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.5.tgz", - "integrity": "sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.4.tgz", + "integrity": "sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==", "dev": true, "dependencies": { "esbuild": "^0.19.3", @@ -12275,9 +12263,9 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.1.tgz", - "integrity": "sha512-ggqQKvx/PsB0FaWXhIvVkSWh7a/PCLQAsMjBc+nA2M8Rv2/HG0X6zvixAB7KyZBRtifBUhy5k8voQX/mRnABPg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz", + "integrity": "sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -12290,19 +12278,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.12.1", - "@rollup/rollup-android-arm64": "4.12.1", - "@rollup/rollup-darwin-arm64": "4.12.1", - "@rollup/rollup-darwin-x64": "4.12.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.12.1", - "@rollup/rollup-linux-arm64-gnu": "4.12.1", - "@rollup/rollup-linux-arm64-musl": "4.12.1", - "@rollup/rollup-linux-riscv64-gnu": "4.12.1", - "@rollup/rollup-linux-x64-gnu": "4.12.1", - "@rollup/rollup-linux-x64-musl": "4.12.1", - "@rollup/rollup-win32-arm64-msvc": "4.12.1", - "@rollup/rollup-win32-ia32-msvc": "4.12.1", - "@rollup/rollup-win32-x64-msvc": "4.12.1", + "@rollup/rollup-android-arm-eabi": "4.12.0", + "@rollup/rollup-android-arm64": "4.12.0", + "@rollup/rollup-darwin-arm64": "4.12.0", + "@rollup/rollup-darwin-x64": "4.12.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.12.0", + "@rollup/rollup-linux-arm64-gnu": "4.12.0", + "@rollup/rollup-linux-arm64-musl": "4.12.0", + "@rollup/rollup-linux-riscv64-gnu": "4.12.0", + "@rollup/rollup-linux-x64-gnu": "4.12.0", + "@rollup/rollup-linux-x64-musl": "4.12.0", + "@rollup/rollup-win32-arm64-msvc": "4.12.0", + "@rollup/rollup-win32-ia32-msvc": "4.12.0", + "@rollup/rollup-win32-x64-msvc": "4.12.0", "fsevents": "~2.3.2" } }, @@ -12372,9 +12360,9 @@ } }, "node_modules/vitest/node_modules/magic-string": { - "version": "0.30.8", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", - "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "version": "0.30.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", + "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -12814,18 +12802,15 @@ } }, "node_modules/which-collection": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", - "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", "dev": true, "dependencies": { - "is-map": "^2.0.3", - "is-set": "^2.0.3", - "is-weakmap": "^2.0.2", - "is-weakset": "^2.0.3" - }, - "engines": { - "node": ">= 0.4" + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13030,9 +13015,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz", - "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.0.tgz", + "integrity": "sha512-j9iR8g+/t0lArF4V6NE/QCfT+CO7iLqrXAHZbJdo+LfjqP1vR8Fg5bSiaq6Q2lOD1AUEVrEVIgABvBFYojJVYQ==", "bin": { "yaml": "bin.mjs" }, From d9b35e34ae164ab4a55c362bca87abc9b5e65098 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 10 Mar 2024 17:17:10 +0100 Subject: [PATCH 06/18] finish --- options/locale/locale_en-US.ini | 21 +++++++--- routers/web/explore/code.go | 5 +-- routers/web/repo/search.go | 5 +-- routers/web/user/code.go | 6 +-- services/context/pagination.go | 2 +- templates/admin/base/search.tmpl | 23 ----------- templates/admin/emails/list.tmpl | 5 +-- templates/admin/org/list.tmpl | 21 +++++++++- templates/admin/packages/list.tmpl | 2 +- templates/admin/user/list.tmpl | 6 +-- templates/code/searchcombo.tmpl | 14 ------- templates/code/searchform.tmpl | 14 ------- templates/code/searchresults.tmpl | 30 -------------- templates/explore/code.tmpl | 2 +- templates/explore/repo_list.tmpl | 2 +- templates/explore/search.tmpl | 9 ++-- templates/explore/user_list.tmpl | 8 +++- templates/explore/users.tmpl | 2 - templates/org/team/members.tmpl | 2 +- templates/org/team/repositories.tmpl | 2 +- templates/package/shared/list.tmpl | 4 +- templates/package/shared/versionlist.tmpl | 6 +-- templates/projects/list.tmpl | 7 +--- templates/repo/branch/list.tmpl | 5 +-- templates/repo/commits_table.tmpl | 16 +++----- templates/repo/home.tmpl | 4 +- templates/repo/search.tmpl | 38 +---------------- templates/repo/settings/collaboration.tmpl | 4 +- templates/repo/settings/protected_branch.tmpl | 12 +++--- templates/repo/settings/tags.tmpl | 4 +- templates/shared/actions/runner_list.tmpl | 6 +-- templates/shared/issuelist.tmpl | 2 +- templates/shared/repo_search.tmpl | 3 +- templates/shared/search/button.tmpl | 2 +- templates/shared/search/code/results.tmpl | 41 +++++++++++++++++++ templates/shared/search/code/search.tmpl | 15 +++++++ templates/shared/search/combo.tmpl | 4 ++ templates/shared/search/combo_fuzzy.tmpl | 5 +++ templates/shared/search/fuzzy.tmpl | 8 ++++ templates/shared/search/input.tmpl | 2 +- templates/user/code.tmpl | 4 +- templates/user/dashboard/milestones.tmpl | 7 +--- templates/user/dashboard/repolist.tmpl | 2 +- 43 files changed, 174 insertions(+), 208 deletions(-) delete mode 100644 templates/admin/base/search.tmpl delete mode 100644 templates/code/searchcombo.tmpl delete mode 100644 templates/code/searchform.tmpl delete mode 100644 templates/code/searchresults.tmpl create mode 100644 templates/shared/search/code/results.tmpl create mode 100644 templates/shared/search/code/search.tmpl create mode 100644 templates/shared/search/combo.tmpl create mode 100644 templates/shared/search/combo_fuzzy.tmpl create mode 100644 templates/shared/search/fuzzy.tmpl diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 38de2b2c7e4e2..e3ee960a9ca17 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -157,16 +157,27 @@ filter.private = Private [search] search = Search -search_kind = Search %s... type_tooltip = Search type fuzzy = Fuzzy fuzzy_tooltip = Include results that also match the search term closely match = Match match_tooltip = Include only results that match the exact search term -no_results = No %s matching your search term found. -unavailable = %s is currently not available. Please contact your site administrator. -kind.code = Code search -kind.keyword = Searching by keyword +repo_kind = Search repos... +repo_no_results = No matching repositories found. +user_kind = Search users... +user_no_results = No matching users found. +org_kind = Search orgs... +org_no_results = No matching organizations found. +team_kind = Search teams... +code_kind = Search code... +code_no_results = No matching source code found. +code_search_unavailable = Code search is currently not available. Please contact your site administrator. +package_kind = Search packages... +project_kind = Search projects... +branch_kind = Search branches... +commit_kind = Search commits... +runner_kind = Search runners... +keyword_search_unavailable = Searching by keyword is currently not available. Please contact your site administrator. [aria] navbar = Navigation Bar diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index a6bc71ac9cde0..7ba5984002c82 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -34,12 +34,11 @@ func Code(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - queryType := ctx.FormTrim("t") - isFuzzy := queryType != "match" + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["queryType"] = queryType + ctx.Data["IsFuzzy"] = isFuzzy ctx.Data["PageIsViewCode"] = true if keyword == "" { diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 766dd5726aa8d..e6201dde06caa 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -24,12 +24,11 @@ func Search(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - queryType := ctx.FormTrim("t") - isFuzzy := queryType != "match" + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["queryType"] = queryType + ctx.Data["IsFuzzy"] = isFuzzy ctx.Data["PageIsViewCode"] = true if keyword == "" { diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 8613d38b65a66..7d957aef4de48 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -35,16 +35,16 @@ func CodeSearch(ctx *context.Context) { ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["Title"] = ctx.Tr("explore.code") + ctx.Data["PageIsExploreCode"] = true language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - queryType := ctx.FormTrim("t") - isFuzzy := queryType != "match" + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["queryType"] = queryType + ctx.Data["IsFuzzy"] = isFuzzy ctx.Data["IsCodePage"] = true if keyword == "" { diff --git a/services/context/pagination.go b/services/context/pagination.go index 68237c630c0ae..655a278f9ff92 100644 --- a/services/context/pagination.go +++ b/services/context/pagination.go @@ -53,5 +53,5 @@ func (p *Pagination) SetDefaultParams(ctx *Context) { p.AddParam(ctx, "sort", "SortType") p.AddParam(ctx, "q", "Keyword") // do not add any more uncommon params here! - p.AddParam(ctx, "t", "queryType") + p.AddParam(ctx, "fuzzy", "IsFuzzy") } diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl deleted file mode 100644 index b2125814a034d..0000000000000 --- a/templates/admin/base/search.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -
-
-
- {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
-
- -
- - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
- {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} -
-
-
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 4a6991912409b..1e552fba889b8 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -6,10 +6,7 @@
-
- {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
+ {{template "shared/search/combo" dict "Value" .Keyword}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 0d79456b47c7f..efb0a8847e12e 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -7,7 +7,26 @@
- {{template "admin/base/search" .}} +
+
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}} +
+ +
+ + {{ctx.Locale.Tr "repo.issues.filter_sort"}} + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+ {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+
+
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 3d40f79277c84..41feef7928f5d 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -15,7 +15,7 @@
{{template "shared/search/input" dict "Value" .Query}} - {{range $type := .AvailableTypes}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index c343573ca525e..11c2fa594034a 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -52,11 +52,7 @@
- -
- {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
diff --git a/templates/code/searchcombo.tmpl b/templates/code/searchcombo.tmpl deleted file mode 100644 index 780713d7c6b93..0000000000000 --- a/templates/code/searchcombo.tmpl +++ /dev/null @@ -1,14 +0,0 @@ -{{template "code/searchform" .}} -
-
- {{if .CodeIndexerUnavailable}} -
-

{{ctx.Locale.Tr "search.unavailable" (ctx.Locale.Tr "search.kind.code")}}

-
- {{else if .SearchResults}} - {{template "code/searchresults" .}} - {{else if .Keyword}} -
{{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.code")}}
- {{end}} -
-{{template "base/paginate" .}} diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl deleted file mode 100644 index 732f7c5324b6f..0000000000000 --- a/templates/code/searchform.tmpl +++ /dev/null @@ -1,14 +0,0 @@ -
-
- {{template "shared/search/input" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}} -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{ctx.Locale.Tr (printf "search.%s" (or .queryType "fuzzy"))}}
-
-
{{ctx.Locale.Tr "search.fuzzy"}}
-
{{ctx.Locale.Tr "search.match"}}
-
-
- {{template "shared/search/button"}} -
- diff --git a/templates/code/searchresults.tmpl b/templates/code/searchresults.tmpl deleted file mode 100644 index 08bb12951d822..0000000000000 --- a/templates/code/searchresults.tmpl +++ /dev/null @@ -1,30 +0,0 @@ -
- {{range $term := .SearchResultLanguages}} - - - {{$term.Language}} -
{{$term.Count}}
- - {{end}} -
-
- {{range $result := .SearchResults}} - {{$repo := (index $.RepoMaps .RepoID)}} -
-

- - {{$repo.FullName}} - {{if $repo.IsArchived}} - {{ctx.Locale.Tr "repo.desc.archived"}} - {{end}} - - {{.Filename}} - - {{ctx.Locale.Tr "repo.diff.view_file"}} -

-
- {{template "shared/searchfile" dict "RepoLink" $repo.Link "SearchResult" .}} -
- {{template "shared/searchbottom" dict "root" $ "result" .}} -
- {{end}} -
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 229857588726b..039933fa2d8f4 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -2,7 +2,7 @@
{{template "explore/navbar" .}}
- {{template "code/searchcombo" .}} + {{template "shared/search/code/search" .}}
{{template "base/footer" .}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 843ab25d4e530..706415fe0a262 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -58,7 +58,7 @@
{{else}}
- {{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.repos")}} + {{ctx.Locale.Tr "search.repo_no_results"}}
{{end}} diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 9215950b7fe18..0beef60e7c2b3 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,9 +1,10 @@
-
- {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
+ {{if .PageIsExploreUsers}} + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}} + {{else}} + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}} + {{end}}
diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index 051fad360a5e0..362570075d0df 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -26,6 +26,12 @@
{{else}} -
{{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.users")}}
+
+ {{if .PageIsExploreUsers}} + {{ctx.Locale.Tr "search.user_no_results"}} + {{else}} + {{ctx.Locale.Tr "search.org_no_results"}} + {{end}} +
{{end}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 7e15ae3d47f46..e9046125c6dd6 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -3,9 +3,7 @@ {{template "explore/navbar" .}}
{{template "explore/search" .}} - {{template "explore/user_list" .}} - {{template "base/paginate" .}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 774ce5f187ac9..02220a917a868 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -14,7 +14,7 @@ diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 3c9d516c4684f..bd38cda6d165a 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -14,7 +14,7 @@ {{.CsrfTokenHtml}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index b32cd6edfbde0..ac9fdac1a4126 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -2,8 +2,8 @@ {{if .HasPackages}}
- {{template "shared/search/input" dict "Value" .Query}} - {{range $type := .AvailableTypes}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 1f313d396b57f..de99cb0ae5b43 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,15 +1,15 @@

{{.PackageDescriptor.Package.Name}} / {{ctx.Locale.Tr "packages.versions"}}

- {{template "shared/search/input" dict "Value" .Query}} - {{if eq .PackageDescriptor.Package.Type "container"}} - {{$isTagged := or (eq .Tagged "") (eq .Tagged "tagged")}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 12459b84ab89d..414c9dca2ef06 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -21,11 +21,8 @@
-
- - {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
+ + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.project_kind")}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index ebf35f4e078e3..48c14cf3430c0 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -75,10 +75,7 @@
-
- {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.branch_kind")}}
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index a51e7ad44d41c..ff855d1852576 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -21,16 +21,12 @@
- {{template "shared/search/input" dict "Value" .Keyword}} -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{if .All}}{{ctx.Locale.Tr "repo.commits.search_all"}}{{else}}{{ctx.Locale.Tr "repo.commits.search_branch"}}{{end}}
-
-
{{ctx.Locale.Tr "repo.commits.search_branch"}}
-
{{ctx.Locale.Tr "repo.commits.search_all"}}
-
-
- {{template "shared/search/button" (ctx.Locale.Tr "repo.commits.search.tooltip")}} + {{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.commit_kind")}} + + {{template "shared/search/button" dict "Tooltip" (ctx.Locale.Tr "repo.commits.search.tooltip")}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 7730b3ad4e8db..721a8544267cd 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -15,8 +15,8 @@
-
- +
+ {{if .CodeIndexerUnavailable}} {{svg "octicon-alert"}} {{end}} diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index c365ad511a2bd..3f5b22b0ce4e6 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -2,43 +2,7 @@
{{template "repo/header" .}}
-
- {{template "code/searchform" .}} -
- {{if .CodeIndexerUnavailable}} -
-

{{ctx.Locale.Tr "search.unavailable" (ctx.Locale.Tr "search.kind.code")}}

-
- {{else if .Keyword}} - {{if .SearchResults}} -
- {{range $term := .SearchResultLanguages}} - - - {{$term.Language}} -
{{$term.Count}}
- - {{end}} -
-
- {{range $result := .SearchResults}} -
-

- {{.Filename}} - {{ctx.Locale.Tr "repo.diff.view_file"}} -

-
- {{template "shared/searchfile" dict "RepoLink" $.SourcePath "SearchResult" .}} -
- {{template "shared/searchbottom" dict "root" $ "result" .}} -
- {{end}} -
- {{template "base/paginate" .}} - {{else}} -
{{ctx.Locale.Tr "search.no_results" (ctx.Locale.Tr "explore.code")}}
- {{end}} - {{end}} + {{template "shared/search/code/search" .}}
{{template "base/footer" .}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 02679804834c9..d7b5c96bab17f 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -42,7 +42,7 @@ {{.CsrfTokenHtml}} @@ -90,7 +90,7 @@
{{.CsrfTokenHtml}} diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 106a21fd53f69..e95dd831c945b 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -52,7 +52,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -67,7 +67,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
@@ -113,7 +113,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -128,7 +128,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
@@ -210,7 +210,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -225,7 +225,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index 244a15e4fec6b..4c196f0f99b48 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -28,7 +28,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "explore.users")}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -43,7 +43,7 @@
-
{{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "repo.settings.teams")}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 3b8f04a85d070..8163007993645 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -33,11 +33,7 @@
- -
- {{template "shared/search/input" dict "Value" .Keyword}} - {{template "shared/search/button"}} -
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.runner_kind")}}
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index c6b456423cec4..2969efa6be0fc 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -153,7 +153,7 @@ {{end}} {{if .IssueIndexerUnavailable}}
-

{{ctx.Locale.Tr "search.unavailable" (ctx.Locale.Tr "search.kind.keyword")}}

+

{{ctx.Locale.Tr "search.keyword_search_unavailable"}}

{{end}}
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl index 4037ed4b6fc29..e72d8c6f5f468 100644 --- a/templates/shared/repo_search.tmpl +++ b/templates/shared/repo_search.tmpl @@ -2,7 +2,7 @@
{{if .Language}}{{end}}
- {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.repo_kind")}} {{if .PageIsExploreRepositories}} {{else if .TabName}} @@ -65,3 +65,4 @@ {{ctx.Locale.Tr "explore.relevant_repositories" (printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))}}
{{end}} +
diff --git a/templates/shared/search/button.tmpl b/templates/shared/search/button.tmpl index dadb37eba808b..2ab5099092275 100644 --- a/templates/shared/search/button.tmpl +++ b/templates/shared/search/button.tmpl @@ -1 +1 @@ - + diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl new file mode 100644 index 0000000000000..19339030b6b11 --- /dev/null +++ b/templates/shared/search/code/results.tmpl @@ -0,0 +1,41 @@ +
+ {{$pageURL := print $.SourcePath "/search"}} + {{if and $.PageIsExploreCode $.ContextUser}} + {{$pageURL = print AppSubUrl "/" $.ContextUser.Name "/-/code"}} + {{else if $.PageIsExploreCode}} + {{$pageURL = print AppSubUrl "/explore/code"}} + {{end}} + {{range $term := .SearchResultLanguages}} + + + {{$term.Language}} +
{{$term.Count}}
+ + {{end}} +
+
+ {{range $result := .SearchResults}} + {{$repoLink := $.SourcePath}} + {{if $.PageIsExploreCode}}{{$repoLink = (index $.RepoMaps .RepoID).Link}}{{end}} +
+

+ + {{if $.PageIsExploreCode}} + {{$repo := (index $.RepoMaps .RepoID)}} + {{$repo.FullName}} + {{if $repo.IsArchived}} + {{ctx.Locale.Tr "repo.desc.archived"}} + {{end}} + -{{end}} {{.Filename}} + + {{ctx.Locale.Tr "repo.diff.view_file"}} +

+
+ {{template "shared/searchfile" dict "RepoLink" $repoLink "SearchResult" .}} +
+ {{template "shared/searchbottom" dict "root" $ "result" .}} +
+ {{end}} +
+{{template "base/paginate" .}} diff --git a/templates/shared/search/code/search.tmpl b/templates/shared/search/code/search.tmpl new file mode 100644 index 0000000000000..7c6076fd04b2b --- /dev/null +++ b/templates/shared/search/code/search.tmpl @@ -0,0 +1,15 @@ + + {{template "shared/search/combo_fuzzy" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable "IsFuzzy" .IsFuzzy "Placeholder" (ctx.Locale.Tr "search.code_kind")}} + +
+
+ {{if .CodeIndexerUnavailable}} +
+

{{ctx.Locale.Tr "search.code_search_unavailable"}}

+
+ {{else if .SearchResults}} + {{template "shared/search/code/results" .}} + {{else if .Keyword}} +
{{ctx.Locale.Tr "search.code_no_results"}}
+ {{end}} +
diff --git a/templates/shared/search/combo.tmpl b/templates/shared/search/combo.tmpl new file mode 100644 index 0000000000000..a163f03b0d35b --- /dev/null +++ b/templates/shared/search/combo.tmpl @@ -0,0 +1,4 @@ +
+ {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} + {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} +
diff --git a/templates/shared/search/combo_fuzzy.tmpl b/templates/shared/search/combo_fuzzy.tmpl new file mode 100644 index 0000000000000..6aefd4cb193cb --- /dev/null +++ b/templates/shared/search/combo_fuzzy.tmpl @@ -0,0 +1,5 @@ +
+ {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} + {{template "shared/search/fuzzy" dict "Disabled" .Disabled "IsFuzzy" .IsFuzzy}} + {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} +
diff --git a/templates/shared/search/fuzzy.tmpl b/templates/shared/search/fuzzy.tmpl new file mode 100644 index 0000000000000..1bb09b3ce2e47 --- /dev/null +++ b/templates/shared/search/fuzzy.tmpl @@ -0,0 +1,8 @@ +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{if .IsFuzzy}}{{ctx.Locale.Tr "search.fuzzy"}}{{else}}{{ctx.Locale.Tr "search.match"}}{{end}}
+
+
{{ctx.Locale.Tr "search.fuzzy"}}
+
{{ctx.Locale.Tr "search.match"}}
+
+
diff --git a/templates/shared/search/input.tmpl b/templates/shared/search/input.tmpl index a715203ce64ca..7076a05c8c211 100644 --- a/templates/shared/search/input.tmpl +++ b/templates/shared/search/input.tmpl @@ -1 +1 @@ - + diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index f71f55c474db5..ff6c69d615814 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -3,7 +3,7 @@
{{template "org/header" .}}
- {{template "code/searchcombo" .}} + {{template "shared/search/code/search" .}}
{{else}} @@ -15,7 +15,7 @@
{{template "user/overview/header" .}} - {{template "code/searchcombo" .}} + {{template "shared/search/code/search" .}}
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 278d10c54148c..1afa26108eea0 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -46,14 +46,11 @@
-
- + - {{template "shared/search/input" dict "Value" $.Keyword}} - {{template "shared/search/button"}} -
+ {{template "shared/search/combo" dict "Value" $.Keyword}}
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index 7724cc5d6a066..a879f1fb9d870 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -9,7 +9,7 @@ const data = { textOrganization: {{ctx.Locale.Tr "organization"}}, textMyRepos: {{ctx.Locale.Tr "home.my_repos"}}, textNewRepo: {{ctx.Locale.Tr "new_repo"}}, - textSearchRepos: {{ctx.Locale.Tr "search.search_kind" (ctx.Locale.Tr "home.my_repos")}}, + textSearchRepos: {{ctx.Locale.Tr "search.repo_kind"}}, textFilter: {{ctx.Locale.Tr "home.filter"}}, textShowArchived: {{ctx.Locale.Tr "home.show_archived"}}, textShowPrivate: {{ctx.Locale.Tr "home.show_private"}}, From 142ff7c424215fa46eb2a2dac848d039a6367430 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 10 Mar 2024 17:38:32 +0100 Subject: [PATCH 07/18] document params for shared templates --- templates/shared/search/button.tmpl | 2 ++ templates/shared/search/combo.tmpl | 4 ++++ templates/shared/search/combo_fuzzy.tmpl | 5 +++++ templates/shared/search/fuzzy.tmpl | 2 ++ templates/shared/search/input.tmpl | 5 ++++- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/templates/shared/search/button.tmpl b/templates/shared/search/button.tmpl index 2ab5099092275..8f56836407131 100644 --- a/templates/shared/search/button.tmpl +++ b/templates/shared/search/button.tmpl @@ -1 +1,3 @@ + + diff --git a/templates/shared/search/combo.tmpl b/templates/shared/search/combo.tmpl index a163f03b0d35b..f86fa845b827a 100644 --- a/templates/shared/search/combo.tmpl +++ b/templates/shared/search/combo.tmpl @@ -1,3 +1,7 @@ + + + +
{{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} diff --git a/templates/shared/search/combo_fuzzy.tmpl b/templates/shared/search/combo_fuzzy.tmpl index 6aefd4cb193cb..052bc24fd6aca 100644 --- a/templates/shared/search/combo_fuzzy.tmpl +++ b/templates/shared/search/combo_fuzzy.tmpl @@ -1,3 +1,8 @@ + + + + +
{{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} {{template "shared/search/fuzzy" dict "Disabled" .Disabled "IsFuzzy" .IsFuzzy}} diff --git a/templates/shared/search/fuzzy.tmpl b/templates/shared/search/fuzzy.tmpl index 1bb09b3ce2e47..e14770d801547 100644 --- a/templates/shared/search/fuzzy.tmpl +++ b/templates/shared/search/fuzzy.tmpl @@ -1,3 +1,5 @@ + +
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{if .IsFuzzy}}{{ctx.Locale.Tr "search.fuzzy"}}{{else}}{{ctx.Locale.Tr "search.match"}}{{end}}
diff --git a/templates/shared/search/input.tmpl b/templates/shared/search/input.tmpl index 7076a05c8c211..f8b0fd759f542 100644 --- a/templates/shared/search/input.tmpl +++ b/templates/shared/search/input.tmpl @@ -1 +1,4 @@ - + + + + From e04497dd704e5f8c47163756ce017929a111628e Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 10 Mar 2024 17:52:39 +0100 Subject: [PATCH 08/18] make test pass --- templates/shared/search/code/results.tmpl | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index 19339030b6b11..4bcf3a3071c97 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -20,15 +20,18 @@ {{if $.PageIsExploreCode}}{{$repoLink = (index $.RepoMaps .RepoID).Link}}{{end}}

- - {{if $.PageIsExploreCode}} - {{$repo := (index $.RepoMaps .RepoID)}} - {{$repo.FullName}} + {{if $.PageIsExploreCode}} + + {{$repo := (index $.RepoMaps .RepoID)}} + {{$repo.FullName}} {{if $repo.IsArchived}} {{ctx.Locale.Tr "repo.desc.archived"}} {{end}} - -{{end}} {{.Filename}} - + - {{.Filename}} + + {{else}} + {{.Filename}} + {{end}} {{ctx.Locale.Tr "repo.diff.view_file"}}

From 5774a2c2b51557ecd8d1a0b3dd95f1f0d72f17eb Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 10 Mar 2024 20:43:39 +0100 Subject: [PATCH 09/18] no autofocus if disabled --- templates/shared/search/input.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/search/input.tmpl b/templates/shared/search/input.tmpl index f8b0fd759f542..16398664c9af4 100644 --- a/templates/shared/search/input.tmpl +++ b/templates/shared/search/input.tmpl @@ -1,4 +1,4 @@ - + From a7b955f8e413fff1e3c0df48ce40fbd43782b1ca Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Wed, 13 Mar 2024 06:19:15 +0100 Subject: [PATCH 10/18] remove primary color from button --- templates/shared/search/button.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/search/button.tmpl b/templates/shared/search/button.tmpl index 8f56836407131..5399cc12186ab 100644 --- a/templates/shared/search/button.tmpl +++ b/templates/shared/search/button.tmpl @@ -1,3 +1,3 @@ - + From e222490309cc738fc3896f398e98ee41687e40d1 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Wed, 13 Mar 2024 20:02:29 +0100 Subject: [PATCH 11/18] Update templates/package/shared/list.tmpl --- templates/package/shared/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index ac9fdac1a4126..ad79c9b7baad8 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -2,7 +2,7 @@ {{if .HasPackages}}
- {{template "shared/search/input" dict "Value" .Query (ctx.Locale.Tr "search.package_kind")}} + {{template "shared/search/input" dict "Value" .Query "Placeholder" (ctx.Locale.Tr "search.package_kind")}} diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index 3e246e428e83e..c65cfd9db417e 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -8,10 +8,10 @@
-
- - - {{template "shared/search/button"}} +
+ + + {{template "shared/search/button"}}
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 706415fe0a262..17c8bcb6a3c5f 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -58,7 +58,7 @@
{{else}}
- {{ctx.Locale.Tr "search.repo_no_results"}} + {{ctx.Locale.Tr "search.no_results"}}
{{end}}
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 0beef60e7c2b3..54d995989a38a 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,4 +1,4 @@ -
+
{{if .PageIsExploreUsers}} {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}} @@ -7,7 +7,7 @@ {{end}} -
+
{{ctx.Locale.Tr "repo.issues.filter_sort"}} diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index 362570075d0df..fb86fbbea2342 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -27,11 +27,7 @@
{{else}}
- {{if .PageIsExploreUsers}} - {{ctx.Locale.Tr "search.user_no_results"}} - {{else}} - {{ctx.Locale.Tr "search.org_no_results"}} - {{end}} + {{ctx.Locale.Tr "search.no_results"}}
{{end}}
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index ad79c9b7baad8..a9ee023061ca4 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,7 +1,7 @@ {{template "base/alert" .}} {{if .HasPackages}}
-
+
{{template "shared/search/input" dict "Value" .Query "Placeholder" (ctx.Locale.Tr "search.package_kind")}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index ff855d1852576..6e8024fcb3214 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -20,7 +20,7 @@ {{if .PageIsCommits}}
-
+
{{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.commit_kind")}} {{end}} -
+
{{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.repo_kind")}} {{if .PageIsExploreRepositories}} @@ -11,7 +11,7 @@ {{template "shared/search/button"}}
-
+
{{ctx.Locale.Tr "filter"}} @@ -36,7 +36,7 @@
-
+
{{ctx.Locale.Tr "repo.issues.filter_sort"}} diff --git a/templates/shared/search/button.tmpl b/templates/shared/search/button.tmpl index 5399cc12186ab..7bb1662e1532a 100644 --- a/templates/shared/search/button.tmpl +++ b/templates/shared/search/button.tmpl @@ -1,3 +1,3 @@ - - +{{/* Disable (optional) - if search button has to be disabled */}} +{{/* Tooltip (optional) - a tooltip to be displayed on hover */}} diff --git a/templates/shared/search/code/search.tmpl b/templates/shared/search/code/search.tmpl index 7c6076fd04b2b..545ec1ea657a5 100644 --- a/templates/shared/search/code/search.tmpl +++ b/templates/shared/search/code/search.tmpl @@ -10,6 +10,6 @@ {{else if .SearchResults}} {{template "shared/search/code/results" .}} {{else if .Keyword}} -
{{ctx.Locale.Tr "search.code_no_results"}}
+
{{ctx.Locale.Tr "search.no_results"}}
{{end}}
diff --git a/templates/shared/search/combo.tmpl b/templates/shared/search/combo.tmpl index f86fa845b827a..788db95cc19ef 100644 --- a/templates/shared/search/combo.tmpl +++ b/templates/shared/search/combo.tmpl @@ -1,8 +1,8 @@ - - - - -
+{{/* Value - value of the search field (for search results page) */}} +{{/* Disabled (optional) - if search field/button has to be disabled */}} +{{/* Placeholder (optional) - placeholder text to be used */}} +{{/* Tooltip (optional) - a tooltip to be displayed on button hover */}} +
{{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}}
diff --git a/templates/shared/search/combo_fuzzy.tmpl b/templates/shared/search/combo_fuzzy.tmpl index 052bc24fd6aca..3540a89ecb0dd 100644 --- a/templates/shared/search/combo_fuzzy.tmpl +++ b/templates/shared/search/combo_fuzzy.tmpl @@ -1,9 +1,9 @@ - - - - - -
+{{/* Value - value of the search field (for search results page) */}} +{{/* Disabled (optional) - if search field/button has to be disabled */}} +{{/* Placeholder (optional) - placeholder text to be used */}} +{{/* IsFuzzy - state of the fuzzy search toggle */}} +{{/* Tooltip (optional) - a tooltip to be displayed on button hover */}} +
{{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} {{template "shared/search/fuzzy" dict "Disabled" .Disabled "IsFuzzy" .IsFuzzy}} {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} diff --git a/templates/shared/search/fuzzy.tmpl b/templates/shared/search/fuzzy.tmpl index e14770d801547..6ddb03c004b0e 100644 --- a/templates/shared/search/fuzzy.tmpl +++ b/templates/shared/search/fuzzy.tmpl @@ -1,5 +1,5 @@ - - +{{/* Disabled (optional) - if dropdown has to be disabled */}} +{{/* IsFuzzy - state of the fuzzy search toggle */}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{if .IsFuzzy}}{{ctx.Locale.Tr "search.fuzzy"}}{{else}}{{ctx.Locale.Tr "search.match"}}{{end}}
diff --git a/templates/shared/search/input.tmpl b/templates/shared/search/input.tmpl index 16398664c9af4..195cefc2f6f7c 100644 --- a/templates/shared/search/input.tmpl +++ b/templates/shared/search/input.tmpl @@ -1,4 +1,4 @@ - - - - +{{/* Value - value of the search field (for search results page) */}} +{{/* Disabled (optional) - if search field has to be disabled */}} +{{/* Placeholder (optional) - placeholder text to be used */}} + diff --git a/web_src/css/form.css b/web_src/css/form.css index 1580a0b4ccedc..4b4f39854db45 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -41,6 +41,11 @@ textarea, color: var(--color-input-text); } +/* fix fomantic small dropdown having inconsistent padding with input */ +.ui.small.selection.dropdown { + padding: .67857143em 3.2em .67857143em 1em +} + input:hover, textarea:hover, .ui.input input:hover, diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 6f742bbea05aa..2e8f335ce599b 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -355,7 +355,7 @@ export default sfc; // activate the IDE's Vue plugin
-
+
From 3d2d2138d2272f782be9740ad2d4f074ba4d6f00 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 14 Mar 2024 20:15:33 +0100 Subject: [PATCH 14/18] Update web_src/css/form.css Co-authored-by: silverwind --- web_src/css/form.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/form.css b/web_src/css/form.css index 4b4f39854db45..ca65b677d7106 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -43,7 +43,7 @@ textarea, /* fix fomantic small dropdown having inconsistent padding with input */ .ui.small.selection.dropdown { - padding: .67857143em 3.2em .67857143em 1em + padding: .67857143em 3.2em .67857143em 1em; } input:hover, From ea418f38ff41426341f6d4128688d3bc0d304c56 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 14 Mar 2024 20:41:09 +0100 Subject: [PATCH 15/18] css fixes --- web_src/css/base.css | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index e53e0619c80e6..996002a645fdf 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -282,16 +282,24 @@ ol.ui.list li, .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection { min-width: 10em; } - -.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(:focus,:hover) { - border-right-color: transparent; +.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(:focus) { + border-right: none; +} +.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(.active):hover { + border-color: var(--color-input-border); +} +.ui.action.input:not([class*="left action"]) .ui.dropdown.selection.upward.visible { + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; } - .ui.action.input:not([class*="left action"]) > input, .ui.action.input:not([class*="left action"]) > input:hover { - border-right: 1px solid transparent; + border-right: none; +} +.ui.action.input:not([class*="left action"]) > input:focus + .ui.dropdown.selection, +.ui.action.input:not([class*="left action"]) > input:focus + .ui.dropdown.selection:hover { + border-left-color: var(--color-primary); } - .ui.action.input:not([class*="left action"]) > input:focus { border-right-color: var(--color-primary); } @@ -610,10 +618,6 @@ ol.ui.list li, border-color: var(--color-primary); } -.ui.selection.dropdown .menu { - margin: 0 -1.25px; -} - .ui.pointing.dropdown > .menu:not(.hidden)::after { background: var(--color-menu); box-shadow: -1px -1px 0 0 var(--color-secondary); From 8aaa5ca4e037f882a006344cf542d20d4695c48e Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 14 Mar 2024 21:59:59 +0100 Subject: [PATCH 16/18] simplify code search template --- routers/web/repo/search.go | 2 +- routers/web/user/code.go | 1 - templates/shared/search/code/results.tmpl | 20 ++++++-------------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index e6201dde06caa..16e620f57d4ef 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -53,7 +53,7 @@ func Search(ctx *context.Context) { ctx.Data["CodeIndexerUnavailable"] = !code_indexer.IsAvailable(ctx) } - ctx.Data["SourcePath"] = ctx.Repo.Repository.Link() + ctx.Data["Repo"] = ctx.Repo.Repository ctx.Data["SearchResults"] = searchResults ctx.Data["SearchResultLanguages"] = searchResultLanguages diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 7d957aef4de48..92911edfe9325 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -35,7 +35,6 @@ func CodeSearch(ctx *context.Context) { ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["Title"] = ctx.Tr("explore.code") - ctx.Data["PageIsExploreCode"] = true language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index 4bcf3a3071c97..de5ee0c311efe 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -1,13 +1,7 @@
- {{$pageURL := print $.SourcePath "/search"}} - {{if and $.PageIsExploreCode $.ContextUser}} - {{$pageURL = print AppSubUrl "/" $.ContextUser.Name "/-/code"}} - {{else if $.PageIsExploreCode}} - {{$pageURL = print AppSubUrl "/explore/code"}} - {{end}} {{range $term := .SearchResultLanguages}} + href="{{$.Link}}?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}&fuzzy={{$.IsFuzzy}}"> {{$term.Language}}
{{$term.Count}}
@@ -16,14 +10,12 @@
{{range $result := .SearchResults}} - {{$repoLink := $.SourcePath}} - {{if $.PageIsExploreCode}}{{$repoLink = (index $.RepoMaps .RepoID).Link}}{{end}} + {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}

- {{if $.PageIsExploreCode}} + {{if not $.Repo}} - {{$repo := (index $.RepoMaps .RepoID)}} - {{$repo.FullName}} + {{$repo.FullName}} {{if $repo.IsArchived}} {{ctx.Locale.Tr "repo.desc.archived"}} {{end}} @@ -32,10 +24,10 @@ {{else}} {{.Filename}} {{end}} - {{ctx.Locale.Tr "repo.diff.view_file"}} + {{ctx.Locale.Tr "repo.diff.view_file"}}

- {{template "shared/searchfile" dict "RepoLink" $repoLink "SearchResult" .}} + {{template "shared/searchfile" dict "RepoLink" $repo.Link "SearchResult" .}}
{{template "shared/searchbottom" dict "root" $ "result" .}}
From 0601976f5518dfd1bc4cb3fce78edd8b9aa124d8 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 14 Mar 2024 22:20:59 +0100 Subject: [PATCH 17/18] move commits search dropdown out --- templates/repo/commits_search_dropdown.tmpl | 8 ++++++++ templates/repo/commits_table.tmpl | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 templates/repo/commits_search_dropdown.tmpl diff --git a/templates/repo/commits_search_dropdown.tmpl b/templates/repo/commits_search_dropdown.tmpl new file mode 100644 index 0000000000000..5aa3f4f320b00 --- /dev/null +++ b/templates/repo/commits_search_dropdown.tmpl @@ -0,0 +1,8 @@ +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{if .All}}{{ctx.Locale.Tr "repo.commits.search_all"}}{{else}}{{ctx.Locale.Tr "repo.commits.search_branch"}}{{end}}
+
+
{{ctx.Locale.Tr "repo.commits.search_branch"}}
+
{{ctx.Locale.Tr "repo.commits.search_all"}}
+
+
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 6e8024fcb3214..221ee8d99b98e 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -22,10 +22,7 @@
{{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.commit_kind")}} - + {{template "repo/commits_search_dropdown" .}} {{template "shared/search/button" dict "Tooltip" (ctx.Locale.Tr "repo.commits.search.tooltip")}}
From 329c2f4807536b292f6cc8ce26e6975af7596fe1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 14 Mar 2024 22:39:32 +0100 Subject: [PATCH 18/18] fix button left border on focus --- web_src/css/base.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 996002a645fdf..1c6b3fa488421 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -297,7 +297,9 @@ ol.ui.list li, border-right: none; } .ui.action.input:not([class*="left action"]) > input:focus + .ui.dropdown.selection, -.ui.action.input:not([class*="left action"]) > input:focus + .ui.dropdown.selection:hover { +.ui.action.input:not([class*="left action"]) > input:focus + .ui.dropdown.selection:hover, +.ui.action.input:not([class*="left action"]) > input:focus + .button, +.ui.action.input:not([class*="left action"]) > input:focus + .button:hover { border-left-color: var(--color-primary); } .ui.action.input:not([class*="left action"]) > input:focus {