Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
b282bfb
[Docs] : 필요없는 파일 삭제
kimjunha1231 Feb 17, 2024
42f3c90
feat: footer 수정
dydals3440 Feb 17, 2024
bd26abb
로그인 펭지 비행기
cowboysj Feb 17, 2024
1cb9952
Fix : 메이트 멘트 수정
cowboysj Feb 17, 2024
e1f1fa1
Style : 캘린더, 맵 margin 수정
cowboysj Feb 17, 2024
2fc3221
Style : 캘린더, 맵 margin 수정
cowboysj Feb 17, 2024
734e637
Fix : 로그인 안 했을 때 알림 빨간색 수정
cowboysj Feb 17, 2024
bf5a387
Fix : 메이트 이슈 수정
cowboysj Feb 17, 2024
4d65b3e
Style : 지도로 보기 높이 조정
cowboysj Feb 17, 2024
36aed10
Style : 캘린더, 맵 스타일 변경
cowboysj Feb 17, 2024
572e659
Style : 캘린더, 지도 스타일 수정
cowboysj Feb 17, 2024
355e192
Style : 캘린더, 지도 스타일 수정
cowboysj Feb 17, 2024
e53844f
Fix : 노션페이지 연결
cowboysj Feb 17, 2024
a87340e
feat: package.json 변경
dydals3440 Feb 17, 2024
205e1d0
feat: 반응형 수정
dydals3440 Feb 17, 2024
8b1d7e2
Update main.yml
dydals3440 Feb 17, 2024
eda2f8d
Style: 하루일지 상세 페이지 스켈레톤 UI 적용
daindaind Feb 17, 2024
a967c62
Feat: 하루일지 리스트 페이지 오타 수정
daindaind Feb 17, 2024
04a7b0c
Feat: 하루일지 리스트 페이지 로딩처리
daindaind Feb 17, 2024
7906ce3
style: console.log 제거
dydals3440 Feb 17, 2024
e67346a
HOTFIX: 구글로그인 에러 종료
dydals3440 Feb 17, 2024
f5c1cb8
feat: 로그인 수정
dydals3440 Feb 17, 2024
e924dc3
fix: 구글 로그인 버그 해결
dydals3440 Feb 17, 2024
937087e
feat: 공개범위 설정 제거
dydals3440 Feb 17, 2024
d3af4e4
feat: RuleEdit 스타일 수정
dydals3440 Feb 17, 2024
fd58dbe
feat: MateRuleWrite 스타일 수정
dydals3440 Feb 17, 2024
a0a2062
feat: MateRuleCheck style 수정
dydals3440 Feb 17, 2024
e8c9fd1
feat: 수정
dydals3440 Feb 17, 2024
05fea4f
feat: 텍스트 수정
dydals3440 Feb 17, 2024
a2cc23d
feat: main.yml 변경
dydals3440 Feb 17, 2024
2a27125
feat: main.yml 변경
dydals3440 Feb 17, 2024
9cea90a
main.yml 수정
dydals3440 Feb 17, 2024
c342588
feat: MySignaturePage 로딩 수정
dydals3440 Feb 17, 2024
b266c81
feat: main.yml
dydals3440 Feb 17, 2024
708b9f0
feat: main.yml AWS S3 CI/CD 환경 구축
dydals3440 Feb 17, 2024
c34f1f3
feat: main.yml AWS S3 CI/CD 환경 구축
dydals3440 Feb 17, 2024
c139366
feat: main.yml AWS S3 CI/CD 환경 구축
dydals3440 Feb 17, 2024
1eb4396
feat: main.yml AWS S3 CI/CD 환경 구축
dydals3440 Feb 17, 2024
27a1a66
Style: 모든 텍스트 및 달력 스타일 black 수정
daindaind Feb 17, 2024
c2cc194
Style: 시그니처 로그인 확인, 홈 화면 프로필 배너 스켈레톤 UI 제거
daindaind Feb 17, 2024
bae681d
Feat: 메이트 탭 로그인 유무 확인
daindaind Feb 17, 2024
2f500d4
Feat: 캘린더 및 지도 로그인 유무 확인
daindaind Feb 17, 2024
916a7ef
Feat: 알림 로그인 유무 확인
daindaind Feb 17, 2024
902f6c9
Feat: 마이페이지 유저 정보 로그인 유무 확인
daindaind Feb 17, 2024
51b1772
feat: 야호 제거
dydals3440 Feb 17, 2024
d70c01c
feat: 로그인 삭제 / 카카오 / 구글 로그인 제거
dydals3440 Feb 17, 2024
2af94d7
fix: 기타 에러 수정
dydals3440 Feb 17, 2024
3aac6dc
bug: 시그니처 답글 처리, 시그니처 발행 한번만 요청
daindaind Feb 17, 2024
9afc341
bug: schedules 무한스크롤 오류 해결
daindaind Feb 18, 2024
ad8779b
bug: bottomDetailScrollPage 무한 스크롤 수정
daindaind Feb 18, 2024
26eb87e
[Docs] : 필요없는 파일 삭제
kimjunha1231 Feb 17, 2024
2894add
style: console.log 제거
dydals3440 Feb 17, 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
22 changes: 19 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,19 @@ jobs:
- name: Check Node v
run: node -v

