diff --git a/src/data/api/index.ts b/src/data/api/index.ts index c1119ca..cc88e6c 100644 --- a/src/data/api/index.ts +++ b/src/data/api/index.ts @@ -41,6 +41,15 @@ async function patches(): Promise { const json = await get_json('v3/patches/list'); const packagesWithCount: { [key: string]: number } = {}; + json.forEach((patch) => { + if (!patch.compatiblePackages) return; + + patch.compatiblePackages = Object.keys(patch.compatiblePackages).map((name) => ({ + name, + versions: patch.compatiblePackages[name] + })); + }); + // gets packages and patch count for (let i = 0; i < json.length; i++) { json[i].compatiblePackages?.forEach((pkg: CompatiblePackage) => { diff --git a/src/lib/types.ts b/src/lib/types.ts index bf3a903..00bc5f3 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -7,41 +7,38 @@ export interface Contributor { export interface Contributable { name: string; + url: string; contributors: Contributor[]; } export interface Patch { name: string; description: string; - compatiblePackages: CompatiblePackage[]; use: boolean; - requiresIntegrations: boolean; + compatiblePackages: CompatiblePackage[] | null; options: PatchOption[]; } export interface CompatiblePackage { name: string; - versions: string[]; + versions: string[] | null; } export interface PatchOption { key: string; - default: any; - title: string; + title: string | null; description: string; required: boolean; -} - -export interface Asset { - name: string; - download_url: string; + type: string; + default: any | null; + values: any[] | null; } export interface Release { version: string; created_at: string; description: string; - assets: Asset[]; + download_url: string; } export interface TeamMember { @@ -52,7 +49,7 @@ export interface TeamMember { gpg_key: GpgKey; } -expose interface GpgKey { +export interface GpgKey { id: string; url: string; } diff --git a/src/routes/contributors/+page.svelte b/src/routes/contributors/+page.svelte index 01e52a0..8f5ac53 100644 --- a/src/routes/contributors/+page.svelte +++ b/src/routes/contributors/+page.svelte @@ -52,9 +52,9 @@
- {#each data.contributables as { contributors, name: repo }} + {#each data.contributables as { name, url, contributors }}
- +
{/each}
diff --git a/src/routes/contributors/ContributorSection.svelte b/src/routes/contributors/ContributorSection.svelte index 1218b81..dd9a73d 100644 --- a/src/routes/contributors/ContributorSection.svelte +++ b/src/routes/contributors/ContributorSection.svelte @@ -1,16 +1,16 @@
@@ -20,8 +20,8 @@ on:click={() => (expanded = !expanded)} on:keypress={() => (expanded = !expanded)} > - -

{repo_name}

+
+

{name}

-
+ -
+
-
Verified
+
GPG key
@@ -90,18 +90,18 @@ .verified-badge { display: flex; align-items: center; - fill: var(--secondary); + fill: var(--secondary) !important; line-height: 16px; height: 16px; - .mobile-verified { + .mobile { display: none; } @media screen and (width <= 768px) { - .desktop-verified { + .desktop { display: none; } - .mobile-verified { + .mobile { display: flex; flex-direction: row; justify-content: center; diff --git a/src/routes/download/+page.svelte b/src/routes/download/+page.svelte index c00f5de..0e4cca4 100644 --- a/src/routes/download/+page.svelte +++ b/src/routes/download/+page.svelte @@ -75,7 +75,7 @@ @@ -97,7 +97,7 @@ on:click={handleClick} type="filled" icon="download" - href={data.release.assets[0].download_url} + href={data.release.download_url} > {data.release.version} diff --git a/src/routes/patches/PatchItem.svelte b/src/routes/patches/PatchItem.svelte index c417897..570fc69 100644 --- a/src/routes/patches/PatchItem.svelte +++ b/src/routes/patches/PatchItem.svelte @@ -35,7 +35,7 @@
{patch.description}
{/if}
    - {#if !patch.compatiblePackages?.length} + {#if !patch.compatiblePackages}
  • 🌎 Universal patch
  • {:else} {#each patch.compatiblePackages as pkg} diff --git a/src/util/friendlyName.ts b/src/util/friendlyName.ts deleted file mode 100644 index c294d33..0000000 --- a/src/util/friendlyName.ts +++ /dev/null @@ -1,8 +0,0 @@ -export function friendlyName(text: string): string { - return text - .replace(/-/g, ' ') - .replace(/\brevanced\b/g, 'ReVanced') - .replace(/\bcli\b/g, 'CLI') - .replace(/api/g, 'API') - .replace(/(?:^|\s)\S/g, (x: string) => x.toUpperCase()); -}