diff --git a/registry/src/http/api.ts b/registry/src/http/api.ts index bcaa66f..36584c9 100644 --- a/registry/src/http/api.ts +++ b/registry/src/http/api.ts @@ -110,7 +110,7 @@ async function uploadPackage(ctx: ABC.Context) { if (!packageMeta) { packageMeta = { name: packageName, - author: meta.author, + author: ctx.customContext.user, description: meta.description, deprecated: false, versions: [], @@ -157,7 +157,7 @@ async function uploadPackage(ctx: ABC.Context) { { $set: { versions: [...packageMeta.versions, packageVersion], - author: meta.author || packageMeta.author, + author: ctx.customContext.user, description: meta.description || packageMeta.description, deprecated: meta.deprecated === true, }, diff --git a/registry/src/http/views.ts b/registry/src/http/views.ts index e0018ce..d7bcc9b 100644 --- a/registry/src/http/views.ts +++ b/registry/src/http/views.ts @@ -57,7 +57,7 @@ export default function views(g: ABC.Application) { .update(`${packageName}:${packageVersion}`) .toString("base64"); - await ctx.render("package", { pkg }); + await ctx.render("package", { pkg, version: packageVersion }); ctx.response.headers.set("cache-control", CACHE_CONTROL); ctx.response.headers.set("E-Tag", etag); }); diff --git a/registry/src/utils.ts b/registry/src/utils.ts index 648369b..33fa1d5 100644 --- a/registry/src/utils.ts +++ b/registry/src/utils.ts @@ -64,6 +64,7 @@ export const basicauth = (realm: string) => (next: ABC.HandlerFunc) => ( export function extractPackagePath(path: string): [string, string | undefined] { let packageName = ""; path = path.toLowerCase(); + if (path.startsWith("@")) { packageName = "@"; path = path.slice(1); @@ -81,7 +82,6 @@ export function extractPackagePath(path: string): [string, string | undefined] { if (packageVersion !== "") { if (!isValidVersion(packageVersion)) throw new Error("Invalid package version!"); - else packageVersion = undefined; } return [packageName, packageVersion]; diff --git a/registry/src/views/_base.tsx b/registry/src/views/_base.tsx index 9dd798d..878fac3 100644 --- a/registry/src/views/_base.tsx +++ b/registry/src/views/_base.tsx @@ -5,7 +5,8 @@ const styles = new TextDecoder().decode( Deno.readFileSync("src/views/styles.css") ); -export default function Base(d: any, children: any[]) { +export default function Base(p: any, children: any[]) { + const title = p.title || "DenReg"; return ( @@ -18,6 +19,12 @@ export default function Base(d: any, children: any[]) { href="https://unpkg.com/papercss@1.6.1/dist/paper.min.css" /> + {title} + + {children} diff --git a/registry/src/views/_default.tsx b/registry/src/views/_default.tsx index fa886c7..e07099f 100644 --- a/registry/src/views/_default.tsx +++ b/registry/src/views/_default.tsx @@ -13,10 +13,10 @@ export function Menu({}: any, children: any) { return (
-
+ {/*
-
+
*/}

DenReg diff --git a/registry/src/views/index.tsx b/registry/src/views/index.tsx index dd5d285..ce27ecc 100644 --- a/registry/src/views/index.tsx +++ b/registry/src/views/index.tsx @@ -11,7 +11,7 @@ function Package({ pkg }: { pkg: IPackage }) { return (
@@ -44,7 +44,7 @@ export default async function index({
-
+
{/* */}
- +
diff --git a/registry/src/views/package.tsx b/registry/src/views/package.tsx index 2e71ae5..d014c46 100644 --- a/registry/src/views/package.tsx +++ b/registry/src/views/package.tsx @@ -30,7 +30,13 @@ import { sortVersions, getFile } from "../utils.ts"; import { Main, Menu } from "./_default.tsx"; -export default async function index({ pkg }: { pkg: IPackage }) { +export default async function index({ + pkg, + version, +}: { + pkg: IPackage; + version?: string; +}) { if (!pkg) return ( @@ -38,7 +44,7 @@ export default async function index({ pkg }: { pkg: IPackage }) { ); - const readmeContent = await getFile(pkg.name, undefined, "README.md").then( + const readmeContent = await getFile(pkg.name, version, "README.md").then( (res) => { if (res) return Marked.parse(new TextDecoder().decode(res.data)) @@ -48,18 +54,43 @@ export default async function index({ pkg }: { pkg: IPackage }) { ); return ( - +

Package: {pkg.name}

By {pkg.author}

- {readmeContent !== undefined ? ( -
diff --git a/registry/src/views/styles.css b/registry/src/views/styles.css index 4167020..10b8f39 100644 --- a/registry/src/views/styles.css +++ b/registry/src/views/styles.css @@ -7,6 +7,10 @@ padding-right: 1rem; } +.package-list-margin { + margin: 1rem; +} + @media only screen and (max-width: 64rem) { .site { grid-template-columns: 1fr; @@ -14,4 +18,8 @@ "menu" "main"; } + + .package-list-margin { + margin: 1rem 0; + } }