chore: revert "fix(portal-loop): hotfix revert "chore: rename r/manfr…

…ed -> r/moul (gnolang#2820)" (gnolang#2865)" This reverts commit 69400d4. Revertception.
moul · Oct 25, 2024 · 3aff9d0 · 3aff9d0
1 parent 287c22e
commit 3aff9d0
Show file tree

Hide file tree

Showing 45 changed files with 117 additions and 109 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -35,6 +35,7 @@
 /examples/gno.land/p/demo/svg/        @moul
 /examples/gno.land/p/demo/tamagotchi/ @moul
 /examples/gno.land/p/demo/ui/         @moul
+/examples/gno.land/p/moul/            @moul
 /examples/gno.land/r/demo/            @gnolang/tech-staff @gnolang/devrels
 /examples/gno.land/r/demo/art/        @moul
 /examples/gno.land/r/demo/boardsv2/   @ilgooz @jeronimoalbi @moul
@@ -44,7 +45,7 @@
 /examples/gno.land/r/gnoland/         @moul
 /examples/gno.land/r/sys/             @moul
 /examples/gno.land/r/jaekwon/         @jaekwon
-/examples/gno.land/r/manfred/         @moul
+/examples/gno.land/r/moul/            @moul
 
 # Gno.land.
 /gno.land/                    @moul @zivkovicmilos

diff --git a/examples/gno.land/r/demo/foo20/foo20.gno b/examples/gno.land/r/demo/foo20/foo20.gno
@@ -20,7 +20,7 @@ var (
 )
 
 func init() {
-	admin = ownable.NewWithAddress("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq") // @manfred
+	admin = ownable.NewWithAddress("g1manfred47kzduec920z88wfr64ylksmdcedlf5") // @moul
 	banker = grc20.NewBanker("Foo", "FOO", 4)
 	banker.Mint(admin.Owner(), 1000000*10000) // @administrator (1M)
 	token = banker.Token()

diff --git a/examples/gno.land/r/demo/foo20/foo20_test.gno b/examples/gno.land/r/demo/foo20/foo20_test.gno
@@ -12,7 +12,7 @@ import (
 
 func TestReadOnlyPublicMethods(t *testing.T) {
 	var (
-		admin = pusers.AddressOrName("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+		admin = pusers.AddressOrName("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 		alice = pusers.AddressOrName(testutils.TestAddress("alice"))
 		bob   = pusers.AddressOrName(testutils.TestAddress("bob"))
 	)
@@ -60,7 +60,7 @@ func TestReadOnlyPublicMethods(t *testing.T) {
 
 func TestErrConditions(t *testing.T) {
 	var (
-		admin = pusers.AddressOrName("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+		admin = pusers.AddressOrName("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 		alice = pusers.AddressOrName(testutils.TestAddress("alice"))
 		empty = pusers.AddressOrName("")
 	)

diff --git a/examples/gno.land/r/demo/grc20factory/grc20factory_test.gno b/examples/gno.land/r/demo/grc20factory/grc20factory_test.gno
@@ -9,7 +9,7 @@ import (
 
 func TestReadOnlyPublicMethods(t *testing.T) {
 	admin := std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")
-	manfred := std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+	manfred := std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 	unknown := std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5") // valid but never used.
 	NewWithAdmin("Foo", "FOO", 4, 10_000*1_000_000, 0, admin)
 	NewWithAdmin("Bar", "BAR", 4, 10_000*1_000, 0, admin)

diff --git a/examples/gno.land/r/demo/groups/z_1_a_filetest.gno b/examples/gno.land/r/demo/groups/z_1_a_filetest.gno
@@ -13,7 +13,7 @@ import (
 
 var gid groups.GroupID
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/groups/z_2_a_filetest.gno b/examples/gno.land/r/demo/groups/z_2_a_filetest.gno
@@ -13,7 +13,7 @@ import (
 
 var gid groups.GroupID
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/users.gno b/examples/gno.land/r/demo/users/users.gno
@@ -15,7 +15,7 @@ import (
 // State
 
 var (
-	admin std.Address = "g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq" // @moul
+	admin std.Address = "g1manfred47kzduec920z88wfr64ylksmdcedlf5" // @moul
 
 	restricted avl.Tree                  // Name -> true - restricted name
 	name2User  avl.Tree                  // Name -> *users.User

diff --git a/examples/gno.land/r/demo/users/z_10_filetest.gno b/examples/gno.land/r/demo/users/z_10_filetest.gno
@@ -8,7 +8,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func init() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_11_filetest.gno b/examples/gno.land/r/demo/users/z_11_filetest.gno
@@ -8,7 +8,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_11b_filetest.gno b/examples/gno.land/r/demo/users/z_11b_filetest.gno
@@ -8,7 +8,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_2_filetest.gno b/examples/gno.land/r/demo/users/z_2_filetest.gno
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_3_filetest.gno b/examples/gno.land/r/demo/users/z_3_filetest.gno
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_4_filetest.gno b/examples/gno.land/r/demo/users/z_4_filetest.gno
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_5_filetest.gno b/examples/gno.land/r/demo/users/z_5_filetest.gno
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_6_filetest.gno b/examples/gno.land/r/demo/users/z_6_filetest.gno
@@ -6,7 +6,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller()

diff --git a/examples/gno.land/r/demo/users/z_7_filetest.gno b/examples/gno.land/r/demo/users/z_7_filetest.gno
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_7b_filetest.gno b/examples/gno.land/r/demo/users/z_7b_filetest.gno
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_8_filetest.gno b/examples/gno.land/r/demo/users/z_8_filetest.gno
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/demo/users/z_9_filetest.gno b/examples/gno.land/r/demo/users/z_9_filetest.gno
@@ -7,7 +7,7 @@ import (
 	"gno.land/r/demo/users"
 )
 
-const admin = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
 	caller := std.GetOrigCaller() // main

diff --git a/examples/gno.land/r/gnoland/blog/admin.gno b/examples/gno.land/r/gnoland/blog/admin.gno
@@ -18,7 +18,7 @@ var (
 
 func init() {
 	// adminAddr = std.GetOrigCaller() // FIXME: find a way to use this from the main's genesis.
-	adminAddr = "g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq"
+	adminAddr = "g1manfred47kzduec920z88wfr64ylksmdcedlf5" // @moul
 }
 
 func AdminSetAdminAddr(addr std.Address) {

diff --git a/examples/gno.land/r/gnoland/blog/gnoblog_test.gno b/examples/gno.land/r/gnoland/blog/gnoblog_test.gno
@@ -7,7 +7,7 @@ import (
 )
 
 func TestPackage(t *testing.T) {
-	std.TestSetOrigCaller(std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq"))
+	std.TestSetOrigCaller(std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5"))
 
 	author := std.GetOrigCaller()
 
@@ -59,7 +59,7 @@ Tags: [#tag1](/r/gnoland/blog:t/tag1) [#tag3](/r/gnoland/blog:t/tag3)
 
 Written by moul on 20 May 2022
 
-Published by g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq to Gnoland's Blog
+Published by g1manfred47kzduec920z88wfr64ylksmdcedlf5 to Gnoland's Blog
 
 ---
 <details><summary>Comment section</summary>
@@ -110,20 +110,20 @@ Tags: [#tag1](/r/gnoland/blog:t/tag1) [#tag3](/r/gnoland/blog:t/tag3)
 
 Written by moul on 20 May 2022
 
-Published by g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq to Gnoland's Blog
+Published by g1manfred47kzduec920z88wfr64ylksmdcedlf5 to Gnoland's Blog
 
 ---
 <details><summary>Comment section</summary>
 
 <h5>comment4
 
-</h5><h6>by g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq on 13 Feb 09 23:31 UTC</h6>
+</h5><h6>by g1manfred47kzduec920z88wfr64ylksmdcedlf5 on 13 Feb 09 23:31 UTC</h6>
 
 ---
 
 <h5>comment2
 
-</h5><h6>by g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq on 13 Feb 09 23:31 UTC</h6>
+</h5><h6>by g1manfred47kzduec920z88wfr64ylksmdcedlf5 on 13 Feb 09 23:31 UTC</h6>
 
 ---
 
@@ -152,20 +152,20 @@ Tags: [#tag1](/r/gnoland/blog:t/tag1) [#tag4](/r/gnoland/blog:t/tag4)
 
 Written by manfred on 20 May 2022
 
-Published by g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq to Gnoland's Blog
+Published by g1manfred47kzduec920z88wfr64ylksmdcedlf5 to Gnoland's Blog
 
 ---
 <details><summary>Comment section</summary>
 
 <h5>comment4
 
-</h5><h6>by g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq on 13 Feb 09 23:31 UTC</h6>
+</h5><h6>by g1manfred47kzduec920z88wfr64ylksmdcedlf5 on 13 Feb 09 23:31 UTC</h6>
 
 ---
 
 <h5>comment2
 
-</h5><h6>by g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq on 13 Feb 09 23:31 UTC</h6>
+</h5><h6>by g1manfred47kzduec920z88wfr64ylksmdcedlf5 on 13 Feb 09 23:31 UTC</h6>
 
 ---
 

diff --git a/examples/gno.land/r/gnoland/home/home.gno b/examples/gno.land/r/gnoland/home/home.gno
@@ -16,7 +16,7 @@ import (
 
 var (
 	override string
-	admin    = ownable.NewWithAddress("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq") // @manfred by default
+	admin    = ownable.NewWithAddress("g1manfred47kzduec920z88wfr64ylksmdcedlf5") // @moul
 )
 
 func Render(_ string) string {

diff --git a/examples/gno.land/r/gnoland/home/overide_filetest.gno b/examples/gno.land/r/gnoland/home/overide_filetest.gno
@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	std.TestSetOrigCaller("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+	std.TestSetOrigCaller("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 	home.AdminSetOverride("Hello World!")
 	println(home.Render(""))
 	home.AdminTransferOwnership(testutils.TestAddress("newAdmin"))

diff --git a/examples/gno.land/r/gnoland/pages/admin.gno b/examples/gno.land/r/gnoland/pages/admin.gno
@@ -15,7 +15,7 @@ var (
 
 func init() {
 	// adminAddr = std.GetOrigCaller() // FIXME: find a way to use this from the main's genesis.
-	adminAddr = "g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq"
+	adminAddr = "g1manfred47kzduec920z88wfr64ylksmdcedlf5" // @moul
 }
 
 func AdminSetAdminAddr(addr std.Address) {

diff --git a/examples/gno.land/r/manfred/config/gno.mod b/examples/gno.land/r/manfred/config/gno.mod
diff --git a/examples/gno.land/r/manfred/home/gno.mod b/examples/gno.land/r/manfred/home/gno.mod
@@ -1,3 +1 @@
 module gno.land/r/manfred/home
-
-require gno.land/r/manfred/config v0.0.0-latest
diff --git a/examples/gno.land/r/manfred/home/home.gno b/examples/gno.land/r/manfred/home/home.gno
@@ -1,56 +1,5 @@
 package home
 
-import "gno.land/r/manfred/config"
-
-var (
-	todos      []string
-	status     string
-	memeImgURL string
-)
-
-func init() {
-	todos = append(todos, "fill this todo list...")
-	status = "Online" // Initial status set to "Online"
-	memeImgURL = "https://i.imgflip.com/7ze8dc.jpg"
-}
-
 func Render(path string) string {
-	content := "# Manfred's (gn)home Dashboard\n\n"
-
-	content += "## Meme\n"
-	content += "![](" + memeImgURL + ")\n\n"
-
-	content += "## Status\n"
-	content += status + "\n\n"
-
-	content += "## Personal ToDo List\n"
-	for _, todo := range todos {
-		content += "- [ ] " + todo + "\n"
-	}
-	content += "\n"
-
-	// TODO: Implement a feature to list replies on r/boards on my posts
-	// TODO: Maybe integrate a calendar feature for upcoming events?
-
-	return content
-}
-
-func AddNewTodo(todo string) {
-	config.AssertIsAdmin()
-	todos = append(todos, todo)
-}
-
-func DeleteTodo(todoIndex int) {
-	config.AssertIsAdmin()
-	if todoIndex >= 0 && todoIndex < len(todos) {
-		// Remove the todo from the list by merging slices from before and after the todo
-		todos = append(todos[:todoIndex], todos[todoIndex+1:]...)
-	} else {
-		panic("Invalid todo index")
-	}
-}
-
-func UpdateStatus(newStatus string) {
-	config.AssertIsAdmin()
-	status = newStatus
+	return "Moved to r/moul"
 }
diff --git a/examples/gno.land/r/manfred/README.md → examples/gno.land/r/moul/README.md b/examples/gno.land/r/manfred/README.md → examples/gno.land/r/moul/README.md
diff --git a/...ples/gno.land/r/manfred/config/config.gno → examples/gno.land/r/moul/config/config.gno b/...ples/gno.land/r/manfred/config/config.gno → examples/gno.land/r/moul/config/config.gno
@@ -2,7 +2,7 @@ package config
 
 import "std"
 
-var addr = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")
+var addr = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5") // @moul
 
 func Addr() std.Address {
 	return addr

diff --git a/examples/gno.land/r/moul/config/gno.mod b/examples/gno.land/r/moul/config/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/moul/config
diff --git a/examples/gno.land/r/moul/home/gno.mod b/examples/gno.land/r/moul/home/gno.mod
@@ -0,0 +1,3 @@
+module gno.land/r/moul/home
+
+require gno.land/r/moul/config v0.0.0-latest