From 2c8b080f76e906010960df5a2e305db1b93fdf91 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 02:49:37 +0900 Subject: [PATCH 1/9] =?UTF-8?q?Chore:=20CI/CD=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=B9=8C=EB=93=9C=20npm=EC=97=90?= =?UTF-8?q?=EC=84=9C=20yarn=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7c8555..e1ae220 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,12 +14,12 @@ jobs: node-version: '18' - uses: actions/cache@v2 with: - path: ~/.npm + path: ~/.yarn key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-node- - - run: npm install - - run: npm run lint + - run: yarn install + - run: yarn lint build: name: Build @@ -33,9 +33,9 @@ jobs: node-version: '18' - uses: actions/cache@v2 with: - path: ~/.npm + path: ~/.yarn key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-node- - - run: npm install - - run: CI='false' npm run build + - run: yarn install + - run: CI='false' yarn build From 4cbf5546960c05635f318a6d0a9f64a5fdd0e0dc Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 03:31:37 +0900 Subject: [PATCH 2/9] =?UTF-8?q?Fix:=20ci=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1ae220..9351229 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/cache@v2 with: path: ~/.yarn - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.json') }} restore-keys: | ${{ runner.os }}-node- - run: yarn install @@ -34,7 +34,7 @@ jobs: - uses: actions/cache@v2 with: path: ~/.yarn - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.json') }} restore-keys: | ${{ runner.os }}-node- - run: yarn install From ae81f2fde34cfce1e20e332c28bab8acce54400e Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 03:56:08 +0900 Subject: [PATCH 3/9] =?UTF-8?q?Fix=20:=20ci=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9351229..f0f41a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/cache@v2 with: path: ~/.yarn - key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.json') }} + key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} restore-keys: | ${{ runner.os }}-node- - run: yarn install @@ -34,7 +34,7 @@ jobs: - uses: actions/cache@v2 with: path: ~/.yarn - key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.json') }} + key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} restore-keys: | ${{ runner.os }}-node- - run: yarn install From 0088ef4478bed758d734b241e0fc19b7f60903c2 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 04:05:41 +0900 Subject: [PATCH 4/9] =?UTF-8?q?Test:=20ci/build=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=A7=84=ED=96=89=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 221fcde..b2754f5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "next dev", "sitemap": "node sitemap.js", - "build": "yarn sitemap && next build", + "build": "yarn sitemap && next build && next export", "start": "next start", "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"", "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"" From e38df98b690eb605fcc9205b24727597540b1e6e Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 04:18:00 +0900 Subject: [PATCH 5/9] =?UTF-8?q?Test:=20CI=20build=20error=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0f41a7..2d3c706 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,8 @@ jobs: build: name: Build + env: + NEXT_PUBLIC_API_KEY: ${{ secrets.FIREBASE_API_KEY }} runs-on: ubuntu-latest needs: lint From db393b752b22814fd32d51133099f1a6d8042e45 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 12:56:53 +0900 Subject: [PATCH 6/9] =?UTF-8?q?Test:=20CI=20build=20=EC=8B=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d3c706..090dda4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,16 @@ jobs: build: name: Build env: - NEXT_PUBLIC_API_KEY: ${{ secrets.FIREBASE_API_KEY }} + NEXT_PUBLIC_API_KEY: '${{ secrets.NEXT_PUBLIC_API_KEY }}' + NEXT_PUBLIC_AUTH_DOMAIN: '${{ secrets.NEXT_PUBLIC_AUTH_DOMAIN }}' + NEXT_PUBLIC_PROJECT_ID: '${{ secrets.NEXT_PUBLIC_PROJECT_ID }}' + NEXT_PUBLIC_STORAGE_BUCKET: '${{ secrets.NEXT_PUBLIC_STORAGE_BUCKET }}' + NEXT_PUBLIC_MESSAGIN_SENDER_ID: '${{ secrets.NEXT_PUBLIC_MESSAGIN_SENDER_ID }}' + NEXT_PUBLIC_APP_ID: '${{ secrets.NEXT_PUBLIC_APP_ID }}' + NEXT_PUBLIC_MEASUREMENT_ID: '${{ secrets.NEXT_PUBLIC_MEASUREMENT_ID }}' + NEXT_PUBLIC_ADMIN_UID_1: '${{ secrets.NEXT_PUBLIC_ADMIN_UID_1 }}' + NEXT_PUBLIC_ADMIN_UID_2: '${{ secrets.NEXT_PUBLIC_ADMIN_UID_2 }}' + NEXT_PUBLIC_ADMIN_UID_3: '${{ secrets.NEXT_PUBLIC_ADMIN_UID_3 }}' runs-on: ubuntu-latest needs: lint From 1ab678cfc5d232425f73424a6edc3219e5ee45af Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 13:05:14 +0900 Subject: [PATCH 7/9] =?UTF-8?q?Fix:=20CI=20build=20=EC=8B=9C=20next=20expo?= =?UTF-8?q?rt=20=EC=82=AD=EC=A0=9C=20=ED=9B=84=20=20config=EC=97=90?= =?UTF-8?q?=EC=84=9C=20export=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.mjs | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/next.config.mjs b/next.config.mjs index 67e6851..40d9d47 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -25,6 +25,7 @@ const nextConfig = { }, ], }, + output: 'export', }; export default withPWA(nextConfig); diff --git a/package.json b/package.json index b2754f5..221fcde 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "next dev", "sitemap": "node sitemap.js", - "build": "yarn sitemap && next build && next export", + "build": "yarn sitemap && next build", "start": "next start", "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"", "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"" From 658f9a10c858717da0cd15137168381a8d94ba21 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Fri, 3 May 2024 13:10:04 +0900 Subject: [PATCH 8/9] =?UTF-8?q?Test:=20output=20export=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/next.config.mjs b/next.config.mjs index 40d9d47..67e6851 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -25,7 +25,6 @@ const nextConfig = { }, ], }, - output: 'export', }; export default withPWA(nextConfig); From 80d8ca2046532435252bc66ba3a88b10f2744fcf Mon Sep 17 00:00:00 2001 From: Dongmin <122417731+cdm1263@users.noreply.github.com> Date: Fri, 10 May 2024 09:50:43 +0900 Subject: [PATCH 9/9] Update README.md --- README.md | 89 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index c403366..be7dac4 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,77 @@ -This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). +# Pokehub (포켓허브) -## Getting Started +> 나만의 포켓몬 카드를 만들 수 있는 포켓몬 도감 커뮤니티!
+> 개발기간: 2023.11 ~ 2024.02 (1.0 ver)
+ +
-First, run the development server: +## 개발 팀원 소개 -```bash -npm run dev -# or -yarn dev -# or -pnpm dev -# or -bun dev -``` - -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. +|차동민|남기훈|박철민| +|:---------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------:| +| **[차동민](https://github.com/ChoEun-Sang)** | **[남기훈](https://github.com/BearHumanS)** | **[박철민](https://github.com/DICEPT)** | +|메인 도감 페이지
카드 제작 페이지
포켓몬 카드 제작| 도감 상세 페이지
마이 페이지
SEO 최적화| 커뮤니티 페이지
데스크탑, 모바일 UX/UI 디자인
로딩 애니메이션 UI 제작 | +
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. +## 사용 기술 -This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font. +**Development** -## Learn More +

