Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tomato6966
Tomato6966 committed Sep 24, 2024
1 parent 7a18b9b commit dcd8315
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 100 deletions.
51 changes: 3 additions & 48 deletions docs/astro.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,25 @@
import { defineConfig } from "astro/config";
import starlight from "@astrojs/starlight";
import starlightTypeDoc, { typeDocSidebarGroup } from "starlight-typedoc"
import { defineConfig } from "astro/config";
import starlight from "@astrojs/starlight";
import starlightTypeDoc, { typeDocSidebarGroup } from "starlight-typedoc"

// https://astro.build/config
export default defineConfig({
site: "https://tomato6966.github.io/lavalink-client/",
base: "/",
site: "https://tomato6966.github.io/lavalink-client/",
base: "/",
integrations: [
starlight({
title: "Lavalink Client",
title: "Lavalink Client",
social: {
github: "https://github.com/Tomato6966/lavalink-client",
discord: "https://discord.gg/AsgD3gtPnb",
email: "mailto:[email protected]",
github: "https://github.com/Tomato6966/lavalink-client",
discord: "https://discord.gg/AsgD3gtPnb",
email: "mailto:[email protected]",
},
editLink: {
baseUrl: "https://github.com/Tomato6966/lavalink-client/tree/main",
baseUrl: "https://github.com/Tomato6966/lavalink-client/tree/main",
},
plugins: [
// Generate the documentation.
starlightTypeDoc({
entryPoints: ["../src/structures/**/*.ts"],
tsconfig: "../tsconfig.json",
entryPoints: ["../src/structures/**/*.ts"],
tsconfig: "../tsconfig.json",
typeDoc: {
Expand All @@ -42,21 +30,14 @@ export default defineConfig({
enumMembersFormat: "table",
typeDeclarationFormat: "table",
indexFormat: "table",
parametersFormat: "table",
propertiesFormat: "table",
enumMembersFormat: "table",
typeDeclarationFormat: "table",
indexFormat: "table",
expandParameters: true,
name: "Lavalink Client",
name: "Lavalink Client",
},
pagination: true,
}),
],
sidebar: [
{
label: "Getting Started",
label: "Getting Started",
collapsed: true,
items: [
Expand All @@ -83,32 +64,20 @@ export default defineConfig({
{
label: "Checkout Docs (Manager-Class)",
link: "/api/lavalinkmanager/classes/lavalinkmanager"
}
label: "Sample Configuration",
link: "/home/configuration",
},
{
label: "Checkout Docs (Manager-Class)",
link: "/api/lavalinkmanager/classes/lavalinkmanager"
}
},
],
},
{
label: "Extra",
label: "Extra",
collapsed: true,
items: [
{
label: "Manager Events",
link: "/extra/manager-events",
label: "Manager Events",
link: "/extra/manager-events",
},
{
label: "Node Events",
link: "/extra/node-events",
label: "Node Events",
link: "/extra/node-events",
},
{
label: "Resuming",
Expand All @@ -124,35 +93,21 @@ export default defineConfig({
{
label: "GitHub",
link: "https://github.com/Tomato6966/lavalink-client",
label: "GitHub",
link: "https://github.com/Tomato6966/lavalink-client",
},
{
label: "NPM",
link: "https://npmjs.com/lavalink-client",
label: "NPM",
link: "https://npmjs.com/lavalink-client",
},
{
label: "Example Bot",
link: "https://github.com/Tomato6966/lavalink-client/tree/main/testBot",
label: "Example Bot",
link: "https://github.com/Tomato6966/lavalink-client/tree/main/testBot",
},
{
label: "Lavalink-Discord",
link: "https://discord.gg/lavalink-1082302532421943407"
},
{
label: "Lavalink-Web",
link: "https://lavalink.dev"
}
{
label: "Lavalink-Discord",
label: "Official Lavalink-Discord",
link: "https://discord.gg/lavalink-1082302532421943407"
},
{
label: "Lavalink-Web",
label: "Official Lavalink-Web",
link: "https://lavalink.dev"
}
],
Expand Down
21 changes: 0 additions & 21 deletions docs/src/components/versionlog.astro
View file

This file was deleted.

61 changes: 30 additions & 31 deletions docs/src/content/docs/index.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,36 @@ import ReadMeMD from "../README.md";

<CardGrid>

<LinkCard
title="Installation"
href="/home/installation"
description="Install lavalink-client"
/>
<LinkCard
title="Lavalink Server Setup"
href="/home/setup-lavalink"
description="How to setup a locally hosted lavalink server"
/>
<LinkCard
title="Configuration Example"
href="/home/configuration"
description="List of all possible configuration with example + extesion classes"
/>
<LinkCard
title="Example Usage Guides"
href="/home/example"
description="See Several examples of multiple lavalink-client features"
/>
<LinkCard
title="See a Features-list"
href="/home/features"
description="View a beautiful list of features from lavalink-client"
/>
<LinkCard
title="Get Started with the Docs (Manager Class)"
href="/api/lavalinkmanager/classes/lavalinkmanager/"
description="See how to use the Manager"
/>

<LinkCard
title="Installation"
href="/home/installation"
description="Install lavalink-client"
/>
<LinkCard
title="Lavalink Server Setup"
href="/home/setup-lavalink"
description="How to setup a locally hosted lavalink server"
/>
<LinkCard
title="Configuration Example"
href="/home/configuration"
description="List of all possible configuration with example + extesion classes"
/>
<LinkCard
title="Example Usage Guides"
href="/home/example"
description="See Several examples of multiple lavalink-client features"
/>
<LinkCard
title="See a Features-list"
href="/home/features"
description="View a beautiful list of features from lavalink-client"
/>
<LinkCard
title="Get Started with the Docs (Manager Class)"
href="/api/lavalinkmanager/classes/lavalinkmanager/"
description="See how to use the Manager"
/>

</CardGrid>

Expand Down

0 comments on commit dcd8315

Please sign in to comment.