From dbdd38694d9d38d54eb621e5f976f2852e2e7c43 Mon Sep 17 00:00:00 2001
From: Thomas Miceli <tho.miceli@gmail.com>
Date: Sun, 16 Apr 2023 17:48:21 +0200
Subject: [PATCH] Change /admin route to /admin-panel (#1)

---
 internal/web/admin.go            | 8 ++++----
 internal/web/run.go              | 2 +-
 internal/web/util.go             | 2 +-
 templates/base/admin_header.html | 6 +++---
 templates/base/base_header.html  | 4 ++--
 templates/pages/admin_gists.html | 2 +-
 templates/pages/admin_index.html | 4 ++--
 templates/pages/admin_users.html | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/internal/web/admin.go b/internal/web/admin.go
index c637511..3632252 100644
--- a/internal/web/admin.go
+++ b/internal/web/admin.go
@@ -101,7 +101,7 @@ func adminUserDelete(ctx echo.Context) error {
 	}
 
 	addFlash(ctx, "User has been deleted", "success")
-	return redirect(ctx, "/admin/users")
+	return redirect(ctx, "/admin-panel/users")
 }
 
 func adminGistDelete(ctx echo.Context) error {
@@ -119,7 +119,7 @@ func adminGistDelete(ctx echo.Context) error {
 	}
 
 	addFlash(ctx, "Gist has been deleted", "success")
-	return redirect(ctx, "/admin/gists")
+	return redirect(ctx, "/admin-panel/gists")
 }
 
 func adminSyncReposFromFS(ctx echo.Context) error {
@@ -148,7 +148,7 @@ func adminSyncReposFromFS(ctx echo.Context) error {
 		}
 		syncReposFromFS = false
 	}()
-	return redirect(ctx, "/admin")
+	return redirect(ctx, "/admin-panel")
 }
 
 func adminSyncReposFromDB(ctx echo.Context) error {
@@ -180,5 +180,5 @@ func adminSyncReposFromDB(ctx echo.Context) error {
 		syncReposFromDB = false
 		return
 	}()
-	return redirect(ctx, "/admin")
+	return redirect(ctx, "/admin-panel")
 }
