Skip to content

Commit

Permalink
feat: bump versions and update website (#170)
Browse files Browse the repository at this point in the history
* feat: bump versions and update website

* fix: docs styling

* fix: downgrade eslint

* fix: pin eslint this time

* fix: lets try again

* fix: dont cache buf:generate

* fix: add dep

* fix: add dep x2

* chore: bump versions
  • Loading branch information
killbasa authored Sep 15, 2023
1 parent 5e3e105 commit 3f24db6
Show file tree
Hide file tree
Showing 59 changed files with 1,362 additions and 979 deletions.
20 changes: 10 additions & 10 deletions apps/bot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@
"@bufbuild/connect": "^0.13.0",
"@bufbuild/connect-node": "^0.13.0",
"@bufbuild/connect-web": "^0.13.0",
"@bufbuild/protobuf": "^1.3.0",
"@bufbuild/protobuf": "^1.3.1",
"@kbotdev/database": "workspace:^",
"@kbotdev/holodex": "workspace:^",
"@kbotdev/meili": "workspace:^",
"@kbotdev/plugin-modules": "^2.1.0",
"@kbotdev/proto": "workspace:^",
"@kbotdev/redis": "workspace:^",
"@sapphire/decorators": "^6.0.2",
"@sapphire/discord.js-utilities": "^7.0.1",
"@sapphire/discord.js-utilities": "^7.0.2",
"@sapphire/duration": "^1.1.0",
"@sapphire/fetch": "^2.4.1",
"@sapphire/framework": "^4.5.3",
"@sapphire/framework": "^4.6.0",
"@sapphire/plugin-api": "^5.1.1",
"@sapphire/plugin-logger": "^3.0.6",
"@sapphire/plugin-scheduled-tasks": "^7.1.2",
"@sentry/integrations": "^7.64.0",
"@sentry/node": "^7.64.0",
"@sentry/integrations": "^7.69.0",
"@sentry/node": "^7.69.0",
"@skyra/gifenc": "^1.0.1",
"bufferutil": "^4.0.7",
"bullmq": "^3.15.8",
"bullmq": "^4.10.0",
"canvas": "2.11.2",
"canvas-constructor": "^7.0.1",
"colorette": "^2.0.20",
Expand All @@ -63,13 +63,13 @@
"zlib-sync": "^0.1.8"
},
"devDependencies": {
"@sentry/types": "^7.64.0",
"@sentry/types": "^7.69.0",
"@types/humanize-duration": "^3.27.1",
"eslint": "^8.47.0",
"prettier": "^3.0.2",
"eslint": "8.49.0",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"typescript": "^5.2.2",
"vitest": "^0.34.2"
"vitest": "^0.34.4"
},
"imports": {
"#prisma": "./prisma/generated/index.js",
Expand Down
2 changes: 1 addition & 1 deletion apps/bot/src/scheduled-tasks/stats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ export class StatsTask extends ScheduledTask {
body: JSON.stringify({
server_count: guildCount
})
});
}).catch(() => {});
}
}
4 changes: 3 additions & 1 deletion apps/bot/src/scheduled-tasks/youtube/notify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ export class YoutubeTask extends ScheduledTask {
streams.filter(({ available_at }) => {
return new Date(available_at).getTime() < Date.now() + Time.Hour;
})
);
)
.catch(() => null);
if (!liveStreams) return;

metrics.incrementHolodex();

Expand Down
9 changes: 5 additions & 4 deletions apps/docs/docs/.vitepress/theme/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import './theme.css';

import DefaultTheme from 'vitepress/theme';
import KofiButton from '../components/KofiButton.vue';
import type { Theme } from 'vitepress';
// @ts-expect-error Can't infer .vue types
import KofiButton from '../components/KofiButton.vue';

// Need to import CSS after for it to load
import './theme.css';

