Skip to content

Commit

Permalink
Merge pull request #53 from dnd-side-project/staging
Browse files Browse the repository at this point in the history
feat : staging => main
  • Loading branch information
jiji-hoon96 committed Aug 21, 2024
2 parents 7af98fe + 89100e8 commit f0d3652
Show file tree
Hide file tree
Showing 99 changed files with 3,487 additions and 856 deletions.
7 changes: 6 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@
}
]
},
"ignorePatterns": ["public/**/*.js", "jest.config.js", "jest.setup.js"],
"ignorePatterns": [
"public/**/*.js",
"jest.config.js",
"jest.setup.js",
"scripts/dev.js"
],
"overrides": [
{
"files": ["*.stories.tsx", "*.stories.jsx"],
Expand Down
3 changes: 3 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ const config: StorybookConfig = {
options: {},
},
staticDirs: ['../public'],
docs: {
autodocs: true,
},
}
export default config
4 changes: 4 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ const preview: Preview = {
date: /Date$/i,
},
},
backgrounds: {
default: 'dark-gray',
values: [{ name: 'dark-gray', value: '#444444' }],
},
},
}

Expand Down
46 changes: 42 additions & 4 deletions next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,45 @@
import withPWA from 'next-pwa'

export default withPWA({
const nextConfig = {
reactStrictMode: true,
images: {
remotePatterns: [
{
protocol: 'https',
hostname: process.env.NEXT_PUBLIC_IMAGE_BASE_URL.replace(
/^https?:\/\//,
'',
),
port: '',
},
],
},
async rewrites() {
return [
{
source: '/api/v1/:path*',
destination: `${process.env.NEXT_PUBLIC_API_BASE_URL}/:path*`,
},
]
},
async headers() {
if (process.env.NODE_ENV === 'development') {
return [
{
source: '/:path*',
headers: [
{ key: 'Cache-Control', value: 'no-store, must-revalidate' },
],
},
]
}
return []
},
}

const pwaConfig = {
dest: 'public',
disable: false,
// reactStrictMode: true,
})
disable: process.env.NODE_ENV === 'development',
}

export default withPWA(pwaConfig)(nextConfig)
12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"dev": "node server.mjs",
"dev:https": "USE_HTTPS=true node server.mjs",
"build": "next build",
"start": "next start",
"start": "NODE_ENV=production node server.mjs",
"start:https": "NODE_ENV=production USE_HTTPS=true node server.mjs",
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"format": "prettier --check --ignore-path .gitignore .",
Expand All @@ -18,9 +20,13 @@
"dependencies": {
"@hookform/resolvers": "^3.9.0",
"@storybook/addon-styling-webpack": "^1.0.0",
"@tanstack/react-query": "^5.51.23",
"@testing-library/react": "^16.0.0",
"axios": "^1.7.4",
"dayjs": "^1.11.12",
"next": "14.2.4",
"next-pwa": "^5.6.0",
"qrcode": "^1.5.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.52.1",
Expand All @@ -40,6 +46,8 @@
"@testing-library/jest-dom": "^6.4.6",
"@types/jest": "^29.5.12",
"@types/node": "^20.14.10",
"@types/qrcode": "^1.5.5",
"@types/node": "22.4.1",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"autoprefixer": "^10.4.19",
Expand Down
31 changes: 31 additions & 0 deletions public/icons/CrownSvg.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react'

interface CrownSvgProps {
isLeader: boolean
}

function CrownSvg({ isLeader }: CrownSvgProps) {
const fillColor = isLeader ? 'white' : '#AAAFB3'

return (
<svg
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className="mr-1 inline-block"
>
<path
d="M12.75 16.5H5.25C4.9425 16.5 4.6875 16.245 4.6875 15.9375C4.6875 15.63 4.9425 15.375 5.25 15.375H12.75C13.0575 15.375 13.3125 15.63 13.3125 15.9375C13.3125 16.245 13.0575 16.5 12.75 16.5Z"
fill={fillColor}
/>
<path
d="M15.2622 4.14027L12.2622 6.28527C11.8647 6.57027 11.2947 6.39777 11.1222 5.94027L9.70468 2.16027C9.46468 1.50777 8.54218 1.50777 8.30218 2.16027L6.87718 5.93277C6.70468 6.39777 6.14218 6.57027 5.74468 6.27777L2.74468 4.13277C2.14468 3.71277 1.34968 4.30527 1.59718 5.00277L4.71718 13.7403C4.82218 14.0403 5.10718 14.2353 5.42218 14.2353H12.5697C12.8847 14.2353 13.1697 14.0328 13.2747 13.7403L16.3947 5.00277C16.6497 4.30527 15.8547 3.71277 15.2622 4.14027ZM10.8747 11.0628H7.12468C6.81718 11.0628 6.56218 10.8078 6.56218 10.5003C6.56218 10.1928 6.81718 9.93777 7.12468 9.93777H10.8747C11.1822 9.93777 11.4372 10.1928 11.4372 10.5003C11.4372 10.8078 11.1822 11.0628 10.8747 11.0628Z"
fill={fillColor}
/>
</svg>
)
}

export default CrownSvg
3 changes: 3 additions & 0 deletions public/icons/alert.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/back.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/camera.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/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions public/icons/createLoading.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/delete.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/double-down.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/down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 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.
3 changes: 3 additions & 0 deletions public/icons/home.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/info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/lock-slash.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/logo-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/magic-wand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/meatballs.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/photo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/plus.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 f0d3652

Please sign in to comment.