From 2b2ed856233f4399f051246572f0fc849379fb71 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sat, 6 May 2023 13:34:42 +0800
Subject: [PATCH 1/5] add org visibility to dashboard

---
 templates/user/dashboard/repolist.tmpl      | 5 ++++-
 web_src/css/dashboard.css                   | 3 ++-
 web_src/js/components/DashboardRepoList.vue | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl
index 5d78970a58d8a..dd6ee078e39db 100644
--- a/templates/user/dashboard/repolist.tmpl
+++ b/templates/user/dashboard/repolist.tmpl
@@ -35,6 +35,9 @@ const data = {
 
 	textMyOrgs: {{.locale.Tr "home.my_orgs"}},
 	textNewOrg: {{.locale.Tr "new_org"}},
+
+	orgVisibilityLimited: {{.locale.Tr "org.settings.visibility.limited_shortname"}},
+	orgVisibilityPrivate: {{.locale.Tr "org.settings.visibility.private_shortname"}},
 };
 
 {{if .Team}}
@@ -42,7 +45,7 @@ data.teamId = {{.Team.ID}};
 {{end}}
 
 {{if not .ContextUser.IsOrganization}}
-data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}},{{end}}];
+data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}, 'org_visibility': {{.Visibility}}},{{end}}];
 data.isOrganization = false;
 data.organizationsTotalCount = {{.UserOrgsCount}};
 data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}};
diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css
index 4512367dc7164..15df93d5b97b8 100644
--- a/web_src/css/dashboard.css
+++ b/web_src/css/dashboard.css
@@ -88,7 +88,8 @@
   padding-right: 0.5rem;
 }
 
-.dashboard .dashboard-navbar .org-visibility .label {
+.dashboard .dashboard-navbar .org-visibility .label,
+.dashboard .repo-owner-name-list .org-visibility .label {
   margin-left: 5px;
 }
 
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 33b312aa6ee72..35a73d34be4a9 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -131,6 +131,9 @@
               <div class="text truncate item-name gt-f1">
                 <svg-icon name="octicon-organization" :size="16" class-name="gt-mr-2"/>
                 <strong>{{ org.name }}</strong>
+                <span class="org-visibility" v-if="org.org_visibility !== 'public'">
+						      <div class="ui medium basic horizontal label">{{org.org_visibility === 'limited' ? orgVisibilityLimited: orgVisibilityPrivate}}</div>
+					      </span>
               </div>
               <div class="text light grey gt-df gt-ac">
                 {{ org.num_repos }}

From e6eec9bb53fec256dbc657528f7bb1ed1553f6f4 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sat, 6 May 2023 13:38:45 +0800
Subject: [PATCH 2/5] change variable name

---
 templates/user/dashboard/repolist.tmpl      | 4 ++--
 web_src/js/components/DashboardRepoList.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl
index dd6ee078e39db..44542d579de3d 100644
--- a/templates/user/dashboard/repolist.tmpl
+++ b/templates/user/dashboard/repolist.tmpl
@@ -36,8 +36,8 @@ const data = {
 	textMyOrgs: {{.locale.Tr "home.my_orgs"}},
 	textNewOrg: {{.locale.Tr "new_org"}},
 
-	orgVisibilityLimited: {{.locale.Tr "org.settings.visibility.limited_shortname"}},
-	orgVisibilityPrivate: {{.locale.Tr "org.settings.visibility.private_shortname"}},
+	textOrgVisibilityLimited: {{.locale.Tr "org.settings.visibility.limited_shortname"}},
+	textOrgVisibilityPrivate: {{.locale.Tr "org.settings.visibility.private_shortname"}},
 };
 
 {{if .Team}}
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 35a73d34be4a9..176bb65d911e5 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -132,7 +132,7 @@
                 <svg-icon name="octicon-organization" :size="16" class-name="gt-mr-2"/>
                 <strong>{{ org.name }}</strong>
                 <span class="org-visibility" v-if="org.org_visibility !== 'public'">
-						      <div class="ui medium basic horizontal label">{{org.org_visibility === 'limited' ? orgVisibilityLimited: orgVisibilityPrivate}}</div>
+						      <div class="ui medium basic horizontal label">{{org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate}}</div>
 					      </span>
               </div>
               <div class="text light grey gt-df gt-ac">

From 12d45ddcafad0d794d0c65dcba4367247eaaab79 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sat, 6 May 2023 15:59:45 +0800
Subject: [PATCH 3/5] modify styles

---
 web_src/css/dashboard.css                   | 3 +--
 web_src/js/components/DashboardRepoList.vue | 9 +++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css
index 15df93d5b97b8..4512367dc7164 100644
--- a/web_src/css/dashboard.css
+++ b/web_src/css/dashboard.css
@@ -88,8 +88,7 @@
   padding-right: 0.5rem;
 }
 
