From 13738c03804d019f28550e46a4ebc37dbe3a5cfc Mon Sep 17 00:00:00 2001
From: cassiozareck <cassiomilczareck@gmail.com>
Date: Tue, 15 Aug 2023 13:41:35 -0300
Subject: [PATCH] Adding description and Forgejo SVG

---
 modules/structs/repo.go                 | 18 +++++++++---------
 options/locale/locale_en-US.ini         |  1 +
 public/assets/img/svg/gitea-forgejo.svg |  9 +++++++++
 web_src/svg/gitea-forgejo.svg           | 10 +++++++++-
 4 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 public/assets/img/svg/gitea-forgejo.svg

diff --git a/modules/structs/repo.go b/modules/structs/repo.go
index 80df8f2fc2..461ad42ac7 100644
--- a/modules/structs/repo.go
+++ b/modules/structs/repo.go
@@ -281,12 +281,12 @@ const (
 	PlainGitService                        // 1 plain git service
 	GithubService                          // 2 github.com
 	GiteaService                           // 3 gitea service
-	GitlabService                          // 4 gitlab service
-	GogsService                            // 5 gogs service
-	OneDevService                          // 6 onedev service
-	GitBucketService                       // 7 gitbucket service
-	CodebaseService                        // 8 codebase service
-	ForgejoService                         // 9 forgejo service
+	ForgejoService                         // 4 forgejo service
+	GitlabService                          // 5 gitlab service
+	GogsService                            // 6 gogs service
+	OneDevService                          // 7 onedev service
+	GitBucketService                       // 8 gitbucket service
+	CodebaseService                        // 9 codebase service
 )
 
 // Name represents the service type's name
@@ -302,6 +302,8 @@ func (gt GitServiceType) Title() string {
 		return "GitHub"
 	case GiteaService:
 		return "Gitea"
+	case ForgejoService:
+		return "Forgejo"
 	case GitlabService:
 		return "GitLab"
 	case GogsService:
@@ -314,8 +316,6 @@ func (gt GitServiceType) Title() string {
 		return "Codebase"
 	case PlainGitService:
 		return "Git"
-	case ForgejoService:
-		return "Forgejo"
 	}
 	return ""
 }
@@ -366,12 +366,12 @@ func (gt GitServiceType) TokenAuth() bool {
 var SupportedFullGitService = []GitServiceType{
 	GithubService,
 	GitlabService,
+	ForgejoService,
 	GiteaService,
 	GogsService,
 	OneDevService,
 	GitBucketService,
 	CodebaseService,
-	ForgejoService,
 }
 
 // RepoTransfer represents a pending repo transfer
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 30fa899c9d..a166af2477 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1080,6 +1080,7 @@ migrate.migrating_failed_no_addr = Migration failed.
 migrate.github.description = Migrate data from github.com or other GitHub instances.
 migrate.git.description = Migrate a repository only from any Git service.
 migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances.
+migrate.forgejo.description = Migrate data from codeberg.org or other Forgejo instances.
 migrate.gitea.description = Migrate data from gitea.com or other Gitea instances.
 migrate.gogs.description = Migrate data from notabug.org or other Gogs instances.
 migrate.onedev.description = Migrate data from code.onedev.io or other OneDev instances.
diff --git a/public/assets/img/svg/gitea-forgejo.svg b/public/assets/img/svg/gitea-forgejo.svg
new file mode 100644
index 0000000000..ef617c00f3
--- /dev/null
+++ b/public/assets/img/svg/gitea-forgejo.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="-15 0 256 256" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(28,28)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" fill="none" stroke="#ff6600" stroke-width="25" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" fill="none" stroke="#d40000" stroke-width="25" />
+    <circle cx="142" cy="20" r="18" fill="none" stroke="#ff6600" stroke-width="15" />
+    <circle cx="142" cy="88" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+    <circle cx="58" cy="180" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+  </g>
+</svg>
diff --git a/web_src/svg/gitea-forgejo.svg b/web_src/svg/gitea-forgejo.svg
index 8b8a7b5fed..e00e5963cf 100644
--- a/web_src/svg/gitea-forgejo.svg
+++ b/web_src/svg/gitea-forgejo.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="64px" height="64px"><path d="M42.2,22.1L25.9,5.8C25.4,5.3,24.7,5,24,5c0,0,0,0,0,0c-0.7,0-1.4,0.3-1.9,0.8l-3.5,3.5l4.1,4.1c0.4-0.2,0.8-0.3,1.3-0.3c1.7,0,3,1.3,3,3c0,0.5-0.1,0.9-0.3,1.3l4,4c0.4-0.2,0.8-0.3,1.3-0.3c1.7,0,3,1.3,3,3s-1.3,3-3,3c-1.7,0-3-1.3-3-3c0-0.5,0.1-0.9,0.3-1.3l-4-4c-0.1,0-0.2,0.1-0.3,0.1v10.4c1.2,0.4,2,1.5,2,2.8c0,1.7-1.3,3-3,3s-3-1.3-3-3c0-1.3,0.8-2.4,2-2.8V18.8c-1.2-0.4-2-1.5-2-2.8c0-0.5,0.1-0.9,0.3-1.3l-4.1-4.1L5.8,22.1C5.3,22.6,5,23.3,5,24c0,0.7,0.3,1.4,0.8,1.9l16.3,16.3c0,0,0,0,0,0c0.5,0.5,1.2,0.8,1.9,0.8s1.4-0.3,1.9-0.8l16.3-16.3c0.5-0.5,0.8-1.2,0.8-1.9C43,23.3,42.7,22.6,42.2,22.1z"/></svg>
\ No newline at end of file
+<svg width="64" height="64" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" class="forgejo-logo" aria-hidden="true">
+  <g transform="translate(28,28)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" fill="none" stroke="#ff6600" stroke-width="25" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" fill="none" stroke="#d40000" stroke-width="25" />
+    <circle cx="142" cy="20" r="18" fill="none" stroke="#ff6600" stroke-width="15" />
+    <circle cx="142" cy="88" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+    <circle cx="58" cy="180" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+  </g>
+</svg>