Skip to content

Commit

Permalink
fix: footer / sidebar / deprecation alert
Browse files Browse the repository at this point in the history
  • Loading branch information
@iCrawl
iCrawl committed Aug 22, 2022
1 parent f7ce9f8 commit ba3e0ed
Show file tree
Hide file tree
Showing 17 changed files with 409 additions and 338 deletions.
6 changes: 3 additions & 3 deletions packages/actions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
},
"devDependencies": {
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.22.1",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"prettier": "^2.7.1",
"rollup-plugin-typescript2": "^0.33.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/builders/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"homepage": "https://discord.js.org",
"dependencies": {
"@sapphire/shapeshift": "^3.5.1",
"discord-api-types": "^0.37.3",
"discord-api-types": "^0.37.4",
"fast-deep-equal": "^3.1.3",
"ts-mixer": "^6.0.1",
"tslib": "^2.4.0"
Expand All @@ -65,14 +65,14 @@
"@favware/cliff-jumper": "^1.8.7",
"@microsoft/api-extractor": "^7.29.3",
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.22.1",
"downlevel-dts": "^0.10.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-tsdoc": "^0.2.16",
"prettier": "^2.7.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/collection/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
"@favware/cliff-jumper": "^1.8.7",
"@microsoft/api-extractor": "^7.29.3",
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.22.1",
"downlevel-dts": "^0.10.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-tsdoc": "^0.2.16",
"prettier": "^2.7.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/discord.js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@discordjs/rest": "workspace:^",
"@sapphire/snowflake": "^3.2.2",
"@types/ws": "^8.5.3",
"discord-api-types": "^0.37.3",
"discord-api-types": "^0.37.4",
"fast-deep-equal": "^3.1.3",
"lodash.snakecase": "^4.1.1",
"tslib": "^2.4.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/docgen/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
"@favware/cliff-jumper": "^1.8.7",
"@types/jsdoc-to-markdown": "^7.0.3",
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"prettier": "^2.7.1",
"rollup-plugin-typescript2": "^0.33.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/proxy-container/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
},
"devDependencies": {
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"prettier": "^2.7.1",
"rollup-plugin-typescript2": "^0.33.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/proxy/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
"@microsoft/api-extractor": "^7.29.3",
"@types/node": "^16.11.52",
"@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.22.1",
"downlevel-dts": "^0.10.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"prettier": "^2.7.1",
"rollup-plugin-typescript2": "^0.33.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/rest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@discordjs/collection": "workspace:^",
"@sapphire/async-queue": "^1.5.0",
"@sapphire/snowflake": "^3.2.2",
"discord-api-types": "^0.37.3",
"discord-api-types": "^0.37.4",
"file-type": "^17.1.6",
"tslib": "^2.4.0",
"undici": "^5.9.1"
Expand All @@ -65,14 +65,14 @@
"@favware/cliff-jumper": "^1.8.7",
"@microsoft/api-extractor": "^7.29.3",
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.22.1",
"downlevel-dts": "^0.10.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-tsdoc": "^0.2.16",
"prettier": "^2.7.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/scripts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
},
"devDependencies": {
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.22.1",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"prettier": "^2.7.1",
"rollup-plugin-typescript2": "^0.33.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/voice/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,27 @@
"homepage": "https://discord.js.org",
"dependencies": {
"@types/ws": "^8.5.3",
"discord-api-types": "^0.37.3",
"discord-api-types": "^0.37.4",
"prism-media": "^1.3.4",
"tslib": "^2.4.0",
"ws": "^8.8.1"
},
"devDependencies": {
"@babel/core": "^7.18.10",
"@babel/core": "^7.18.13",
"@babel/preset-env": "^7.18.10",
"@babel/preset-typescript": "^7.18.6",
"@discordjs/docgen": "workspace:^",
"@favware/cliff-jumper": "^1.8.7",
"@microsoft/api-extractor": "^7.29.3",
"@types/jest": "^28.1.7",
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"downlevel-dts": "^0.10.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-tsdoc": "^0.2.16",
"jest": "^28.1.3",
Expand Down
24 changes: 12 additions & 12 deletions packages/website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"dependencies": {
"@emotion/react": "^11.10.0",
"@emotion/server": "^11.10.0",
"@mantine/core": "^5.2.0",
"@mantine/hooks": "^5.2.0",
"@mantine/next": "^5.2.0",
"@mantine/nprogress": "^5.2.0",
"@mantine/spotlight": "^5.2.0",
"@mantine/core": "^5.2.3",
"@mantine/hooks": "^5.2.3",
"@mantine/next": "^5.2.3",
"@mantine/nprogress": "^5.2.3",
"@mantine/spotlight": "^5.2.3",
"@microsoft/api-extractor-model": "^7.23.1",
"@microsoft/tsdoc": "0.14.1",
"@microsoft/tsdoc-config": "0.16.1",
Expand All @@ -78,25 +78,25 @@
"@types/node": "^16.11.52",
"@types/react-dom": "^18.0.6",
"@types/react-syntax-highlighter": "^15.5.4",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@unocss/cli": "^0.45.9",
"@unocss/preset-web-fonts": "^0.45.9",
"@unocss/reset": "^0.45.9",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@unocss/cli": "^0.45.12",
"@unocss/preset-web-fonts": "^0.45.12",
"@unocss/reset": "^0.45.12",
"@vitejs/plugin-react": "^2.0.1",
"@vitest/coverage-c8": "^0.22.1",
"concurrently": "^7.3.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"happy-dom": "^6.0.4",
"prettier": "^2.7.1",
"typescript": "^4.7.4",
"unocss": "^0.45.9",
"unocss": "^0.45.12",
"vercel": "^28.1.0",
"vitest": "^0.22.1"
},
Expand Down
10 changes: 1 addition & 9 deletions packages/website/src/components/DocContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,7 @@ export function DocContainer({
</Stack>
{(kind === 'Class' || kind === 'Interface') && (methods?.length || properties?.length) ? (
<MediaQuery smallerThan="lg" styles={{ display: 'none' }}>
<Aside
sx={(theme) => ({
zIndex: 1,
background: theme.colorScheme === 'dark' ? theme.colors.dark![8] : theme.colors.gray![0],
})}
hiddenBreakpoint="lg"
width={{ lg: 300 }}
withBorder={false}
>
<Aside hiddenBreakpoint="lg" width={{ lg: 250 }} withBorder>
<ScrollArea p="xs">
<TableOfContentItems properties={properties ?? []} methods={methods ?? []}></TableOfContentItems>
</ScrollArea>
Expand Down
11 changes: 3 additions & 8 deletions packages/website/src/components/SidebarLayout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,6 @@ export function SidebarLayout({ packageName, data, children }: PropsWithChildren
) : null}
</Navbar>
}
// footer={
// <Footer height={60} p="md">
// Application footer
// </Footer>
// }
header={
<Header height={70} p="md">
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', height: '100%' }}>
Expand Down Expand Up @@ -197,11 +192,11 @@ export function SidebarLayout({ packageName, data, children }: PropsWithChildren
<Box
sx={{
position: 'relative',
minHeight: 'calc(100vh - 150px)',
minHeight: 'calc(100vh - 50px)',
zIndex: 1,
background: theme.colorScheme === 'dark' ? theme.colors.dark![8] : theme.colors.gray![0],
}}
p="sm"
p="lg"
pb={80}
>
{children}
Expand All @@ -219,7 +214,7 @@ export function SidebarLayout({ packageName, data, children }: PropsWithChildren
paddingRight: 324,

[theme.fn.smallerThan('lg')]: {
paddingRight: 14,
paddingRight: 24,
},

[theme.fn.smallerThan('md')]: {
Expand Down
2 changes: 1 addition & 1 deletion packages/website/src/components/TableOfContentItems.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export function TableOfContentItems({
});

return (
<Box>
<Box sx={{ wordBreak: 'break-all' }}>
<Group mb="md" ml={2}>
<VscListSelection size={25} />
<Text>Table of contents</Text>
Expand Down
2 changes: 1 addition & 1 deletion packages/website/src/components/tsdoc/BlockComment.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function ExampleBlock({ children, exampleIndex }: ExampleBlockProps): JSX

export function DeprecatedBlock({ children }: { children: ReactNode }): JSX.Element {
return (
<Alert icon={<VscWarning />} title="Deprecated" variant="filled" color="red" radius="xs">
<Alert icon={<VscWarning />} title="Deprecated" variant="outline" color="red" radius="xs">
{children}
</Alert>
);
Expand Down
8 changes: 4 additions & 4 deletions packages/ws/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@sapphire/async-queue": "^1.5.0",
"@types/ws": "^8.5.3",
"@vladfrangu/async_event_emitter": "^2.0.1",
"discord-api-types": "^0.37.3",
"discord-api-types": "^0.37.4",
"tslib": "^2.4.0",
"ws": "^8.8.1"
},
Expand All @@ -66,14 +66,14 @@
"@favware/cliff-jumper": "^1.8.7",
"@microsoft/api-extractor": "^7.29.3",
"@types/node": "^16.11.52",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.22.1",
"downlevel-dts": "^0.10.0",
"eslint": "^8.22.0",
"eslint-config-marine": "^9.4.1",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-tsdoc": "^0.2.16",
"mock-socket": "^9.1.5",
Expand Down
Loading

1 comment on commit ba3e0ed

@vercel
Copy link

@vercel vercel bot commented on ba3e0ed Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

discord-js – ./

discord-js-git-main-discordjs.vercel.app
www.discordjs.dev
discord-js-number-one.vercel.app
discordjs.dev
discord-js-discordjs.vercel.app

Please sign in to comment.