From 263cbb0ffdea4e51617c8c630f465987a003714e Mon Sep 17 00:00:00 2001 From: Jihyun Lim <74870834+irenee-14@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:18:43 +0900 Subject: [PATCH 1/4] Uadate agenda README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7기 agenda 관련 README 업데이트 --- README.md | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 351fe8d0a..735e2870c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

프로젝트 소개

-42 서울 내에서 탁구 경기 매칭, 전적 서비스를 제공하는 프로젝트 입니다. +42 서울 내에서 탁구 경기 매칭, 전적 서비스, 행사 서비스 및 아우터 평가 매칭을 제공하는 프로젝트 입니다. 🔸 Kakao 계정으로 로그인한 유저는 **매칭/전적 서비스**를 이용할 수 없습니다! 🔸 @@ -137,6 +137,23 @@
+

7기

+ + + + + + + + + + + + + +
역할LEAD🌿🧸🦊
이름이시원 @siwolee임지현 @jihylim이정론 @jeongrol
+
+

주요 기능 소개

### 🔐 42 OAuth, Kakao OAuth api를 통해 로그인할 수 있습니다. @@ -149,6 +166,19 @@
+### 💡메인 페이지에서 행사, 티켓, 탁구, 아우터 매치 서비스로 이동할 수 있습니다. +image +image +image + +
+ +--- + +

🏓 탁구 서비스 🏓

+
+ + ### 🙋‍♂️ 출석을 통해 코인을 획득할 수 있습니다. Attendance @@ -318,4 +348,72 @@

+--- + +

📅 행사(Agenda) 서비스 📅

+
+ +### 🗓️ 현재 모집중/진행중/종료된 행사와 내가 참여중인 행사를 한눈에 볼 수 있습니다. +image +image + +### ℹ️ 대회 설명, 참여자, 공지사항과 포스터를 확인할 수 있습니다. +image + +image + + +### 🧑‍💻 유저의 상태와 권한에 따라 버튼이 활성화 됩니다. + +
[ 주최자 ]
+
+image +image + + +
+
+ +
[ 일반 유저(참여 전 / 참여 후) ]
+
+image +image + + +### 👥 참여자 목록을 코알리숑과 함께 보여줍니다. (개인/팀 참여) +image +image + +### 👥 팀을 만들고 참여할 수 있습니다. +image + +image +image + + +### 📢 공지사항을 한눈에 볼 수 있습니다. + +
공지사항이 등록될 경우 참여자의'Slack'으로 알림이 갑니다.
+
+image +image + + + +### 🛠️ 원하는 행사를 개최할 수 있습니다. +image + + +### ✏️ 대회 종료 후 순위를 직접 입력할 수 있습니다. +image + + +### 🎫 티켓을 발급하고 내역을 확인할 수 있습니다. +image +image + +### 👤 내 프로필과 다른 유저의 프로필을 검색하여 볼 수 있습니다. +image +image + From afed04be863917247e676337afe39350ba83356c Mon Sep 17 00:00:00 2001 From: Jihyun Lim <74870834+irenee-14@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:20:30 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Chore:=20team=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=ED=8F=BC=20=EB=82=B4=20=EA=B4=80=EB=A0=A8=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EC=84=A4=EB=AA=85=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/agenda/detail/team/create.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/agenda/detail/team/create.tsx b/pages/agenda/detail/team/create.tsx index 0e583acba..99e4a923d 100644 --- a/pages/agenda/detail/team/create.tsx +++ b/pages/agenda/detail/team/create.tsx @@ -29,7 +29,6 @@ const CreateTeam = () => {

팀 만들기

-

팀 인원 : 3명-8명까지 가능

Date: Mon, 23 Dec 2024 16:00:54 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Fix:=20github=20Actions=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main-build-test.yml | 2 +- .github/workflows/main-deploy.yml | 2 +- .github/workflows/test-deploy.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main-build-test.yml b/.github/workflows/main-build-test.yml index 5db0420fb..4c5830ad3 100644 --- a/.github/workflows/main-build-test.yml +++ b/.github/workflows/main-build-test.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 steps: - name: Git Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml index 4e5685cb6..2c2d2b09f 100644 --- a/.github/workflows/main-deploy.yml +++ b/.github/workflows/main-deploy.yml @@ -7,7 +7,7 @@ on: - deploy jobs: continuous-deployment: - runs-on: macos-12 + runs-on: macos-13 steps: - name: Git Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index f7b363a68..9a0906879 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -9,7 +9,7 @@ on: jobs: continuous-deployment: - runs-on: macos-12 + runs-on: macos-13 steps: - name: Git Checkout uses: actions/checkout@v2 From 10d047752f15753b534c121592f7e1f087817c5f Mon Sep 17 00:00:00 2001 From: Lee Jeong Ron <83465749+JeongRon@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:58:17 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Fix:=20github=20Ations=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main-deploy.yml | 6 +++--- .github/workflows/test-deploy.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml index 2c2d2b09f..746258b2e 100644 --- a/.github/workflows/main-deploy.yml +++ b/.github/workflows/main-deploy.yml @@ -10,10 +10,10 @@ jobs: runs-on: macos-13 steps: - name: Git Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js version 16.x - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 16.x @@ -30,7 +30,7 @@ jobs: npm install npm run build - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v3 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 9a0906879..e0814e98a 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -12,10 +12,10 @@ jobs: runs-on: macos-13 steps: - name: Git Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js version 16.x - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 16.x @@ -31,7 +31,7 @@ jobs: npm install npm run build - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v3 with: aws-access-key-id: ${{ secrets.AWS_DEV_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_DEV_SECRET_ACCESS_KEY }}