foo

dadav · Jul 19, 2024 · abab390 · abab390
1 parent 4c50e0c
commit abab390
Show file tree

Hide file tree

Showing 7 changed files with 361 additions and 102 deletions.
diff --git a/cmd/serve.go b/cmd/serve.go
@@ -155,6 +155,7 @@ You can also enable the caching functionality to speed things up.`,
 					r.HandleFunc("/", ui.IndexHandler)
 					r.HandleFunc("/search", ui.SearchHandler)
 					r.HandleFunc("/modules/{module}", ui.ModuleHandler)
+					r.HandleFunc("/modules/{module}/{version}", ui.ReleaseHandler)
 					r.HandleFunc("/authors/{author}", ui.AuthorHandler)
 					r.HandleFunc("/statistics", ui.StatisticsHandler(x))
 					r.Handle("/assets/*", ui.HandleAssets())

diff --git a/internal/v3/ui/components/module.templ b/internal/v3/ui/components/module.templ
@@ -1,34 +1,10 @@
 package components
 
 import (
-	"encoding/json"
 	"fmt"
-	model "github.com/dadav/gorge/internal/model"
 	gen "github.com/dadav/gorge/pkg/gen/v3/openapi"
-	"strings"
 )
 
-func deps(metadata map[string]interface{}) []model.ModuleDependency {
-	var result model.ReleaseMetadata
-
-	jsonStr, err := json.Marshal(metadata)
-	if err != nil {
-		return nil
-	}
-
-	err = json.Unmarshal(jsonStr, &result)
-
-	if err != nil {
-		return nil
-	}
-
-	return result.Dependencies
-}
-
-func normalize(name string) string {
-	return strings.Replace(name, "/", "-", 1)
-}
-
 templ ModuleView(module *gen.Module) {
 	<h3>{ module.Name }</h3>
 	<table>
@@ -51,23 +27,31 @@ templ ModuleView(module *gen.Module) {
 			</tr>
 			<tr>
 				<td>
-					Version
-				</td>
-				<td>
-					{ module.CurrentRelease.Version }
-				</td>
-			</tr>
-			<tr>
-				<td>
-					Dependencies
+					Versions
 				</td>
 				<td>
-					for _, dep := range deps(module.CurrentRelease.Metadata) {
-						<a href={ templ.URL(fmt.Sprintf("/modules/%s", normalize(dep.Name))) }>{ dep.Name } { dep.VersionRequirement }</a>
-						<br/>
+					<a href={ templ.URL(fmt.Sprintf("/modules/%s/%s", module.Slug, module.CurrentRelease.Version)) }>{ module.CurrentRelease.Version } (latest)</a>
+					for _, release := range module.Releases {
+						if module.CurrentRelease.Version != release.Version {
+							<br/>
+							<a href={ templ.URL(fmt.Sprintf("/modules/%s/%s", module.Slug, release.Version)) }>{ release.Version }</a>
+						}
 					}
 				</td>
 			</tr>
+			if len(deps(module.CurrentRelease.Metadata)) > 0 {
+				<tr>
+					<td>
+						Dependencies
+					</td>
+					<td>
+						for _, dep := range deps(module.CurrentRelease.Metadata) {
+							<a href={ templ.URL(fmt.Sprintf("/modules/%s", normalize(dep.Name))) }>{ dep.Name } { dep.VersionRequirement }</a>
+							<br/>
+						}
+					</td>
+				</tr>
+			}
 		</tbody>
 	</table>
 }
diff --git a/internal/v3/ui/components/module_templ.go b/internal/v3/ui/components/module_templ.go
diff --git a/internal/v3/ui/components/release.templ b/internal/v3/ui/components/release.templ
@@ -0,0 +1,49 @@
+package components
+
+import (
+	"fmt"
+	gen "github.com/dadav/gorge/pkg/gen/v3/openapi"
+)
+
+templ ReleaseView(release *gen.Release) {
+	<h3>{ release.Module.Name }</h3>
+	<table>
+		<tbody>
+			<tr>
+				<td>
+					Name
+				</td>
+				<td>
+					{ release.Module.Name }
+				</td>
+			</tr>
+			<tr>
+				<td>
+					Author
+				</td>
+				<td>
+					<a href={ templ.URL(fmt.Sprintf("/authors/%s", release.Module.Owner.Slug)) }>{ release.Module.Owner.Username }</a>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					Version
+				</td>
+				<td>
+					{ release.Version }
+				</td>
+			</tr>
+			<tr>
+				<td>
+					Dependencies
+				</td>
+				<td>
+					for _, dep := range deps(release.Metadata) {
+						<a href={ templ.URL(fmt.Sprintf("/modules/%s", normalize(dep.Name))) }>{ dep.Name } { dep.VersionRequirement }</a>
+						<br/>
+					}
+				</td>
+			</tr>
+		</tbody>
+	</table>
+}