Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Deploy] 2차 배포 #60

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
136efeb
feat: 챌린지 상세 페이지 생성
seokkkkkk Aug 9, 2024
c044323
feat: 토큰 재발급 및 로그아웃 기능 구현
ej070961 Aug 9, 2024
7dab024
feat: 후원하기 기능 구현
ej070961 Aug 9, 2024
7e2d7a8
feat: 챌린지 상세 페이지 UI 구현
seokkkkkk Aug 9, 2024
38f49c1
feat: 챌린지 상세 조회 API 연결
seokkkkkk Aug 9, 2024
ffc0923
feat: 챌린지 상세 UI 구현
seokkkkkk Aug 9, 2024
c23fca7
feat: 챌린지 상세 API 연결
seokkkkkk Aug 10, 2024
d546c0f
fix: 인증 내역 title 표현 방법 수정
seokkkkkk Aug 10, 2024
9ed3b94
add: 기본 프로필 추가
seokkkkkk Aug 10, 2024
31d3e2d
Merge pull request #48 from ej070961/feat/47
seokkkkkk Aug 10, 2024
004a021
Merge pull request #49 from ej070961/feat/36
seokkkkkk Aug 10, 2024
90337c6
feat: 챌린지 인증 컴포넌트 조건부 렌더링 추가
seokkkkkk Aug 10, 2024
0b07ef4
feat: 네브바 메뉴 z index 수정
seokkkkkk Aug 10, 2024
6f87461
feat: 챌린지 ID로 상세페이지 이동하도록 수정
seokkkkkk Aug 10, 2024
6c55608
feat: 우편번호 상태관리 수정
seokkkkkk Aug 10, 2024
0a115cf
fix: 우편번호 외부 누르면 닫히도록 수정
seokkkkkk Aug 10, 2024
75a05a5
feat: 관심지역 리스트 추가
seokkkkkk Aug 10, 2024
af1cc0a
Merge branch 'develop' into develop-ChallengeDetail
seokkkkkk Aug 10, 2024
8a41c32
Merge pull request #51 from seokkkkkk/develop-ChallengeDetail
seokkkkkk Aug 10, 2024
e7b8d9d
fix: 로그인 메뉴 충돌 해결
seokkkkkk Aug 10, 2024
f754758
Merge pull request #53 from seokkkkkk/develop
ej070961 Aug 10, 2024
09c8892
Merge branch 'develop' into develop-EditUserProfile
seokkkkkk Aug 10, 2024
1fd472a
Merge pull request #54 from seokkkkkk/develop-EditUserProfile
seokkkkkk Aug 10, 2024
5d502a6
feat: 후원상세 페이지 프로필 모달, 등록 시 뜨는 모달 구현
ej070961 Aug 10, 2024
c459941
Merge pull request #55 from ej070961/feat/52
ej070961 Aug 10, 2024
7a03325
feat: 내 페이지 후원 게시물 데모
seokkkkkk Aug 10, 2024
a95de2b
feat: NavBar fixed로 변경
seokkkkkk Aug 10, 2024
f8c619b
fix: 후원글 등록 주소값 받아오기 수정, 후원글 수정 코드 추가/주석처리
ej070961 Aug 10, 2024
e2dcb4f
Merge pull request #56 from ej070961/feat/35
ej070961 Aug 10, 2024
1619e1c
feat: 이미지 마진 수정
seokkkkkk Aug 10, 2024
dc164de
fix: 후원페이지 NoPostWrapper 디자인 수정
ej070961 Aug 10, 2024
f32a6e0
Merge pull request #57 from ej070961/feat/35
ej070961 Aug 10, 2024
44a72df
fix: 후원 제목 너무 길때 요약 처리
ej070961 Aug 10, 2024
28e94dd
Merge pull request #58 from ej070961/feat/35
ej070961 Aug 10, 2024
35ddd9f
fix: 디자인 수정
seokkkkkk Aug 10, 2024
749f6c1
Merge branch 'develop' into develop
seokkkkkk Aug 10, 2024
afeb10e
Merge pull request #59 from seokkkkkk/develop
seokkkkkk Aug 10, 2024
60b4f90
Create main.yml
seokkkkkk Aug 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: git push into another repo to deploy to vercel

on:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest
container: pandoc/latex
steps:
- uses: actions/checkout@v2
- name: Install mustache (to update the date)
run: apk add ruby && gem install mustache
- name: creates output
run: sh ./build.sh
- name: Pushes to another repository
id: push_directory
uses: cpina/github-action-push-to-another-repository@main
env:
API_TOKEN_GITHUB: ${{ secrets.AUTO_ACTIONS }}
with:
source-directory: "output"
destination-github-username: "seokkkkkk"
destination-repository-name: "Fledge-FE"
user-email: ${{ secrets.EMAIL }}
commit-message: ${{ github.event.commits[0].message }}
target-branch: main
- name: Test get variable exported by push-to-another-repository
run: echo $DESTINATION_CLONED_DIRECTORY
50 changes: 26 additions & 24 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:[email protected]&display=swap" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:[email protected]&display=swap"
rel="stylesheet"
/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -27,12 +30,12 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<title>Fledge</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All @@ -41,6 +44,5 @@

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
--></body>
</html>
36 changes: 36 additions & 0 deletions src/@types/challenge-category.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,39 @@ export const challengeType: Category[] = [
{ id: "CERTIFICATION", label: "자격증" },
{ id: "EXERCISE", label: "운동" },
];

export const getOrdinalText = (index: number) => {
const ordinals = [
"첫 번째",
"두 번째",
"세 번째",
"네 번째",
"다섯 번째",
"여섯 번째",
"일곱 번째",
"여덟 번째",
"아홉 번째",
"열 번째",
"열한 번째",
"열두 번째",
"열세 번째",
"열네 번째",
"열다섯 번째",
"열여섯 번째",
"열일곱 번째",
"열여덟 번째",
"열아홉 번째",
"스무 번째",
"스물한 번째",
"스물두 번째",
"스물세 번째",
"스물네 번째",
"스물다섯 번째",
"스물여섯 번째",
"스물일곱 번째",
"스물여덟 번째",
"스물아홉 번째",
"서른 번째",
];
return ordinals[index] || `${index + 1}번째`;
};
20 changes: 18 additions & 2 deletions src/@types/challenge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ export type ChallengerProps = {

export type BestChallengerProps = {
memberId: number;
memberName: string;
participationCount: number;
nickname: string;
totalCount: number;
successCount: number;
successRate: number;
topCategories: string[];
profileImageUrl: string;
};

export type ChallengeProps = {
Expand Down Expand Up @@ -55,3 +56,18 @@ export type ChallengeProps = {
last: boolean;
empty: boolean;
};

export type ChallengeDetailProps = {
categrories: string[];
despription: string;
endDate: string | null;
likeCount: number;
participantCount: number;
participating: boolean;
startDate: string | null;
successCount: number;
successRate: number;
supportContent: string | null;
title: string;
type: string;
};
Loading
Loading