From d32eb07837ccb50429b11f9916e667ef2c8e55d4 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 26 Dec 2024 07:38:20 +0000 Subject: [PATCH 01/16] Optimize the dashboard --- options/locale/locale_en-US.ini | 5 ++++ templates/user/dashboard/dashboard.tmpl | 1 + templates/user/dashboard/guide.tmpl | 8 ++++++ templates/user/dashboard/repolist.tmpl | 7 ++++- web_src/css/dashboard.css | 4 +++ web_src/js/components/DashboardRepoList.vue | 32 +++++++++++++++++++-- web_src/js/svg.ts | 4 +++ 7 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 templates/user/dashboard/guide.tmpl diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ea4d36fb1ca7d..4d709af4af1c4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -27,6 +27,9 @@ licenses = Licenses return_to_gitea = Return to Gitea more_items = More items +guide.welcome = Welcome to the Gitea. +guide.welcome_desc = Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD. + username = Username email = Email Address password = Password @@ -1010,6 +1013,7 @@ visibility.private = Private visibility.private_tooltip = Visible only to members of organizations you have joined [repo] +empty = There are no repositories yet. new_repo_helper = A repository contains all project files, including revision history. Already hosting one elsewhere? Migrate repository. owner = Owner owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit. @@ -2738,6 +2742,7 @@ contributors.what = contributions recent_commits.what = recent commits [org] +empty = There are no organizations yet. org_name_holder = Organization Name org_full_name_holder = Organization Full Name org_name_helper = Organization names should be short and memorable. diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 5dc46dc0a5d0a..17d1a44dd9fd3 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -5,6 +5,7 @@
{{template "base/alert" .}} {{template "user/heatmap" .}} + {{template "user/dashboard/guide" .}} {{template "user/dashboard/feeds" .}}
{{template "user/dashboard/repolist" .}} diff --git a/templates/user/dashboard/guide.tmpl b/templates/user/dashboard/guide.tmpl new file mode 100644 index 0000000000000..feebfc25eed81 --- /dev/null +++ b/templates/user/dashboard/guide.tmpl @@ -0,0 +1,8 @@ +{{if not .Feeds}} +
+ +

{{ctx.Locale.Tr "guide.welcome"}}

+

{{ctx.Locale.Tr "guide.welcome_desc"}}