-.dashboard .dashboard-navbar .org-visibility .label,
-.dashboard .repo-owner-name-list .org-visibility .label {
+.dashboard .dashboard-navbar .org-visibility .label {
   margin-left: 5px;
 }
 
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 176bb65d911e5..21cfbea09e50a 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -131,8 +131,8 @@
               <div class="text truncate item-name gt-f1">
                 <svg-icon name="octicon-organization" :size="16" class-name="gt-mr-2"/>
                 <strong>{{ org.name }}</strong>
-                <span class="org-visibility" v-if="org.org_visibility !== 'public'">
-						      <div class="ui medium basic horizontal label">{{org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate}}</div>
+                <span class="ui medium basic horizontal label org-visibility" v-if="org.org_visibility !== 'public'">
+						      {{org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate}}
 					      </span>
               </div>
               <div class="text light grey gt-df gt-ac">
@@ -426,3 +426,8 @@ export function initDashboardRepoList() {
 export default sfc; // activate the IDE's Vue plugin
 
 </script>
+<style scoped>
+.dashboard .org-visibility.label {
+  margin-left: 5px;
+}
+</style>

From dd4fc93eaf692e4ac8386050d04d931ee95bec5a Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sat, 6 May 2023 16:17:44 +0800
Subject: [PATCH 4/5] remove unnecessary CSS/style

---
 web_src/js/components/DashboardRepoList.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 21cfbea09e50a..f531be26cf3c6 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -131,7 +131,7 @@
               <div class="text truncate item-name gt-f1">
                 <svg-icon name="octicon-organization" :size="16" class-name="gt-mr-2"/>
                 <strong>{{ org.name }}</strong>
-                <span class="ui medium basic horizontal label org-visibility" v-if="org.org_visibility !== 'public'">
+                <span class="ui tiny basic label gt-ml-3" v-if="org.org_visibility !== 'public'">
 						      {{org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate}}
 					      </span>
               </div>
@@ -426,8 +426,3 @@ export function initDashboardRepoList() {
 export default sfc; // activate the IDE's Vue plugin
 
 </script>
-<style scoped>
-.dashboard .org-visibility.label {
-  margin-left: 5px;
-}
-</style>

From 407c059e504195724b8d3cbc57909c319d3e7f01 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sat, 6 May 2023 19:45:40 +0800
Subject: [PATCH 5/5] fix lint

---
 web_src/js/components/DashboardRepoList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index f531be26cf3c6..5cedbcb000180 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -132,8 +132,8 @@
                 <svg-icon name="octicon-organization" :size="16" class-name="gt-mr-2"/>
                 <strong>{{ org.name }}</strong>
                 <span class="ui tiny basic label gt-ml-3" v-if="org.org_visibility !== 'public'">
-						      {{org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate}}
-					      </span>
+                  {{ org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate }}
+                </span>
               </div>
               <div class="text light grey gt-df gt-ac">
                 {{ org.num_repos }}