Skip to content

Commit

Permalink
chore: updates deps (#233)
Browse files Browse the repository at this point in the history
  • Loading branch information
ixahmedxi authored Jul 12, 2023
1 parent 3e82237 commit a228813
Show file tree
Hide file tree
Showing 20 changed files with 1,227 additions and 1,170 deletions.
1 change: 0 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const config = {
extends: ['noodle/base'],
parserOptions: {
tsconfigRootDir: __dirname,
project: true,
},
};

Expand Down
4 changes: 2 additions & 2 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"next-seo": "^6.1.0",
"next-themes": "^0.2.1",
"react": "18.2.0",
"react-animate-height": "^3.1.2",
"react-animate-height": "^3.2.2",
"react-dom": "18.2.0",
"react-wrap-balancer": "^1.0.0",
"superjson": "^1.12.4",
Expand All @@ -54,7 +54,7 @@
"@noodle/test-utils": "workspace:^",
"@noodle/tsconfig": "workspace:^",
"@noodle/vitest": "workspace:^",
"@playwright/test": "^1.35.1",
"@playwright/test": "^1.36.0",
"@testing-library/dom": "^9.3.1",
"@testing-library/user-event": "^14.4.3",
"@types/react": "18.2.14",
Expand Down
16 changes: 12 additions & 4 deletions apps/web/src/components/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,18 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
'placeholder:text-gray-10 dark:placeholder:text-graydark-10 flex-1 bg-transparent p-4 text-base outline-none',
className,
)}
onMouseEnter={() => setIsInputHovered(true)}
onMouseLeave={() => setIsInputHovered(false)}
onFocus={() => setIsInputActive(true)}
onBlur={() => setIsInputActive(false)}
onMouseEnter={() => {
setIsInputHovered(true);
}}
onMouseLeave={() => {
setIsInputHovered(false);
}}
onFocus={() => {
setIsInputActive(true);
}}
onBlur={() => {
setIsInputActive(false);
}}
/>
</div>
);
Expand Down
20 changes: 11 additions & 9 deletions apps/web/src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ export const Navbar = () => {

<div className="order-3 w-full md:order-1 md:w-auto">
<AnimateHeight id="example-panel" duration={500} height={height}>
<ul className="md:border-gray-6 md:dark:border-graydark-6 bg-gray-1 dark:bg-graydark-1 flex flex-col text-sm md:flex-row md:items-center md:rounded-xl md:border">
<ul className="bg-gray-1 md:border-gray-6 md:dark:border-graydark-6 dark:bg-graydark-1 flex flex-col text-sm md:flex-row md:items-center md:rounded-xl md:border">
<li>
<Link
href="/"
onClick={smoothScrollToTop}
className="text-gray-11 dark:text-graydark-11 hover:text-gray-12 dark:hover:text-graydark-12 inline-block pb-3 pt-6 transition-colors md:py-3 md:pl-4 md:pr-6"
className="text-gray-11 dark:text-graydark-11 dark:hover:text-graydark-12 hover:text-gray-12 inline-block pb-3 pt-6 transition-colors md:py-3 md:pl-4 md:pr-6"
>
Home
</Link>
Expand All @@ -71,7 +71,7 @@ export const Navbar = () => {
<Link
href="/#features"
onClick={smoothScrollToId('features')}
className="text-gray-11 dark:text-graydark-11 hover:text-gray-12 dark:hover:text-graydark-12 inline-block py-3 transition-colors md:px-6 md:py-3"
className="text-gray-11 dark:text-graydark-11 dark:hover:text-graydark-12 hover:text-gray-12 inline-block py-3 transition-colors md:px-6 md:py-3"
>
Features
</Link>
Expand All @@ -80,7 +80,7 @@ export const Navbar = () => {
<Link
href="/#mission"
onClick={smoothScrollToId('mission')}
className="text-gray-11 dark:text-graydark-11 hover:text-gray-12 dark:hover:text-graydark-12 inline-block py-3 transition-colors md:px-6 md:py-3"
className="text-gray-11 dark:text-graydark-11 dark:hover:text-graydark-12 hover:text-gray-12 inline-block py-3 transition-colors md:px-6 md:py-3"
>
Mission
</Link>
Expand All @@ -89,7 +89,7 @@ export const Navbar = () => {
<Link
href="/#faq"
onClick={smoothScrollToId('faq')}
className="text-gray-11 dark:text-graydark-11 hover:text-gray-12 dark:hover:text-graydark-12 inline-block pb-2 pt-3 transition-colors md:py-3 md:pl-6 md:pr-4"
className="text-gray-11 dark:text-graydark-11 dark:hover:text-graydark-12 hover:text-gray-12 inline-block pb-2 pt-3 transition-colors md:py-3 md:pl-6 md:pr-4"
>
FAQ
</Link>
Expand All @@ -99,7 +99,7 @@ export const Navbar = () => {
href="https://discord.gg/SERySfj8Eg"
target="_blank"
rel="noopener noreferrer"
className="text-gray-11 dark:text-graydark-11 hover:text-gray-12 dark:hover:text-graydark-12 inline-block pb-2 pt-3 transition-colors md:py-3 md:pl-6 md:pr-4"
className="text-gray-11 dark:text-graydark-11 dark:hover:text-graydark-12 hover:text-gray-12 inline-block pb-2 pt-3 transition-colors md:py-3 md:pl-6 md:pr-4"
>
Discord
</a>
Expand All @@ -112,15 +112,15 @@ export const Navbar = () => {
<li>
<a
href={constants.github}
className="text-gray-11 dark:text-graydark-11 hover:text-gray-12 dark:hover:text-graydark-12 flex items-center px-2 transition-colors"
className="text-gray-11 dark:text-graydark-11 dark:hover:text-graydark-12 hover:text-gray-12 flex items-center px-2 transition-colors"
>
<Github size={20} />
</a>
</li>
<li>
<a
href={constants.twitter}
className="text-gray-11 dark:text-graydark-11 hover:text-gray-12 dark:hover:text-graydark-12 flex items-center px-2 transition-colors"
className="text-gray-11 dark:text-graydark-11 dark:hover:text-graydark-12 hover:text-gray-12 flex items-center px-2 transition-colors"
>
<Twitter size={20} />
</a>
Expand All @@ -132,7 +132,9 @@ export const Navbar = () => {
className="flex items-center px-2"
aria-expanded={height !== 0}
aria-controls="example-panel"
onClick={() => setHeight(height === 0 ? 'auto' : 0)}
onClick={() => {
setHeight(height === 0 ? 'auto' : 0);
}}
>
<span className="sr-only">Open Menu</span>
<Menu size={20} />
Expand Down
24 changes: 14 additions & 10 deletions apps/web/src/pages/waitlist.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,23 @@ const WaitList: NextPage = () => {
placeholder="Your name..."
icon={<User />}
value={name}
onChange={(e) => setName(e.target.value)}
onChange={(e) => {
setName(e.target.value);
}}
/>
<Input
type="email"
placeholder="Email address..."
icon={<Mail />}
value={email}
onChange={(e) => setEmail(e.target.value)}
onChange={(e) => {
setEmail(e.target.value);
}}
/>
<Select
onValueChange={(e: 'STUDENT' | 'PROJECT' | 'BOTH') =>
setReason(e)
}
onValueChange={(e: 'STUDENT' | 'PROJECT' | 'BOTH') => {
setReason(e);
}}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Why are you interested in Noodle?" />
Expand All @@ -108,7 +112,7 @@ const WaitList: NextPage = () => {
<button
type="submit"
disabled={formDisabled}
className="bg-primary-500 hover:bg-primary-700 text-gray-12 disabled:bg-gray-4 dark:disabled:bg-graydark-4 disabled:text-gray-8 dark:disabled:text-graydark-8 disabled:border-gray-6 dark:disabled:border-graydark-6 flex w-full items-center justify-center gap-4 rounded-md px-6 py-3 font-semibold transition-colors disabled:border"
className="bg-primary-500 text-gray-12 dark:disabled:bg-graydark-4 dark:disabled:text-graydark-8 dark:disabled:border-graydark-6 hover:bg-primary-700 disabled:bg-gray-4 disabled:text-gray-8 disabled:border-gray-6 flex w-full items-center justify-center gap-4 rounded-md px-6 py-3 font-semibold transition-colors disabled:border"
>
{isLoading ? (
<Loader2 />
Expand All @@ -124,9 +128,9 @@ const WaitList: NextPage = () => {
height={isSuccess ? 'auto' : 0}
className={cn(isSuccess && 'w-full')}
>
<div className="bg-teal-2 dark:bg-tealdark-2/50 border-teal-2 dark:border-tealdark-2 flex w-full items-center gap-6 rounded-lg border px-4 py-4">
<div className="bg-teal-2 border-teal-2 dark:bg-tealdark-2/50 dark:border-tealdark-2 flex w-full items-center gap-6 rounded-lg border px-4 py-4">
<div className="flex h-full items-start">
<div className="bg-teal-1 dark:bg-tealdark-1 border-teal-11 dark:border-tealdark-11 rounded-full border p-[4px]">
<div className="bg-teal-1 border-teal-11 dark:bg-tealdark-1 dark:border-tealdark-11 rounded-full border p-[4px]">
<Check className="text-teal-10 h-4 w-4" />
</div>
</div>
Expand All @@ -153,9 +157,9 @@ const WaitList: NextPage = () => {
height={error ? 'auto' : 0}
className={cn(error && 'w-full')}
>
<div className="bg-red-1 dark:bg-reddark-2/50 border-red-2 dark:border-reddark-2 flex w-full items-center gap-6 rounded-lg border px-4 py-4">
<div className="bg-red-1 border-red-2 dark:bg-reddark-2/50 dark:border-reddark-2 flex w-full items-center gap-6 rounded-lg border px-4 py-4">
<div className="flex h-full items-start">
<div className="bg-red-1 dark:bg-reddark-1 border-red-11 dark:border-reddark-11 rounded-full border p-[4px]">
<div className="bg-red-1 border-red-11 dark:bg-reddark-1 dark:border-reddark-11 rounded-full border p-[4px]">
<Check className="text-red-10 h-4 w-4" />
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"npmScope": "noodle",
"defaultBase": "main",
"defaultProject": "web",
"tasksRunnerOptions": {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"eslint-config-noodle": "workspace:^",
"husky": "^8.0.3",
"lint-staged": "^13.2.3",
"nx": "16.3.2",
"nx": "16.5.1",
"nx-cloud": "16.0.5",
"prettier": "^2.8.8",
"prettier-plugin-jsdoc": "^0.4.2",
"prettier-plugin-packagejson": "^2.4.4",
"prettier-plugin-tailwindcss": "^0.3.0",
"prettier-plugin-packagejson": "^2.4.5",
"prettier-plugin-tailwindcss": "^0.4.0",
"typescript": "^5.1.6"
},
"packageManager": "[email protected]",
Expand All @@ -58,7 +58,7 @@
},
"pnpm": {
"patchedDependencies": {
"@types/[email protected].7": "patches/@[email protected].7.patch"
"@types/[email protected].8": "patches/@[email protected].8.patch"
}
},
"prisma": {
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@noodle/vitest": "workspace:^",
"@vitest/coverage-v8": "^0.33.0",
"eslint-config-noodle": "workspace:^",
"vite": "^4.4.2",
"vite": "^4.4.3",
"vitest": "^0.33.0",
"vitest-mock-extended": "^1.1.4"
}
Expand Down
8 changes: 5 additions & 3 deletions packages/config/eslint/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ const config = {
},
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'plugin:@typescript-eslint/strict',
'plugin:@typescript-eslint/strict-type-checked',
'plugin:@typescript-eslint/stylistic-type-checked',
'plugin:eslint-comments/recommended',
'prettier',
],
parserOptions: {
project: true,
},
overrides: [
{
files: ['**/*.cjs'],
Expand Down
4 changes: 2 additions & 2 deletions packages/config/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"devDependencies": {
"@next/eslint-plugin-next": "^13.4.9",
"@noodle/tsconfig": "workspace:^",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-jest-dom": "^5.0.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/config/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
},
"dependencies": {
"@storybook/addon-styling": "^1.3.2",
"@storybook/react": "^7.0.26",
"@storybook/react-vite": "^7.0.26",
"@storybook/types": "^7.0.26"
"@storybook/react": "^7.0.27",
"@storybook/react-vite": "^7.0.27",
"@storybook/types": "^7.0.27"
},
"devDependencies": {
"@noodle/tsconfig": "workspace:^",
"@storybook/addon-viewport": "^7.0.26"
"@storybook/addon-viewport": "^7.0.27"
},
"volta": {
"extends": "../../../package.json"
Expand Down
4 changes: 2 additions & 2 deletions packages/config/vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
},
"devDependencies": {
"@noodle/tsconfig": "workspace:^",
"@vitejs/plugin-react": "^4.0.2",
"@vitejs/plugin-react": "^4.0.3",
"@vitest/coverage-v8": "^0.33.0",
"@vitest/ui": "^0.33.0",
"happy-dom": "^10.0.3",
"happy-dom": "^10.1.1",
"vite-tsconfig-paths": "^4.2.0",
"vitest": "^0.33.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@prisma/client": "^4.16.2"
"@prisma/client": "^5.0.0"
},
"devDependencies": {
"@noodle/tsconfig": "workspace:^",
"eslint-config-noodle": "workspace:^",
"prisma": "^4.16.2"
"prisma": "^5.0.0"
},
"volta": {
"extends": "../../package.json"
Expand Down
19 changes: 10 additions & 9 deletions packages/db/prisma/schema.prisma
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
generator client {
provider = "prisma-client-js"
previewFeatures = ["jsonProtocol"]
provider = "prisma-client-js"
}

datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
provider = "postgresql"
url = env("DATABASE_URL")
directUrl = env("DIRECT_URL")
}

Expand All @@ -23,6 +22,7 @@ model Account {
id_token String? @db.Text
session_state String?
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
@@unique([provider, providerAccountId])
}

Expand All @@ -48,20 +48,21 @@ model VerificationToken {
identifier String
token String @unique
expires DateTime
@@unique([identifier, token])
}

model WaitingList {
id String @id @default(cuid())
id String @id @default(cuid())
name String
email String @unique
email String @unique
reason WaitingListReason
approved Boolean @default(false)
createdAt DateTime @default(now())
approved Boolean @default(false)
createdAt DateTime @default(now())
}

enum WaitingListReason {
STUDENT
PROJECT
BOTH
}
}
18 changes: 9 additions & 9 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
"@noodle/storybook-config": "workspace:^",
"@noodle/tailwind": "workspace:^",
"@noodle/tsconfig": "workspace:^",
"@storybook/addon-a11y": "^7.0.26",
"@storybook/addon-essentials": "^7.0.26",
"@storybook/addon-interactions": "^7.0.26",
"@storybook/addon-links": "^7.0.26",
"@storybook/addon-a11y": "^7.0.27",
"@storybook/addon-essentials": "^7.0.27",
"@storybook/addon-interactions": "^7.0.27",
"@storybook/addon-links": "^7.0.27",
"@storybook/addon-styling": "^1.3.2",
"@storybook/blocks": "^7.0.26",
"@storybook/react": "^7.0.26",
"@storybook/react-vite": "^7.0.26",
"@storybook/blocks": "^7.0.27",
"@storybook/react": "^7.0.27",
"@storybook/react-vite": "^7.0.27",
"@storybook/testing-library": "^0.2.0",
"autoprefixer": "^10.4.14",
"postcss": "^8.4.25",
"storybook": "^7.0.26",
"storybook": "^7.0.27",
"storybook-addon-pseudo-states": "^2.1.0",
"tailwindcss": "^3.3.2",
"vite": "^4.4.2"
"vite": "^4.4.3"
},
"volta": {
"extends": "../../package.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@testing-library/jest-dom": "^5.16.5",
"@types/react": "18.2.14",
"@types/react-dom": "18.2.6",
"@types/testing-library__jest-dom": "^5.14.7",
"@types/testing-library__jest-dom": "^5.14.8",
"eslint-config-noodle": "workspace:^",
"msw": "^1.2.2",
"msw-trpc": "^1.3.3"
Expand Down
Loading

0 comments on commit a228813

Please sign in to comment.