+ + + + + + + +
+

-To learn more about Next.js, take a look at the following resources: +**Tools** -- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. +

+ + + + + + +

+
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! +## 프로젝트 소개 -## Deploy on Vercel +### 메인 페이지 +![pokehub1](https://github.com/side-project-pokehub/my-pokemon/assets/122417731/40c3bfe5-8692-400d-9003-c4b678c84d0c) +### 도감 (속성 선택 x) +![pokehub2](https://github.com/side-project-pokehub/my-pokemon/assets/122417731/8a871cd0-3c59-417e-be70-7a149a6e6a95) +### 도감 (속성 선택) +![pokehub3](https://github.com/side-project-pokehub/my-pokemon/assets/122417731/cac365ea-a20b-4341-bb9b-241ca176e6ff) +### 카드 제작 페이지 +![pokehub4](https://github.com/side-project-pokehub/my-pokemon/assets/122417731/a8086332-ac0b-4ccb-a534-1c2b2b68a039) +### 커뮤니티 페이지 +![pokehub5](https://github.com/side-project-pokehub/my-pokemon/assets/122417731/0a66d396-2078-4dac-92db-f3d353cc3ad0) +### 마이 페이지 +![pokehub6](https://github.com/side-project-pokehub/my-pokemon/assets/122417731/d6523b78-bff4-43a6-82e2-bbd6914ef129) -The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. +

+## 시작하기 -Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. +### clone project +```bash +$ git clone git@github.com:side-project-pokehub/my-pokemon.git +``` +### open project +```bash +$ cd my-pokemon +``` +### install +```bash +$ yarn install +``` +### start +```bash +$ yarn dev +``` +