+
+{{end}} + diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index a2764ba608442..8edb64c4ae820 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -5,10 +5,15 @@ const data = { isMirrorsEnabled: {{.MirrorsEnabled}}, isStarsEnabled: {{not .IsDisableStars}}, + canCreateMigrations: {{not .DisableMigrations}}, + + textNoOrg: {{ctx.Locale.Tr "org.empty"}}, + textNoRepo: {{ctx.Locale.Tr "repo.empty"}}, textRepository: {{ctx.Locale.Tr "repository"}}, textOrganization: {{ctx.Locale.Tr "organization"}}, textMyRepos: {{ctx.Locale.Tr "home.my_repos"}}, textNewRepo: {{ctx.Locale.Tr "new_repo"}}, + textNewMigrate: {{ctx.Locale.Tr "new_migrate"}}, textSearchRepos: {{ctx.Locale.Tr "search.repo_kind"}}, textFilter: {{ctx.Locale.Tr "home.filter"}}, textShowArchived: {{ctx.Locale.Tr "home.show_archived"}}, @@ -56,4 +61,4 @@ data.organizationId = {{.ContextUser.ID}}; window.config.pageData.dashboardRepoList = data; -
+
diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css index 0962215ac6ad8..9f97d0a5e4157 100644 --- a/web_src/css/dashboard.css +++ b/web_src/css/dashboard.css @@ -70,3 +70,7 @@ .dashboard .secondary-nav .ui.dropdown { max-width: 100%; } + +.dashboard #dashboard-repo-list.is-loading { + aspect-ratio: 5.415; /* the size is about 790 x 145 */ +} diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 41793d60ed66d..d4f130c056881 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -113,7 +113,7 @@ const sfc = { this.changeReposFilter(this.reposFilter); fomanticQuery(el.querySelector('.ui.dropdown')).dropdown(); nextTick(() => { - this.$refs.search.focus(); + this.$refs.search?.focus(); }); this.textArchivedFilterTitles = { @@ -340,6 +340,7 @@ const sfc = { export function initDashboardRepoList() { const el = document.querySelector('#dashboard-repo-list'); if (el) { + el.classList.remove('is-loading'); createApp(sfc).mount(el); } } @@ -362,10 +363,25 @@ export default sfc; // activate the IDE's Vue plugin -
+
+
+ +

{{ textNoRepo }}

+

+ + {{ textNewRepo }} + +

+

+ + {{ textNewMigrate }} + +

+
+
- +
@@ -475,6 +491,16 @@ export default sfc; // activate the IDE's Vue plugin +
+
+ +

{{ textNoOrg }}

+

+ + {{ textNewOrg }} + +

+
  • diff --git a/web_src/js/svg.ts b/web_src/js/svg.ts index 90b12fa87d753..5a0f6a19f0eac 100644 --- a/web_src/js/svg.ts +++ b/web_src/js/svg.ts @@ -50,6 +50,7 @@ import octiconLock from '../../public/assets/img/svg/octicon-lock.svg'; import octiconMeter from '../../public/assets/img/svg/octicon-meter.svg'; import octiconMilestone from '../../public/assets/img/svg/octicon-milestone.svg'; import octiconMirror from '../../public/assets/img/svg/octicon-mirror.svg'; +import octiconNoEntry from '../../public/assets/img/svg/octicon-no-entry.svg'; import octiconOrganization from '../../public/assets/img/svg/octicon-organization.svg'; import octiconPlay from '../../public/assets/img/svg/octicon-play.svg'; import octiconPlus from '../../public/assets/img/svg/octicon-plus.svg'; @@ -57,6 +58,7 @@ import octiconProject from '../../public/assets/img/svg/octicon-project.svg'; import octiconQuote from '../../public/assets/img/svg/octicon-quote.svg'; import octiconRepo from '../../public/assets/img/svg/octicon-repo.svg'; import octiconRepoForked from '../../public/assets/img/svg/octicon-repo-forked.svg'; +import octiconRepoPush from '../../public/assets/img/svg/octicon-repo-push.svg'; import octiconRepoTemplate from '../../public/assets/img/svg/octicon-repo-template.svg'; import octiconRss from '../../public/assets/img/svg/octicon-rss.svg'; import octiconScreenFull from '../../public/assets/img/svg/octicon-screen-full.svg'; @@ -126,6 +128,7 @@ const svgs = { 'octicon-meter': octiconMeter, 'octicon-milestone': octiconMilestone, 'octicon-mirror': octiconMirror, + 'octicon-no-entry': octiconNoEntry, 'octicon-organization': octiconOrganization, 'octicon-play': octiconPlay, 'octicon-plus': octiconPlus, @@ -133,6 +136,7 @@ const svgs = { 'octicon-quote': octiconQuote, 'octicon-repo': octiconRepo, 'octicon-repo-forked': octiconRepoForked, + 'octicon-repo-push': octiconRepoPush, 'octicon-repo-template': octiconRepoTemplate, 'octicon-rss': octiconRss, 'octicon-screen-full': octiconScreenFull, From 32589a221ec7f9b49747f6134f0e5fd3ac13833c Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 26 Dec 2024 15:26:01 +0000 Subject: [PATCH 02/16] fix --- templates/user/dashboard/dashboard.tmpl | 7 +++++-- templates/user/dashboard/guide.tmpl | 13 +++++-------- web_src/js/components/DashboardRepoList.vue | 20 +++++++++++++------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 17d1a44dd9fd3..3ce3c1eb7338e 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -5,8 +5,11 @@
    {{template "base/alert" .}} {{template "user/heatmap" .}} - {{template "user/dashboard/guide" .}} - {{template "user/dashboard/feeds" .}} + {{if .Feeds}} + {{template "user/dashboard/feeds" .}} + {{else}} + {{template "user/dashboard/guide" .}} + {{end}}
    {{template "user/dashboard/repolist" .}}
diff --git a/templates/user/dashboard/guide.tmpl b/templates/user/dashboard/guide.tmpl index feebfc25eed81..983785bd06429 100644 --- a/templates/user/dashboard/guide.tmpl +++ b/templates/user/dashboard/guide.tmpl @@ -1,8 +1,5 @@ -{{if not .Feeds}} -
- -

{{ctx.Locale.Tr "guide.welcome"}}

-

{{ctx.Locale.Tr "guide.welcome_desc"}}

-
-{{end}} - +
+ +

{{ctx.Locale.Tr "guide.welcome"}}

+

{{ctx.Locale.Tr "guide.welcome_desc"}}

+
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index d4f130c056881..c13735d8df6eb 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -91,6 +91,12 @@ const sfc = { }${this.privateFilter === 'private' ? '&is_private=true' : ''}${this.privateFilter === 'public' ? '&is_private=false' : '' }`; }, + isRepoEmpty() { + return !this.isLoading && !this.reposTotalCount; + }, + isOrgEmpty() { + return !this.isLoading && !this.organizations.length; + }, repoTypeCount() { return this.counts[`${this.reposFilter}:${this.archivedFilter}:${this.privateFilter}`]; }, @@ -243,7 +249,7 @@ const sfc = { if (!this.reposTotalCount) { const totalCountSearchURL = `${this.subUrl}/repo/search?count_only=1&uid=${this.uid}&team_id=${this.teamId}&q=&page=1&mode=`; response = await GET(totalCountSearchURL); - this.reposTotalCount = response.headers.get('X-Total-Count') ?? '?'; + this.reposTotalCount = parseInt(response.headers.get('X-Total-Count') ?? '0'); } response = await GET(searchedURL); @@ -264,7 +270,7 @@ const sfc = { locale_latest_commit_status_state: webSearchRepo.locale_latest_commit_status, }; }); - const count = response.headers.get('X-Total-Count'); + const count = parseInt(response.headers.get('X-Total-Count')); if (searchedQuery === '' && searchedMode === '' && this.archivedFilter === 'both') { this.reposTotalCount = count; } @@ -363,8 +369,8 @@ export default sfc; // activate the IDE's Vue plugin -
-
+
+

{{ textNoRepo }}

@@ -378,10 +384,10 @@ export default sfc; // activate the IDE's Vue plugin

-
+
- +
@@ -492,7 +498,7 @@ export default sfc; // activate the IDE's Vue plugin
-
+

{{ textNoOrg }}

From abdf224fdd56be06ba1c5cce144722358ac7fc41 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 2 Jan 2025 07:06:39 +0000 Subject: [PATCH 03/16] fix --- options/locale/locale_en-US.ini | 7 ++++--- templates/user/dashboard/guide.tmpl | 12 ++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4d709af4af1c4..47b6cb8f0b055 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -27,9 +27,6 @@ licenses = Licenses return_to_gitea = Return to Gitea more_items = More items -guide.welcome = Welcome to the Gitea. -guide.welcome_desc = Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD. - username = Username email = Email Address password = Password @@ -166,6 +163,10 @@ filter.private = Private no_results_found = No results found. internal_error_skipped = Internal error occurred but is skipped: %s +[guide] +explore_repos = Explore repositories +explore_users = Explore users + [search] search = Search... type_tooltip = Search type diff --git a/templates/user/dashboard/guide.tmpl b/templates/user/dashboard/guide.tmpl index 983785bd06429..afaf83a2eb959 100644 --- a/templates/user/dashboard/guide.tmpl +++ b/templates/user/dashboard/guide.tmpl @@ -1,5 +1,13 @@

-

{{ctx.Locale.Tr "guide.welcome"}}

-

{{ctx.Locale.Tr "guide.welcome_desc"}}

+

{{AppName}}

+
From db5afe9e6feb71654dd70bdd31bd941b6bbf43bf Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 2 Jan 2025 08:09:30 +0000 Subject: [PATCH 04/16] fix --- options/locale/locale_en-US.ini | 1 + templates/user/dashboard/guide.tmpl | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 47b6cb8f0b055..2b13b4ac003e6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -164,6 +164,7 @@ no_results_found = No results found. internal_error_skipped = Internal error occurred but is skipped: %s [guide] +desc = You are currently not following any repositories or users, so there is no content to display; you can explore repositories or users of interest from the links below. explore_repos = Explore repositories explore_users = Explore users diff --git a/templates/user/dashboard/guide.tmpl b/templates/user/dashboard/guide.tmpl index afaf83a2eb959..0a8a4e7f8af1b 100644 --- a/templates/user/dashboard/guide.tmpl +++ b/templates/user/dashboard/guide.tmpl @@ -1,6 +1,6 @@ -
- -

{{AppName}}

+
+ {{svg "octicon-no-entry" 48}} +

{{ctx.Locale.Tr "guide.desc"}}

{{ctx.Locale.Tr "guide.explore_repos"}} From 996fee4af8b16a0770693b82054d2653659556bd Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 16 Jan 2025 07:13:23 +0000 Subject: [PATCH 05/16] fix --- web_src/js/components/DashboardRepoList.vue | 10 ---------- web_src/js/features/dashboard.ts | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index d8b1645baa660..7c8c4d5ebb630 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -341,17 +341,7 @@ export default defineComponent({ } }, }, - }); - -export function initDashboardRepoList() { - const el = document.querySelector('#dashboard-repo-list'); - if (el) { - el.classList.remove('is-loading'); - createApp(sfc).mount(el); - } -} -