atridad/pollo
1
0
Fork 0
Code Activity Actions

Merge pull request #14 from atridadl/dev

Browse source 
1.1.6
🐛 Fixed a UI bug where the nav menu would go under page items if the screen is small enough
🚧 Switched to @auth/prisma-adapter
🚧 Deps!
This commit is contained in:
Atridad Lahiji 2023-06-12 19:26:56 -06:00 • committed by GitHub
commit c89a67dec9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 848 additions and 907 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "sprintpadawan", "name": "sprintpadawan",
"version": "1.1.5", "version": "1.1.6",
"description": "Plan. Sprint. Repeat.", "description": "Plan. Sprint. Repeat.",
"private": true, "private": true,
"scripts": { "scripts": {
@ -14,17 +14,17 @@
}, },
"dependencies": { "dependencies": {
"@ably-labs/react-hooks": "^2.1.1", "@ably-labs/react-hooks": "^2.1.1",
"@next-auth/prisma-adapter": "^1.0.7", "@auth/prisma-adapter": "^1.0.0",
"@prisma/client": "4.15.0", "@prisma/client": "4.15.0",
"@tanstack/react-query": "^4.29.12", "@tanstack/react-query": "^4.29.12",
"@trpc/client": "10.29.1", "@trpc/client": "10.30.0",
"@trpc/next": "10.29.1", "@trpc/next": "10.30.0",
"@trpc/react-query": "10.29.1", "@trpc/react-query": "10.30.0",
"@trpc/server": "10.29.1", "@trpc/server": "10.30.0",
"ably": "^1.2.40", "ably": "^1.2.40",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
"json2csv": "6.0.0-alpha.2", "json2csv": "6.0.0-alpha.2",
"next": "^13.4.4", "next": "^13.4.5",
"next-auth": "^4.22.1", "next-auth": "^4.22.1",
"postcss": "^8.4.24", "postcss": "^8.4.24",
"preact": "^10.15.1", "preact": "^10.15.1",
@ -38,17 +38,17 @@
"zod": "^3.21.4" "zod": "^3.21.4"
}, },
"devDependencies": { "devDependencies": {
"@types/eslint": "^8.40.0", "@types/eslint": "^8.40.1",
"@types/json2csv": "^5.0.3", "@types/json2csv": "^5.0.3",
"@types/next-pwa": "^5.6.4", "@types/next-pwa": "^5.6.4",
"@types/node": "^20.2.5", "@types/node": "^20.3.0",
"@types/react": "^18.2.9", "@types/react": "^18.2.12",
"@types/react-dom": "^18.2.4", "@types/react-dom": "^18.2.5",
"@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.59.9", "@typescript-eslint/parser": "^5.59.11",
"daisyui": "^3.0.20", "daisyui": "^3.1.0",
"eslint": "^8.42.0", "eslint": "^8.42.0",
"eslint-config-next": "^13.4.4", "eslint-config-next": "^13.4.5",
"next-pwa": "^5.6.0", "next-pwa": "^5.6.0",
"prisma": "4.15.0", "prisma": "4.15.0",
"tailwindcss": "^3.3.2", "tailwindcss": "^3.3.2",

1720
pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff

2
src/components/Navbar.tsx
View file

@ -68,7 +68,7 @@ const Navbar: React.FC<NavbarProps> = ({ title }) => {
</label> </label>
<ul <ul
tabIndex={0} tabIndex={0}
className="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 rounded-box w-52" className="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 rounded-box z-50"
> >
<li> <li>
<Link <Link

3
src/server/auth.ts
View file

@ -6,7 +6,7 @@ import {
} from "next-auth"; } from "next-auth";
import GithubProvider from "next-auth/providers/github"; import GithubProvider from "next-auth/providers/github";
import GoogleProvider from "next-auth/providers/google"; import GoogleProvider from "next-auth/providers/google";
import { PrismaAdapter } from "@next-auth/prisma-adapter"; import { PrismaAdapter } from "@auth/prisma-adapter";
import { env } from "~/env.mjs"; import { env } from "~/env.mjs";
import { prisma } from "~/server/db"; import { prisma } from "~/server/db";
import type { Role } from "~/utils/types"; import type { Role } from "~/utils/types";
@ -73,6 +73,7 @@ export const authOptions: NextAuthOptions = {
await deleteFromCache(client, env.APP_ENV, `kv_userlist_admin`); await deleteFromCache(client, env.APP_ENV, `kv_userlist_admin`);
}, },
}, },
// @ts-ignore This adapter should work...
adapter: PrismaAdapter(prisma), adapter: PrismaAdapter(prisma),
providers: [ providers: [
GithubProvider({ GithubProvider({