Skip to content

Commit

Permalink
Merge pull request #294 from quenti-io/eng-129-optimize-distractors
Browse files Browse the repository at this point in the history
fix: lazy loading issues, upgrade deps (closes eng-127)
  • Loading branch information
miapolis authored Dec 9, 2023
2 parents 41d16de + d10ad86 commit 98cfc78
Show file tree
Hide file tree
Showing 14 changed files with 388 additions and 237 deletions.
26 changes: 13 additions & 13 deletions apps/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
},
"dependencies": {
"@chakra-ui/clickable": "^2.1.0",
"@chakra-ui/react": "^2.8.1",
"@chakra-ui/react": "^2.8.2",
"@chakra-ui/react-use-merge-refs": "^2.1.0",
"@chakra-ui/shared-utils": "^2.0.4",
"@chakra-ui/shared-utils": "2.0.5",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/modifiers": "^6.0.1",
"@dnd-kit/sortable": "^7.0.2",
Expand All @@ -28,7 +28,7 @@
"@jitsu/js": "^1.3.2",
"@jitsu/protocols": "^1.2.0",
"@next-auth/prisma-adapter": "^1.0.7",
"@next/bundle-analyzer": "^14.0.2",
"@next/bundle-analyzer": "^14.0.4",
"@planetscale/database": "^1.11.0",
"@quenti/auth": "workspace:*",
"@quenti/branding": "workspace:*",
Expand Down Expand Up @@ -69,7 +69,7 @@
"@vercel/og": "^0.5.17",
"attr-accept": "^2.2.2",
"axios": "^1.5.0",
"chakra-react-select": "^4.7.4",
"chakra-react-select": "^4.7.6",
"compressorjs": "^1.2.1",
"diff": "^5.1.0",
"file-selector": "^0.6.0",
Expand All @@ -80,7 +80,7 @@
"lodash.throttle": "^4.1.1",
"micro": "^10.0.1",
"nanoid": "^5.0.3",
"next": "^14.0.2",
"next": "^14.0.4",
"next-auth": "^4.24.5",
"next-axiom": "^0.18.0",
"next-build-id": "^3.0.0",
Expand All @@ -101,23 +101,23 @@
"devDependencies": {
"@chakra-ui/cli": "^2.4.1",
"@headlessui/tailwindcss": "^0.2.0",
"@types/diff": "^5.0.8",
"@types/diff": "^5.0.9",
"@types/js-levenshtein": "^1.1.3",
"@types/lodash.debounce": "^4.0.9",
"@types/lodash.omit": "^4.5.9",
"@types/lodash.throttle": "^4.1.9",
"@types/node": "^20.9.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"autoprefixer": "^10.4.14",
"@types/node": "^20.10.4",
"@types/react": "^18.2.43",
"@types/react-dom": "^18.2.17",
"autoprefixer": "^10.4.16",
"encoding": "^0.1.13",
"env-cmd": "^10.1.0",
"postcss": "^8.4.31",
"prettier-plugin-tailwindcss": "^0.5.7",
"postcss": "^8.4.32",
"prettier-plugin-tailwindcss": "^0.5.9",
"react-textarea-autosize": "^8.5.3",
"tailwindcss": "^3.3.5",
"ts-node": "^10.9.1",
"typescript": "^5.2.2"
"typescript": "^5.3.3"
},
"ct3aMetadata": {
"initVersion": "7.1.0"
Expand Down
10 changes: 3 additions & 7 deletions apps/next/src/components/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,14 @@ import {
import { IconMenu, IconX } from "@tabler/icons-react";

import { menuEventChannel } from "../events/menu";

const LeftNav = dynamic(() => import("./navbar/left-nav"), { ssr: false });
import LeftNav from "./navbar/left-nav";
import MobileMenu from "./navbar/mobile-menu";
import UserMenu from "./navbar/user-menu";

const ImportFromQuizletModal = dynamic(
() => import("./import-from-quizlet-modal"),
{ ssr: false },
);
const MobileMenu = dynamic(() => import("./navbar/mobile-menu"), {
ssr: false,
});
const UserMenu = dynamic(() => import("./navbar/user-menu"), { ssr: false });

const CreateFolderModal = dynamic(() => import("./create-folder-modal"), {
ssr: false,
});
Expand Down
4 changes: 4 additions & 0 deletions apps/next/src/components/navbar/left-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import NextLink from "next/link";
import React from "react";

import { Link } from "@quenti/components";
import { outfit } from "@quenti/lib/chakra-theme";
import { WEBSITE_URL } from "@quenti/lib/constants/url";

import {
Expand Down Expand Up @@ -73,6 +74,9 @@ export const LeftNav: React.FC<LeftNavProps> = ({
color: "white",
}}
className="notranslate"
fontFamily={outfit.style.fontFamily}
fontWeight={700}
lineHeight={1.33}
>
Quenti
</Heading>
Expand Down
2 changes: 1 addition & 1 deletion apps/website
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
"devDependencies": {
"@faker-js/faker": "^8.0.2",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/jest": "^29.5.8",
"@types/jest": "^29.5.11",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"dotenv-cli": "^7.3.0",
"eslint": "^8.53.0",
"jest": "^29.6.0",
"prettier": "^3.0.3",
"prettier": "^3.1.0",
"prisma": "5.5.2",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@quenti/lib": "workspace:*",
"@quenti/prisma": "workspace:*",
"email-providers": "^2.0.1",
"next": "^14.0.2",
"next": "^14.0.4",
"next-auth": "^4.24.5"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@chakra-ui/react": "^2.8.1",
"@chakra-ui/react": "^2.8.2",
"@quenti/branding": "workspace:*",
"@quenti/env": "workspace:*",
"@quenti/interfaces": "workspace:*",
Expand All @@ -12,7 +12,7 @@
"@tabler/icons-react": "^2.38.0",
"@tiptap/react": "^2.1.12",
"lodash.merge": "^4.6.2",
"next": "^14.0.2",
"next": "^14.0.4",
"next-seo": "^6.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -24,7 +24,7 @@
},
"devDependencies": {
"@types/lodash.merge": "^4.6.9",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15"
"@types/react": "^18.2.43",
"@types/react-dom": "^18.2.17"
}
}
2 changes: 1 addition & 1 deletion packages/emails/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"resend": "^1.1.0"
},
"devDependencies": {
"@types/react": "^18.2.37"
"@types/react": "^18.2.43"
},
"scripts": {
"lint": "eslint . --ext .ts,.tsx",
Expand Down
4 changes: 2 additions & 2 deletions packages/images/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.418.0",
"@chakra-ui/react": "^2.8.1",
"@chakra-ui/react": "^2.8.2",
"@quenti/components": "workspace:*",
"@quenti/env": "workspace:*",
"@quenti/lib": "workspace:*",
Expand All @@ -23,6 +23,6 @@
},
"devDependencies": {
"@types/jsonwebtoken": "^9.0.5",
"@types/react": "^18.2.37"
"@types/react": "^18.2.43"
}
}
8 changes: 4 additions & 4 deletions packages/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@chakra-ui/react": "^2.8.1",
"@chakra-ui/theme-tools": "^2.1.1",
"@chakra-ui/react": "^2.8.2",
"@chakra-ui/theme-tools": "^2.1.2",
"@quenti/env": "workspace:*",
"@quenti/prisma": "workspace:*",
"@tiptap/core": "^2.1.12",
Expand All @@ -21,14 +21,14 @@
"@tiptap/extension-underline": "^2.1.12",
"@tiptap/html": "^2.1.12",
"@tiptap/react": "^2.1.12",
"next": "^14.0.2",
"next": "^14.0.4",
"react": "^18.2.0"
},
"scripts": {
"lint": "eslint . --ext .ts,.tsx",
"lint:fix": "eslint . --ext .ts,.tsx --fix"
},
"devDependencies": {
"@types/react": "^18.2.37"
"@types/react": "^18.2.43"
}
}
4 changes: 2 additions & 2 deletions packages/prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"zod-prisma": "^0.5.4"
},
"devDependencies": {
"@types/node": "^20.9.0",
"@types/node": "^20.10.4",
"prisma": "5.5.2",
"ts-node": "^10.9.1",
"typescript": "^5.2.2"
"typescript": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion packages/trpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@upstash/redis": "^1.22.1",
"email-providers": "^2.0.1",
"nanoid": "^5.0.3",
"next": "^14.0.2",
"next": "^14.0.4",
"next-auth": "^4.24.5",
"next-axiom": "^0.18.0",
"otp-generator": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@quenti/prisma": "workspace:*",
"next": "^14.0.2",
"next": "^14.0.4",
"next-auth": "^4.24.5",
"next-axiom": "^0.18.0"
},
Expand Down
Loading

0 comments on commit 98cfc78

Please sign in to comment.