- name: create env file
working-directory: ./
run: |
pwd
touch .env
echo "VITE_NODE_ENV=${{ secrets.VITE_NODE_ENV }}" >> .env
echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" >> .env
echo "VITE_GOOGLE_MAP_API=${{ secrets.VITE_GOOGLE_MAP_API }}" >> .env
echo "VITE_GOOGLE_AUTH_CLIENT_ID=${{ secrets.VITE_GOOGLE_AUTH_CLIENT_ID }}" >> .env
echo "VITE_KAKAO_REST_API_KEAY=${{ secrets.VITE_KAKAO_REST_API_KEAY }}" >> .env
echo "VITE_REDIRECT_URI=${{ secrets.VITE_REDIRECT_URI }}" >> .env
cat .env

- name: Install dependencies
run: yarn

Expand All @@ -24,10 +37,9 @@ jobs:
aws-region: ${{ secrets.AWS_REGION }}

- name: Generate build
run: yarn build
run: yarn run build

- name: Deploy
run: aws s3 cp --recursive --region ap-northeast-2 dist s3://hereyoubuckey
- name: Deploy to S3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -38,3 +50,7 @@ jobs:
VITE_KAKAO_REST_API_KEAY: ${{ secrets.VITE_KAKAO_REST_API_KEAY }}
VITE_REDIRECT_URI: ${{ secrets.VITE_REDIRECT_URI }}
AWS_REGION: ${{ secrets.AWS_REGION }}
run: aws s3 cp --recursive --region ap-northeast-2 dist s3://${{ secrets.AWS_BUCKET_NAME }}

