From 0420a5b232321c22d9b915a95072ef62d9f4a27c Mon Sep 17 00:00:00 2001 From: Atridad Lahiji Date: Sun, 20 Aug 2023 22:39:24 -0600 Subject: [PATCH] Deps and log downloads --- package.json | 4 ++-- pnpm-lock.yaml | 52 ++++++++++++++++++++--------------------- src/pages/room/[id].tsx | 14 ++++++----- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index fcf6253..01c415d 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,12 @@ "@neondatabase/serverless": "^0.6.0", "@paralleldrive/cuid2": "^2.2.2", "@react-email/components": "^0.0.7", - "@tanstack/react-query": "^4.32.6", + "@tanstack/react-query": "^4.33.0", "@trpc/client": "10.37.1", "@trpc/next": "10.37.1", "@trpc/react-query": "10.37.1", "@trpc/server": "10.37.1", - "@unkey/api": "^0.6.9", + "@unkey/api": "^0.6.11", "@upstash/ratelimit": "^0.4.3", "@upstash/redis": "^1.22.0", "ably": "^1.2.43", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 373c752..df184ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,23 +21,23 @@ dependencies: specifier: ^0.0.7 version: 0.0.7 '@tanstack/react-query': - specifier: ^4.32.6 - version: 4.32.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^4.33.0 + version: 4.33.0(react-dom@18.2.0)(react@18.2.0) '@trpc/client': specifier: 10.37.1 version: 10.37.1(@trpc/server@10.37.1) '@trpc/next': specifier: 10.37.1 - version: 10.37.1(@tanstack/react-query@4.32.6)(@trpc/client@10.37.1)(@trpc/react-query@10.37.1)(@trpc/server@10.37.1)(next@13.4.19)(react-dom@18.2.0)(react@18.2.0) + version: 10.37.1(@tanstack/react-query@4.33.0)(@trpc/client@10.37.1)(@trpc/react-query@10.37.1)(@trpc/server@10.37.1)(next@13.4.19)(react-dom@18.2.0)(react@18.2.0) '@trpc/react-query': specifier: 10.37.1 - version: 10.37.1(@tanstack/react-query@4.32.6)(@trpc/client@10.37.1)(@trpc/server@10.37.1)(react-dom@18.2.0)(react@18.2.0) + version: 10.37.1(@tanstack/react-query@4.33.0)(@trpc/client@10.37.1)(@trpc/server@10.37.1)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': specifier: 10.37.1 version: 10.37.1 '@unkey/api': - specifier: ^0.6.9 - version: 0.6.9 + specifier: ^0.6.11 + version: 0.6.11 '@upstash/ratelimit': specifier: ^0.4.3 version: 0.4.3 @@ -1488,12 +1488,12 @@ packages: defer-to-connect: 2.0.1 dev: false - /@tanstack/query-core@4.32.6: - resolution: {integrity: sha512-YVB+mVWENQwPyv+40qO7flMgKZ0uI41Ph7qXC2Zf1ft5AIGfnXnMZyifB2ghhZ27u+5wm5mlzO4Y6lwwadzxCA==} + /@tanstack/query-core@4.33.0: + resolution: {integrity: sha512-qYu73ptvnzRh6se2nyBIDHGBQvPY1XXl3yR769B7B6mIDD7s+EZhdlWHQ67JI6UOTFRaI7wupnTnwJ3gE0Mr/g==} dev: false - /@tanstack/react-query@4.32.6(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-AITu/IKJJJXsHHeXNBy5bclu12t08usMCY0vFC2dh9SP/w6JAk5U9GwfjOIPj3p+ATADZvxQPe8UiCtMLNeQbg==} + /@tanstack/react-query@4.33.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-97nGbmDK0/m0B86BdiXzx3EW9RcDYKpnyL2+WwyuLHEgpfThYAnXFaMMmnTDuAO4bQJXEhflumIEUfKmP7ESGA==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -1504,7 +1504,7 @@ packages: react-native: optional: true dependencies: - '@tanstack/query-core': 4.32.6 + '@tanstack/query-core': 4.33.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) use-sync-external-store: 1.2.0(react@18.2.0) @@ -1518,7 +1518,7 @@ packages: '@trpc/server': 10.37.1 dev: false - /@trpc/next@10.37.1(@tanstack/react-query@4.32.6)(@trpc/client@10.37.1)(@trpc/react-query@10.37.1)(@trpc/server@10.37.1)(next@13.4.19)(react-dom@18.2.0)(react@18.2.0): + /@trpc/next@10.37.1(@tanstack/react-query@4.33.0)(@trpc/client@10.37.1)(@trpc/react-query@10.37.1)(@trpc/server@10.37.1)(next@13.4.19)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-0KEgr09mBfao56lkj7ZBfVOY86d3+bDH1o0zJkDHSH60Dp/hIJ7wLCnZJIhePlZxEwknCQjVeLsTy4Pqlu8NyQ==} peerDependencies: '@tanstack/react-query': ^4.18.0 @@ -1529,9 +1529,9 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@tanstack/react-query': 4.32.6(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 4.33.0(react-dom@18.2.0)(react@18.2.0) '@trpc/client': 10.37.1(@trpc/server@10.37.1) - '@trpc/react-query': 10.37.1(@tanstack/react-query@4.32.6)(@trpc/client@10.37.1)(@trpc/server@10.37.1)(react-dom@18.2.0)(react@18.2.0) + '@trpc/react-query': 10.37.1(@tanstack/react-query@4.33.0)(@trpc/client@10.37.1)(@trpc/server@10.37.1)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': 10.37.1 next: 13.4.19(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -1539,7 +1539,7 @@ packages: react-ssr-prepass: 1.5.0(react@18.2.0) dev: false - /@trpc/react-query@10.37.1(@tanstack/react-query@4.32.6)(@trpc/client@10.37.1)(@trpc/server@10.37.1)(react-dom@18.2.0)(react@18.2.0): + /@trpc/react-query@10.37.1(@tanstack/react-query@4.33.0)(@trpc/client@10.37.1)(@trpc/server@10.37.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-TbOOPp0fZVaKfaeEyDoV8QeTHW1vgPTbfOs0uSQ4AzBXqXPu+9v1B44z8GGRJSdUxuOX9pG/6Ap5Kx8PQ3eF+Q==} peerDependencies: '@tanstack/react-query': ^4.18.0 @@ -1548,7 +1548,7 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@tanstack/react-query': 4.32.6(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 4.33.0(react-dom@18.2.0)(react@18.2.0) '@trpc/client': 10.37.1(@trpc/server@10.37.1) '@trpc/server': 10.37.1 react: 18.2.0 @@ -1869,8 +1869,8 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@unkey/api@0.6.9: - resolution: {integrity: sha512-MdTvj89tL9o0qXdtv8Vs9LcoEhh0dEWfOHoGHelLKu1N1Dt1rPaiRMR5vat9LYJUZuFjeYAXHYATxFvmU+fJBQ==} + /@unkey/api@0.6.11: + resolution: {integrity: sha512-KmltppyG6WIZttav5hQav8XCZ+6hHufvofZWAbrfJv+EO68vRSGajTfxDEKi2KQi6QT39jRdcC91ZIF5+gno0w==} dev: false /@upstash/core-analytics@0.0.6: @@ -2113,8 +2113,8 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.10 - caniuse-lite: 1.0.30001521 - fraction.js: 4.2.0 + caniuse-lite: 1.0.30001522 + fraction.js: 4.2.1 normalize-range: 0.1.2 picocolors: 1.0.0 postcss: 8.4.28 @@ -2214,7 +2214,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001521 + caniuse-lite: 1.0.30001522 electron-to-chromium: 1.4.496 node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.10) @@ -2305,8 +2305,8 @@ packages: engines: {node: '>=14.16'} dev: true - /caniuse-lite@1.0.30001521: - resolution: {integrity: sha512-fnx1grfpEOvDGH+V17eccmNjucGUnCbP6KL+l5KqBIerp26WK/+RQ7CIDE37KGJjaPyqWXXlFUyKiWmvdNNKmQ==} + /caniuse-lite@1.0.30001522: + resolution: {integrity: sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==} dev: false /chainsaw@0.1.0: @@ -3545,8 +3545,8 @@ packages: mime-types: 2.1.35 dev: false - /fraction.js@4.2.0: - resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==} + /fraction.js@4.2.1: + resolution: {integrity: sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q==} dev: false /fs-constants@1.0.0: @@ -4550,7 +4550,7 @@ packages: '@next/env': 13.4.19 '@swc/helpers': 0.5.1 busboy: 1.6.0 - caniuse-lite: 1.0.30001521 + caniuse-lite: 1.0.30001522 postcss: 8.4.14 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) diff --git a/src/pages/room/[id].tsx b/src/pages/room/[id].tsx index b88cacc..c40baf7 100644 --- a/src/pages/room/[id].tsx +++ b/src/pages/room/[id].tsx @@ -156,11 +156,14 @@ const RoomBody = ({}) => { const jsonObject = roomFromDb?.logs .map((item) => { return { - ...item, - scale: item.scale, - votes: item.votes, + id: item.id, + created_at: item.created_at, + userId: item.userId, + roomId: item.roomId, roomName: item.roomName, storyName: item.storyName, + scale: item.scale, + votes: item.votes, }; }) .concat({ @@ -168,15 +171,14 @@ const RoomBody = ({}) => { created_at: new Date(), userId: roomFromDb.userId, roomId: roomFromDb.id, + roomName: roomFromDb.roomName, + storyName: storyNameText, scale: roomScale, votes: votesFromDb.map((vote) => { return { value: vote.value, }; }), - room: roomFromDb, - roomName: roomFromDb.roomName, - storyName: storyNameText, }); downloadCSV(jsonObject, `sprint-padawan-room-${roomId}.csv`);