Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
junseublim committed Aug 28, 2024
2 parents ca29a74 + c33072e commit 52a806a
Show file tree
Hide file tree
Showing 28 changed files with 606 additions and 229 deletions.
1 change: 1 addition & 0 deletions .env.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
declare namespace NodeJS {
interface ProcessEnv {
API_HOST: string
NEXT_PUBLIC_KAKAO_API_KEY: string
}
}
44 changes: 35 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"next-auth": "^5.0.0-beta.20",
"prettier-plugin-tailwindcss": "^0.6.5",
"react": "^18",
"react-device-detect": "^2.2.3",
"react-dom": "^18",
"tailwind-merge": "^2.3.0",
"tailwind-scrollbar-hide": "^1.1.7"
Expand Down
8 changes: 8 additions & 0 deletions public/icons/download.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions public/icons/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/sketchIcons-paperclip.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/sns/sns-facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/icons/sns/sns-ig-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/sns/sns-ig.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 52a806a

Please sign in to comment.