diff --git a/internal/web/run.go b/internal/web/run.go
index 1d66e64..5958179 100644
--- a/internal/web/run.go
+++ b/internal/web/run.go
@@ -173,7 +173,7 @@ func Start() {
 		g1.POST("/settings/ssh-keys", sshKeysProcess, logged)
 		g1.DELETE("/settings/ssh-keys/:id", sshKeysDelete, logged)
 
-		g2 := g1.Group("/admin")
+		g2 := g1.Group("/admin-panel")
 		{
 			g2.Use(adminPermission)
 			g2.GET("", adminIndex)
diff --git a/internal/web/util.go b/internal/web/util.go
index d78a89d..714f959 100644
--- a/internal/web/util.go
+++ b/internal/web/util.go
@@ -148,7 +148,7 @@ func validateReservedKeywords(fl validator.FieldLevel) bool {
 	name := fl.Field().String()
 
 	restrictedNames := map[string]struct{}{}
-	for _, restrictedName := range []string{"assets", "register", "login", "logout", "config", "admin", "all"} {
+	for _, restrictedName := range []string{"assets", "register", "login", "logout", "config", "admin-panel", "all"} {
 		restrictedNames[restrictedName] = struct{}{}
 	}
 
diff --git a/templates/base/admin_header.html b/templates/base/admin_header.html
index d7be0b2..598a7cc 100644
--- a/templates/base/admin_header.html
+++ b/templates/base/admin_header.html
@@ -9,11 +9,11 @@
         <div class="mb-4">
             <div class="">
                 <nav class="flex space-x-4" aria-label="Tabs">
-                    <a href="/admin" class="{{ if eq .adminHeaderPage "index" }}bg-gray-700 text-slate-300 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md
+                    <a href="/admin-panel" class="{{ if eq .adminHeaderPage "index" }}bg-gray-700 text-slate-300 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md
                     {{ else }} text-gray-400 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md {{ end }}">General</a>
-                    <a href="/admin/users" class="{{ if eq .adminHeaderPage "users" }}bg-gray-700 text-slate-300 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md
+                    <a href="/admin-panel/users" class="{{ if eq .adminHeaderPage "users" }}bg-gray-700 text-slate-300 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md
                     {{ else }} text-gray-400 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md {{ end }}" aria-current="page">Users</a>
-                    <a href="/admin/gists" class="{{ if eq .adminHeaderPage "gists" }}bg-gray-700 text-slate-300 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md
+                    <a href="/admin-panel/gists" class="{{ if eq .adminHeaderPage "gists" }}bg-gray-700 text-slate-300 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md
                     {{ else }} text-gray-400 hover:text-slate-300 px-3 py-2 font-medium text-sm rounded-md {{ end }}" aria-current="page">Gists</a>
                 </nav>
             </div>
diff --git a/templates/base/base_header.html b/templates/base/base_header.html
index 7abf7d5..47de0e8 100644
--- a/templates/base/base_header.html
+++ b/templates/base/base_header.html
@@ -53,7 +53,7 @@
                     <div class="absolute inset-y-0 right-0 flex items-center pr-2 sm:static sm:inset-auto sm:ml-6 sm:pr-0">
                         {{ if .userLogged }}
                         {{ if .userLogged.IsAdmin }}
-                            <a href="/admin" class="hidden sm:block text-slate-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium" aria-current="page">Admin</a>
+                            <a href="/admin-panel" class="hidden sm:block text-slate-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium" aria-current="page">Admin</a>
                         {{ end }}
                         <a href="/settings" class="hidden sm:block text-slate-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium" aria-current="page">Settings</a>
 
@@ -91,7 +91,7 @@
                         <a href="/settings" class="text-slate-300 hover:bg-gray-700 hover:text-white block px-3 py-2 rounded-md text-base font-medium">Settings</a>
 
                     {{ if .userLogged.IsAdmin }}
-                            <a href="/admin" class="text-slate-300 hover:bg-gray-700 hover:text-white block px-3 py-2 rounded-md text-base font-medium">Admin</a>
+                            <a href="/admin-panel" class="text-slate-300 hover:bg-gray-700 hover:text-white block px-3 py-2 rounded-md text-base font-medium">Admin</a>
                         {{ end }}
                     {{ end }}
                 </div>
diff --git a/templates/pages/admin_gists.html b/templates/pages/admin_gists.html
index 6750e04..9cfa5d5 100644
--- a/templates/pages/admin_gists.html
+++ b/templates/pages/admin_gists.html
@@ -28,7 +28,7 @@
                 <td class="whitespace-nowrap px-2 py-2 text-sm text-slate-300">{{ $gist.NbLikes }}</td>
                 <td class="whitespace-nowrap px-2 py-2 text-sm text-slate-300"><span class="moment-timestamp-date">{{ $gist.CreatedAt }}</span></td>
                 <td class="relative whitespace-nowrap py-2 pl-3 pr-4 text-right text-sm font-medium sm:pr-0">
-                    <form action="/admin/gists/{{ $gist.ID }}/delete" method="POST" onsubmit="return confirm('Do you want to delete this gist ?')">
+                    <form action="/admin-panel/gists/{{ $gist.ID }}/delete" method="POST" onsubmit="return confirm('Do you want to delete this gist ?')">
                         {{ $.csrfHtml }}
                         <button type="submit" class="text-rose-500 hover:text-rose-600">Delete</button>
                     </form>
diff --git a/templates/pages/admin_index.html b/templates/pages/admin_index.html
index 03fe60d..0ef7351 100644
--- a/templates/pages/admin_index.html
+++ b/templates/pages/admin_index.html
@@ -56,13 +56,13 @@
                 <span class="text-base font-bold leading-6 text-slate-300">Actions</span>
             </div>
             <div class="space-y-2">
-                <form action="/admin/sync-fs" method="POST">
+                <form action="/admin-panel/sync-fs" method="POST">
                     {{ .csrfHtml }}
                     <button type="submit" {{ if .syncReposFromFS }}disabled="disabled"{{ end }} class="whitespace-nowrap text-slate-300{{ if .syncReposFromFS }} text-slate-500 cursor-not-allowed {{ end }}rounded border border-gray-600 bg-gray-800 px-2.5 py-2 text-xs font-medium text-white shadow-sm hover:bg-gray-700 hover:border-gray-500 hover:text-slate-300 focus:outline-none focus:ring-1 focus:border-primary-500 focus:ring-primary-500 leading-3">
                         Synchorize gists from filesystem
                     </button>
                 </form>
-                <form action="/admin/sync-db" method="POST">
+                <form action="/admin-panel/sync-db" method="POST">
                     {{ .csrfHtml }}
                     <button type="submit" {{ if .syncReposFromDB }}disabled="disabled"{{ end }} class="whitespace-nowrap text-slate-300{{ if .syncReposFromDB }} text-slate-500 cursor-not-allowed {{ end }}rounded border border-gray-600 bg-gray-800 px-2.5 py-2 text-xs font-medium text-white shadow-sm hover:bg-gray-700 hover:border-gray-500 hover:text-slate-300 focus:outline-none focus:ring-1 focus:border-primary-500 focus:ring-primary-500 leading-3">
                         Synchorize gists from database
diff --git a/templates/pages/admin_users.html b/templates/pages/admin_users.html
index 24760b8..1435465 100644
--- a/templates/pages/admin_users.html
+++ b/templates/pages/admin_users.html
@@ -20,7 +20,7 @@
                 <td class="whitespace-nowrap px-2 py-2 text-sm text-slate-300"><a href="/{{ $user.Username }}">{{ $user.Username }}</a></td>
                 <td class="whitespace-nowrap px-2 py-2 text-sm text-slate-300"><span class="moment-timestamp-date">{{ $user.CreatedAt }}</span></td>
                 <td class="relative whitespace-nowrap py-2 pl-3 pr-4 text-right text-sm font-medium sm:pr-0">
-                    <form action="/admin/users/{{ $user.ID }}/delete" method="POST" onsubmit="return confirm('Do you want to delete this user ?')">
+                    <form action="/admin-panel/users/{{ $user.ID }}/delete" method="POST" onsubmit="return confirm('Do you want to delete this user ?')">
                         {{ $.csrfHtml }}
                         <button type="submit" class="text-rose-500 hover:text-rose-600">Delete</button>
                     </form>