implement homepage and repository links

UpliftGames · Nov 26, 2023 · 60c015f · 60c015f
1 parent ea536c5
commit 60c015f
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 5 deletions.
diff --git a/src/manifest.rs b/src/manifest.rs
@@ -126,6 +126,18 @@ pub struct Package {
     /// Example: true
     #[serde(default)]
     pub private: bool,
+
+    /// URL of the package homepage.
+    ///
+    /// Example: "https://github.com/sleitnick/knit"
+    #[serde(default)]
+    pub homepage: Option<String>,
+
+    /// URL of the package source repository.
+    ///
+    /// Example: "https://github.com/Sleitnick/Knit.git"
+    #[serde(default)]
+    pub repository: Option<String>,
 }
 
 // Metadata we require when this manifest will be used to generate package folders

diff --git a/src/test_package.rs b/src/test_package.rs
@@ -39,6 +39,8 @@ impl PackageBuilder {
                 include: Vec::new(),
                 exclude: Vec::new(),
                 private: false,
+                homepage: None,
+                repository: None,
             },
             place: Default::default(),
             dependencies: Default::default(),

diff --git a/test-projects/manifestlinks/default.project.json b/test-projects/manifestlinks/default.project.json
@@ -0,0 +1,6 @@
+{
+	"name": "minimal",
+	"tree": {
+		"$path": "src"
+	}
+}
diff --git a/test-projects/manifestlinks/src/init.lua b/test-projects/manifestlinks/src/init.lua
@@ -0,0 +1 @@
+return "hey"
diff --git a/test-projects/manifestlinks/wally.toml b/test-projects/manifestlinks/wally.toml
@@ -0,0 +1,8 @@
+[package]
+name = "biff/minimal"
+version = "0.1.0"
+license = "MIT"
+realm = "server"
+registry = "test-registries/primary-registry"
+repository = "https://github.com/UpliftGames/player-module.git"
+homepage = "https://github.com/UpliftGames/player-module"
diff --git a/test-registries/primary-registry/contents/biff/manifestlinks/0.1.0.zip b/test-registries/primary-registry/contents/biff/manifestlinks/0.1.0.zip
diff --git a/test-registries/primary-registry/index/biff/manifestlinks b/test-registries/primary-registry/index/biff/manifestlinks
@@ -0,0 +1 @@
+{"package":{"name":"biff/minimal","version":"0.1.0","registry":"test-registries/primary-registry","realm":"server","description":null,"license":"MIT","authors":[],"include":[],"exclude":[],"private":false,"homepage":"https://github.com/UpliftGames/player-module","repository":"https://github.com/UpliftGames/player-module.git"},"place":{"shared-packages":null,"server-packages":null},"dependencies":{},"server-dependencies":{},"dev-dependencies":{}}
diff --git a/wally-registry-frontend/package-lock.json b/wally-registry-frontend/package-lock.json
diff --git a/wally-registry-frontend/src/pages/Package.tsx b/wally-registry-frontend/src/pages/Package.tsx
@@ -295,7 +295,7 @@ export default function Package() {
   const packageMetadata = packageHistory?.find(
     (item: WallyPackageMetadata) => item.package.version === packageVersion
   )
-
+    console.log(packageMetadata)
   if (packageMetadata == undefined) {
     return (
       <>
@@ -418,6 +418,22 @@ export default function Package() {
                 </MetaItem>
               )} */}
 
+              {packageMetadata?.package.homepage && (
+                <MetaItem title="Homepage" width="full">
+                  <a href={packageMetadata?.package.homepage}>
+                    {packageMetadata?.package.homepage.replace("https://", "")}
+                  </a>
+                </MetaItem>
+              )}
+
+              {packageMetadata?.package.repository && (
+                <MetaItem title="Repository" width="full">
+                  <a href={packageMetadata?.package.repository.replace("https://", "")}>
+                    {packageMetadata?.package.repository}
+                  </a>
+                </MetaItem>
+              )}
+
             {packageMetadata.package.authors.length > 0 && (
               <MetaItem title="Authors" width="full">
                 {packageMetadata.package.authors.map((author) => (

diff --git a/wally-registry-frontend/src/types/wally.d.ts b/wally-registry-frontend/src/types/wally.d.ts
@@ -14,6 +14,8 @@ export interface WallyPackageMetadata {
     realm: string
     registry: string
     version: string
+	homepage: string
+	repository: string
   }
 
   place: {