// @ts-expect-error Theme is broken
const theme: Theme = {
extends: DefaultTheme,
enhanceApp({ app }) {
Expand Down
99 changes: 0 additions & 99 deletions apps/docs/docs/.vitepress/theme/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@
--vp-c-neutral: var(--vp-c-black);
--vp-c-neutral-inverse: var(--vp-c-white);

--vp-c-text-1: var(--vp-c-text-light-1);
--vp-c-text-2: var(--vp-c-text-light-2);
--vp-c-text-3: var(--vp-c-text-light-3);

--vp-c-text-inverse-1: var(--vp-c-text-dark-1);
--vp-c-text-inverse-2: var(--vp-c-text-dark-2);
--vp-c-text-inverse-3: var(--vp-c-text-dark-3);

--vp-c-text-code: #476582;

--vp-c-brand: hsla(225, 44%, 52%, 1);
Expand Down Expand Up @@ -77,42 +69,7 @@
--vp-c-neutral: var(--vp-c-white);
--vp-c-neutral-inverse: var(--vp-c-black);

--vp-c-text-1: var(--vp-c-text-dark-1);
--vp-c-text-2: var(--vp-c-text-dark-2);
--vp-c-text-3: var(--vp-c-text-dark-3);

--vp-c-text-inverse-1: var(--vp-c-text-light-1);
--vp-c-text-inverse-2: var(--vp-c-text-light-2);
--vp-c-text-inverse-3: var(--vp-c-text-light-3);

--vp-c-text-code: #c9def1;

--vp-c-mute: #313136;
--vp-c-mute-light: #3a3a3c;
--vp-c-mute-lighter: #505053;
--vp-c-mute-dark: #2c2c30;
--vp-c-mute-darker: #252529;
}

/**
* Navbar
* -------------------------------------------------------------------------- */

.VPNavBarTitle {
transition: none !important;
}

/**
* Sidebar
* -------------------------------------------------------------------------- */

.VPSidebar {
background-color: var(--vp-c-bg-alt) !important;
}

.VPNav.no-sidebar,
.VPNavBar.has-sidebar .content {
backdrop-filter: none !important;
}

/**
Expand All @@ -126,59 +83,3 @@
.vp-doc td {
background: var(--vp-c-bg-soft);
}

/**
* Badges
* -------------------------------------------------------------------------- */

h1 .VPBadge,
h2 .VPBadge,
h3 .VPBadge,
h4 .VPBadge,
h5 .VPBadge,
h6 .VPBadge {
vertical-align: middle !important;
}

.VPBadge.info {
border-color: rgba(60, 100, 225) !important;
color: rgba(80, 127, 240) !important;
background-color: rgba(16, 129, 185, 0.05) !important;
}

/**
* Containers
* -------------------------------------------------------------------------- */

.custom-block.info {
border-color: #346ddb;
color: var(--vp-c-text-1);
}

.custom-block.info code {
color: var(--vp-c-text-code);
}

.custom-block.tip {
color: var(--vp-c-text-1);
}

.custom-block.tip code {
color: var(--vp-c-text-code);
}

.custom-block.warning {
color: var(--vp-c-text-1);
}

.custom-block.warning code {
color: var(--vp-c-text-code);
}

.custom-block.danger {
color: var(--vp-c-text-1);
}

.custom-block.danger code {
color: var(--vp-c-text-code);
}
2 changes: 1 addition & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
},
"devDependencies": {
"sitemap": "^7.1.1",
"vitepress": "1.0.0-rc.4"
"vitepress": "1.0.0-rc.13"
}
}
35 changes: 18 additions & 17 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"homepage": "https://github.com/KBot-discord/kbot/tree/main/apps/web",
"engines": {
"node": ">=18.x"
"node": ">=20.x"
},
"scripts": {
"dev": "vite dev",
Expand All @@ -29,40 +29,41 @@
"dependencies": {
"@bufbuild/connect": "^0.13.0",
"@bufbuild/connect-node": "^0.13.0",
"@bufbuild/protobuf": "^1.3.0",
"@floating-ui/dom": "^1.5.1",
"@bufbuild/protobuf": "^1.3.1",
"@floating-ui/dom": "^1.5.3",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@kbotdev/proto": "workspace:^",
"svelte-fa": "^3.0.4"
},
"devDependencies": {
"@kbotdev/eslint-config": "^1.1.0",
"@kbotdev/eslint-config": "^1.1.1",
"@sapphire/plugin-api": "^5.1.1",
"@skeletonlabs/skeleton": "^1.12.0",
"@skeletonlabs/skeleton": "2.1.0",
"@skeletonlabs/tw-plugin": "^0.2.0",
"@sveltejs/adapter-node": "^1.3.1",
"@sveltejs/kit": "^1.23.0",
"@sveltejs/vite-plugin-svelte": "^2.4.5",
"@tailwindcss/forms": "^0.5.5",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"@sveltejs/kit": "^1.25.0",
"@sveltejs/vite-plugin-svelte": "^2.4.6",
"@tailwindcss/forms": "^0.5.6",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"autoprefixer": "^10.4.15",
"discord-api-types": "^0.37.55",
"discord-api-types": "^0.37.56",
"discord.js": "^14.13.0",
"eslint": "^8.47.0",
"eslint": "8.49.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-svelte": "^2.33.0",
"postcss": "^8.4.28",
"prettier": "3.0.2",
"eslint-plugin-svelte": "^2.33.1",
"postcss": "^8.4.29",
"prettier": "3.0.3",
"prettier-plugin-svelte": "^3.0.3",
"svelte": "^4.2.0",
"svelte-check": "^3.5.0",
"svelte-check": "^3.5.1",
"svelte-eslint-parser": "^0.33.0",
"svelte-meta-tags": "^3.0.3",
"svelte-sitemap": "^2.6.0",
"tailwindcss": "^3.3.3",
"vite": "^4.4.9",
"vitest": "^0.34.2"
"vitest": "^0.34.4"
}
}
2 changes: 1 addition & 1 deletion apps/web/src/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

%sveltekit.head%
</head>
<body>
<body data-theme="default-theme">
<div style="display: contents" class="h-full overflow-hidden">%sveltekit.body%</div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind variants;

:root {
--theme-font-family-base: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
Expand All @@ -16,3 +21,10 @@ html,
body {
@apply h-full overflow-hidden;
}

@layer base {
input,
button {
@apply !rounded;
}
}
13 changes: 0 additions & 13 deletions apps/web/src/hooks/block.ts

This file was deleted.

4 changes: 2 additions & 2 deletions apps/web/src/lib/components/Meta.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
image: logo,
imageAlt: 'KBot icon'
}}
robots={blockRobots ? 'noindex,nofollow' : false}
additionalRobotsProps={robotsProps}
robots={blockRobots ? 'noindex,nofollow' : undefined}
additionalRobotsProps={blockRobots ? undefined : robotsProps}
/>

<svelte:head>
Expand Down
13 changes: 0 additions & 13 deletions apps/web/src/lib/components/Sidebar.svelte

This file was deleted.

9 changes: 0 additions & 9 deletions apps/web/src/lib/components/auth/Login.svelte

This file was deleted.

9 changes: 0 additions & 9 deletions apps/web/src/lib/components/auth/Logout.svelte

This file was deleted.

Loading

0 comments on commit 3f24db6

Please sign in to comment.