diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index b87af479..273c8451 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -7,8 +7,15 @@ export let data: PageData; - const MandatoryServices = ['plexlibrary', 'scraping', 'realdebrid', 'symlinklibrary']; - const ContentServices = ['mdblist', 'overseerr', 'plex_watchlist']; + const CoreServices = [ + 'symlinklibrary', + 'plexlibrary', + 'realdebrid', + 'symlink', + 'torbox', + 'torbox_downloader' + ]; + const ContentServices = ['mdblist', 'overseerr', 'plex_watchlist', 'listrr', 'trakt']; const ScrapingServices = ['torrentio', 'annatar', 'jackett', 'orionoid']; function sortServices(services: string[], data: Record) { @@ -48,7 +55,7 @@ {:then services}

Core services

- +

Content services

diff --git a/frontend/src/routes/api/items/[id]/+server.ts b/frontend/src/routes/api/items/[id]/+server.ts index 59e75ea3..db93b397 100644 --- a/frontend/src/routes/api/items/[id]/+server.ts +++ b/frontend/src/routes/api/items/[id]/+server.ts @@ -1,4 +1,4 @@ -import { json } from '@sveltejs/kit'; +// We can only access api from server-side so this needs to be made into a server route export const GET = async ({ fetch, params }) => { const id: number = Number(params.id); diff --git a/frontend/src/routes/settings/about/+page.server.ts b/frontend/src/routes/settings/about/+page.server.ts index 477b3651..734cf187 100644 --- a/frontend/src/routes/settings/about/+page.server.ts +++ b/frontend/src/routes/settings/about/+page.server.ts @@ -12,63 +12,6 @@ export const load: PageServerLoad = async ({ fetch }) => { error(503, 'Unable to fetch settings data. API is down.'); } } - async function getContributors() { - try { - const results = await fetch('https://api.github.com/repos/dreulavelle/iceburg/contributors'); - const data = await results.json(); - return data - .filter((contributor: any) => contributor.type !== 'Bot' && contributor.type !== 'Organization') - .map((contributor: any) => ({ - avatar: contributor.avatar_url, - name: contributor.login, - profile: contributor.html_url - })); - - } catch (e) { - console.error(e); - error(503, 'Unable to fetch contributors data. API is down.'); - } - } - async function getSponsors() { - try { - // graphql query to get sponsors - const query = ` - query { - user(login: "dreulavelle") { - ... on Sponsorable { - sponsors(first: 100) { - totalCount - nodes { - ... on User { login, avatarUrl, url } - ... on Organization { login, avatarUrl, url } - } - } - } - } - } - ` - const results = await fetch('https://api.github.com/graphql', { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify({ query }) - }); - if (results.status !== 200) { - console.error(results); - return [] - } - const data = await results.json(); - return data.data.user.sponsors.nodes.map((sponsor: any) => ({ - avatar: sponsor.avatarUrl, - name: sponsor.login, - profile: sponsor.url - })); - } catch (e) { - console.error(e); - error(503, 'Unable to fetch sponsors data. API is down.'); - } - } - return { settings: await getAboutInfo(), contributors: await getContributors(), sponsors: await getSponsors()}; + return { settings: await getAboutInfo() }; }; diff --git a/frontend/src/routes/settings/about/+page.svelte b/frontend/src/routes/settings/about/+page.svelte index 8f0dcc1f..48fe987b 100644 --- a/frontend/src/routes/settings/about/+page.svelte +++ b/frontend/src/routes/settings/about/+page.svelte @@ -12,8 +12,6 @@ const version = data.settings.data.version; const rclone_path = data.settings.data.symlink.rclone_path; const library_path = data.settings.data.symlink.library_path; - const contributors = data.contributors; - const sponsors = data.sponsors; interface AboutData { [key: string]: any; @@ -40,18 +38,16 @@ async function getLatestVersion() { updateLoading = true; - const data = await fetch( - 'https://raw.githubusercontent.com/dreulavelle/iceberg/main/backend/utils/default_settings.json' - ); + const data = await fetch('https://raw.githubusercontent.com/dreulavelle/iceberg/main/VERSION'); if (data.status !== 200) { toast.error('Failed to fetch latest version.'); updateLoading = false; return; } - const json = await data.json(); + const remoteVersion = await data.text(); updateLoading = false; - if (json.version !== version) { + if (remoteVersion !== version) { toast.warning('A new version is available! Checkout the changelog on GitHub.'); } else { toast.success('You are running the latest version.'); @@ -64,13 +60,6 @@
- - Heads up! - Iceberg is in rapid development. Expect bugs and breaking changes. - -

About

Know what you're running.

@@ -136,37 +125,17 @@

Contributors

- Thanks to the following people for their contributions to Iceberg: + Thanks to the following people for their contributions to Iceberg

-
- {#each contributors as contributor} - - {contributor.name} -

- {formatWords(contributor.name)} -

-
- {/each} -
-

Sponsors

-

- Thanks to the following people for sponsoring Iceberg: -

-
- {#each sponsors as sponsor} - - {sponsor.name} -

- {formatWords(sponsor.name)} -

-
- {/each} - {#if sponsors.length === 0} -

No sponsors yet.

-

Interested in sponsoring Iceberg? Do it here!

- {:else} -

Interested in sponsoring Iceberg? Do it here!

- {/if} -
+ contributors