- name: Invaildate CloudFront Cache
run: aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_DISTRIBUTION_ID }} --paths "/*"
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
"type": "module",
"scripts": {
"dev": "vite --host",
"build": "vite build",
"build": "vite build --mode production",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"start": "vite start -p 80"
"start": "vite start -p 80",
"deploy": "aws s3 sync dist s3://here---you --profile=dydals3440"
},
"dependencies": {
"@googlemaps/react-wrapper": "^1.1.35",
Expand Down
9 changes: 9 additions & 0 deletions public/images/airplane.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions public/images/background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 0 additions & 65 deletions src/apis/request/auth.js

This file was deleted.

10 changes: 0 additions & 10 deletions src/apis/request/home.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import { axiosWithToken } from '../api';
import { API_BASE, VERSION } from '@/constants/path';

// 월별 일정 불러오기 (확정 X)
const loadMonthlySchedule = (year, month) => {
const url = `/api/${VERSION}/${API_BASE.SCHEDULE}/monthly/${year}/${month}`;
const res = axiosWithToken.get(url);
return res;
};

// 월별 일정 불러오기 (무한스크롤)
const getSchedule = (date, pageParam, pageSize) => {
const url = `/api/${VERSION}/${API_BASE.MAP}/get-monthly-schedule/${date}?cursor=${pageParam}&pageSize=${pageSize}`;
Expand Down Expand Up @@ -46,7 +39,6 @@ const deleteJourney = journeyId => {

// 일정 작성하기
const createSchedule = (scheduleId, title, location, latitude, longitude) => {
console.log(latitude, longitude);
const url = `/api/${VERSION}/${API_BASE.SCHEDULE}/update/${scheduleId}`;
const res = axiosWithToken.put(url, {
title: title,
Expand All @@ -66,7 +58,6 @@ const deleteSchedule = scheduleId => {

// 세부 일정 추가하기
const addDetailSchedule = (scheduleId, content) => {
console.log(content);
const url = `/api/${VERSION}/${API_BASE.DETAIL_SCHEDULE}/create/${scheduleId}`;
const res = axiosWithToken.post(url, {
content: content,
Expand Down Expand Up @@ -135,7 +126,6 @@ const updateDiary = (diaryId, postData) => {
};

export {
loadMonthlySchedule,
saveJourney,
updateJourney,
deleteJourney,
Expand Down
13 changes: 2 additions & 11 deletions src/apis/request/map.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { axiosWithToken } from '../api';
import { API_BASE, API_URL, VERSION } from '@/constants/path';
import { API_BASE, VERSION } from '@/constants/path';

// 토큰이 필요 없는 경우 axios를 사용하면 됩니다.
// 월별 여정 불러오기
Expand All @@ -24,13 +24,4 @@ const getDiaryMap = ({ journeyId }) => {
return res;
};

// 세부 여정 확인하기 (지도)
const getDetailJourneyMap = journeyId => {
const url = `/api/${VERSION}/${API_BASE.MAP}/get-schedules/${journeyId}`;
const res = axiosWithToken.get(url);
return res;
};

// 토큰이 필요한 경우 axiosWithToken을 사용하면 됩니다.

export { getMonthlyJourney, getJourneyMap, getDiaryMap, getDetailJourneyMap };
export { getMonthlyJourney, getJourneyMap, getDiaryMap };
21 changes: 1 addition & 20 deletions src/apis/request/mate.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const postFollowMate = followId => {
// FOLLOW_MATE: `/api/${VERSION}/${API_BASE.MATE}/follow/:followId`,
// 백엔드 API : api/v1/mate/follow/:followId
const url = `${API_URL.FOLLOW_MATE}/${followId}`;
console.log(url);

return axiosWithToken.patch(url);
};

Expand Down Expand Up @@ -62,13 +62,6 @@ const getSearchNickname = (searchTerm, take, { pageParam }) => {
return axiosWithToken.get(url);
};

const getParticipateTeamMate = () => {
// GET_PARTICIPATE_TEAM_MATE: `/api/${VERSION}/${API_BASE.MATE}/rule/participants/:ruleId`,
// 백엔드 API : api/v1/mate/rule/participants/:ruleId
const url = `${API_URL.GET_PARTICIPATE_TEAM_MATE}`;
return axiosWithToken.get(url);
};

// 여행 규칙 확인하기 (게시글)
const getTeamMateRulePost = ruleId => {
// GET_TEAM_MATE_RULE: `/api/${VERSION}/${API_BASE.MATE}/rule/view/:ruleId`,
Expand All @@ -83,16 +76,6 @@ const getTeamMateRuleComment = (ruleId, take, { pageParam }) => {
return axiosWithToken.get(url);
};

const patchTeamMateRule = () => {
// UPDATE_TEAM_MATE_RULE: `/api/${VERSION}/${API_BASE.MATE}/rule/edit/:ruleId`,
// 백엔드 API : api/v1/mate/rule/edit/:ruleId
const url = `${API_URL.UPDATE_TEAM_MATE_RULE}`;
return axiosWithToken.patch(url, {
title: title,
contents: contents,
});
};

const deleteTeamMate = () => {
// DELETE_TEAM_MATE: `/api/${VERSION}/${API_BASE.MATE}/rule/editMate/:ruleId/:userId`,
// 백엔드 API : api/v1/mate/rule/editMate/:ruleId/:mateId
Expand Down Expand Up @@ -158,10 +141,8 @@ export {
postCreateMateRule,
getSearchInviteMate,
getSearchNickname,
getParticipateTeamMate,
getTeamMateRulePost,
getTeamMateRuleComment,
patchTeamMateRule,
getLocationMate,
deleteTeamMate,
postMateRuleComment,
Expand Down
11 changes: 0 additions & 11 deletions src/apis/request/preview.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/apis/request/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const getMyDiary = ({ pageParam }) => {
} else {
url = `${API_URL.GET_ALL_DIARY}?cursor=${pageParam}`;
}
console.log(url);

return axiosWithToken.get(url);
};

Expand Down
2 changes: 1 addition & 1 deletion src/apis/request/signature.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const postSignatureReComment = ({ signatureId, parentId, content }) => {
// 시그니처 댓글/답글 수정하기
const updateSignatureReComment = ({ signatureId, commentId, content }) => {
const url = `/api/v1/signature/${signatureId}/comment/${commentId}`;
console.log(url);

return axiosWithToken.patch(url, {
content: content,
});
Expand Down
11 changes: 0 additions & 11 deletions src/apis/request/travel.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/banner/Banner.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const BannerContainer = styled.div`
justify-content: center;
padding: 5%;
width: 100%;
height: 160px;
height: 130px;
background: rgba(27, 156, 133, 0.16);
`;

Expand Down
2 changes: 1 addition & 1 deletion src/components/bottomSheet/BottomDetailScrollPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const BottomDetailScrollPage = ({ startDate, endDate }) => {
if (!lastPage?.data?.data?.data?.meta?.hasNextData) {
return null;
} else {
return lastPage?.data?.data?.data?.meta?.cursor + 1;
return lastPage?.data?.data?.data?.meta?.cursor;
}
},
staleTime: 60 * 1000,
Expand Down
2 changes: 1 addition & 1 deletion src/components/bottomSheet/BottomDetailScrollPage.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const Button = styled.button`
${theme.ALIGN.ROW_CENTER};
background-color: ${theme.COLOR.MAIN.GREEN};
border: none;
width: 400px;
width: 90%;
height: 60px;
color: ${theme.COLOR.MAIN.WHITE};
border-radius: 30px;
Expand Down
6 changes: 3 additions & 3 deletions src/components/bottomSheet/BottomScrollPage.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ const Button = styled.button`
${theme.ALIGN.ROW_CENTER};
background-color: ${theme.COLOR.MAIN.GREEN};
border: none;
width: 200px;
height: 50px;
width: 90%;
height: 60px;
color: ${theme.COLOR.MAIN.WHITE};
border-radius: 20px;
border-radius: 30px;
margin: auto;
margin-top: 10px;
cursor: pointer;
Expand Down
Loading