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

1차 배포 코드 master 브랜치 merge #2

Merged
merged 99 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
245785a
Merge pull request #30 from ej070961/master
seokkkkkk Aug 7, 2024
d68b584
feat: 헤더 프로필, 로그아웃 링크
seokkkkkk Aug 7, 2024
0756ae4
feat: 닉네임 변경
seokkkkkk Aug 7, 2024
18ec5d5
feat: 네브바 로그인 상태 확인 방법 수정
seokkkkkk Aug 8, 2024
d3cfaa0
Merge pull request #33 from ej070961/master
seokkkkkk Aug 8, 2024
5c19f2c
Merge branch 'K-Hackathon-Fledge:develop' into develop
seokkkkkk Aug 8, 2024
b60a574
feat: 자청년 인증 모달 api 적용
seokkkkkk Aug 8, 2024
3a81f94
feat: 자청년 인증 상태 표시
seokkkkkk Aug 8, 2024
5d4ce91
feat: 후원글 상세정보 API 연결(#32)
ej070961 Aug 8, 2024
b468bc2
feat: 자청년 정보 수정 api
seokkkkkk Aug 8, 2024
5d7c09a
fix: 자청년 인증 버튼 수정
seokkkkkk Aug 8, 2024
dcdfea7
Merge pull request #34 from ej070961/api/sponsor-detail
seokkkkkk Aug 8, 2024
c0f3ef7
feat: 드롭다운 버튼 props, css 수정
seokkkkkk Aug 8, 2024
892e5b3
feat: 베스트 챌린저 조회 API 연결
seokkkkkk Aug 8, 2024
aef1966
feat: 챌린지 관련 api 메소드 작성
seokkkkkk Aug 8, 2024
b9cddb9
feat: 신규, 인기 챌린지 api 연결
seokkkkkk Aug 8, 2024
8a95510
Merge branch 'develop' into develop
ej070961 Aug 9, 2024
c407b91
Merge pull request #37 from seokkkkkk/develop
ej070961 Aug 9, 2024
bd91ca3
Merge pull request #39 from seokkkkkk/develop-Challenge
ej070961 Aug 9, 2024
5a32bc0
feat: 챌린지 카테고리 검색 추가
seokkkkkk Aug 9, 2024
d7cfa50
feat: 연계 챌린지 조회 api 연결
seokkkkkk Aug 9, 2024
b1aed7c
feat: 메인 챌린지 섹션 수정
seokkkkkk Aug 9, 2024
9cd4af3
feat: 제출 성공 모달 추가
seokkkkkk Aug 9, 2024
542fc2e
fix: 기본 상태 수정
seokkkkkk Aug 9, 2024
4bd0717
feat: 자청년 정보 페이지 컴포넌트 분리
seokkkkkk Aug 9, 2024
94ccced
feat: 좋아요 버튼 상호작용 추가
seokkkkkk Aug 9, 2024
0a0ef6e
Merge pull request #42 from seokkkkkk/develop
ej070961 Aug 9, 2024
5489e00
feat: 후원 게시글 삭제 기능 구현
ej070961 Aug 9, 2024
bd2d2bc
feat: 프로필 메뉴 생성
seokkkkkk Aug 9, 2024
136efeb
feat: 챌린지 상세 페이지 생성
seokkkkkk Aug 9, 2024
33452b2
Merge pull request #46 from ej070961/feat/35
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
31fd21a
Create build.sh
seokkkkkk Aug 10, 2024
58df25f
add: 파비콘 추가
seokkkkkk Aug 10, 2024
9cc609b
fix: api 경로수정
ej070961 Aug 10, 2024
4201226
Merge pull request #61 from ej070961/develop
ej070961 Aug 10, 2024
14e026e
Merge pull request #62 from seokkkkkk/develop
seokkkkkk Aug 10, 2024
2aadeaf
fix: 페이징 api 경로 수정
ej070961 Aug 10, 2024
2446e57
Merge pull request #63 from ej070961/develop
ej070961 Aug 10, 2024
2472189
fix: 프리사인드 axiosInstance 설정
ej070961 Aug 10, 2024
63ed0d4
Merge pull request #64 from ej070961/develop
ej070961 Aug 10, 2024
d02765c
fix: 후원 로그인 후 이용가능하게 수정
ej070961 Aug 10, 2024
4a68114
Merge pull request #65 from ej070961/develop
ej070961 Aug 10, 2024
7df67c9
fix: 후원 상세 프로필 모달 e.stopPropagation 추가
ej070961 Aug 10, 2024
ba74955
Merge pull request #66 from ej070961/develop
ej070961 Aug 10, 2024
8d655f9
feat: 챌린저 Default 컴포넌트 추가
seokkkkkk Aug 10, 2024
67424ac
fix: 후원하기 오류 수정
ej070961 Aug 10, 2024
169d7a7
Merge pull request #67 from ej070961/develop
ej070961 Aug 10, 2024
470097e
fix: 페이지네이션 디자인 수정
ej070961 Aug 10, 2024
3ce26bf
Merge pull request #68 from ej070961/develop
ej070961 Aug 10, 2024
6de8502
feat: 우편번호 수정
seokkkkkk Aug 10, 2024
319c071
Merge pull request #69 from seokkkkkk/develop
seokkkkkk Aug 10, 2024
af3c81c
fix: 참여한 챌린저 수 안받아오는 문제 수정
seokkkkkk Aug 10, 2024
e2a0354
Merge pull request #70 from seokkkkkk/develop
seokkkkkk Aug 10, 2024
24e5b9d
feat: 프로그래스 바 애니메이션 추가
seokkkkkk Aug 10, 2024
cfad725
fix: 주소 오류 수정
seokkkkkk Aug 10, 2024
d2bab44
fix: 자청년 여부 받아오는 방법 수정
seokkkkkk Aug 10, 2024
3e81944
fix: 챌린지 상세 프로그래스 바 수정
seokkkkkk Aug 10, 2024
e948457
Merge pull request #71 from seokkkkkk/develop
seokkkkkk Aug 10, 2024
c0b0715
fix: 마이페이지 안들어가지는 버그 수정
seokkkkkk Aug 11, 2024
e9e6c65
Merge pull request #72 from seokkkkkk/develop
seokkkkkk Aug 11, 2024
e6d723c
fix: 자청년 인증시 인증상태 바로 반영되게 수정
ej070961 Aug 11, 2024
1dfab54
fix: 후원글 등록 postalCode 수정
ej070961 Aug 11, 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
5 changes: 5 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
cd ../
mkdir output
cp -R ./Fledge-Front/* ./output
cp -R ./output ./Fledge-Front/
Binary file modified public/favicon.ico
Binary file not shown.
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>
46 changes: 46 additions & 0 deletions src/@types/challenge-category.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { Category } from "./sponsor-category";

export const challengeType: Category[] = [
{ id: "LIFE", label: "생활" },
{ id: "MIND_CONTROL", label: "마인드컨트롤" },
{ id: "SELF_DEVELOPMENT", label: "자기계발" },
{ id: "FINANCIAL_MANAGEMENT", label: "재정관리" },
{ id: "CERTIFICATION", label: "자격증" },
{ id: "EXERCISE", label: "운동" },
];

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

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

export type ChallengeProps = {
totalElements: number;
totalPages: number;
size: number;
content: [
{
title: string;
likeCount: number;
categories: string[];
type: string;
description: string;
successRate: number;
participationCount: number;
supportContent: string;
startDate: string;
endData: string;
}
];
number: number;
sort: {
empty: boolean;
sorted: boolean;
unsorted: boolean;
};
numberOfElements: number;
pageable: {
offset: {
empty: boolean;
sorted: boolean;
unsorted: boolean;
};
paged: boolean;
pageNumber: number;
pageSize: number;
unpaged: boolean;
};
first: boolean;
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