Skip to content

Commit 48a80ce

Browse files
committed
fix: resolved merge conflicts for report component branch
2 parents 2e12c3c + d3c5089 commit 48a80ce

File tree

9 files changed

+1729
-888
lines changed

9 files changed

+1729
-888
lines changed

server/.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ AUDIENCE=http://localhost:3000
1818

1919

2020
NEXT_PUBLIC_BASE_URL=http://localhost:3000
21+
REDIS_HOST=localhost
22+
REDIS_PORT=6379
2123
# get the email pass key from https://myaccount.google.com/apppasswords
2224
EMAIL_USER= "sample@gmail.com"
2325
EMAIL_PASS= "aaaa bbbb cccc dddd"

server/src/app/admin/projects/page.tsx

Lines changed: 226 additions & 84 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)