Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions .github/workflows/deploy-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: git push into another repo to deploy to vercel

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest
container: pandoc/latex
steps:
- name: Checkout source code
uses: actions/checkout@v3

- name: Install mustache
run: apk add ruby && gem install mustache

- name: Run Build Script
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.DEOKIVE_KEY }}
with:
source-directory: "output"
destination-github-username: ${{ secrets.DEOKIVE_USERNAME }}
destination-repository-name: ${{ secrets.DEOKIVE_REPOSITORY }}
user-email: ${{ secrets.DEOKIVE_EMAIL }}
commit-message: ${{ github.event.commits[0].message }}
target-branch: develop

- name: Test get variable exported by push-to-another-repository
run: echo $DESTINATION_CLONED_DIRECTORY
Empty file added GEMINI.md
Empty file.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
| `rename` | 🔄 파일 경로 변경 혹은 파일 이름 변경 |

### 📌 Branch 컨벤션

- feature/issue-이슈번호
- feat -> feature로 작성
- 나머지는 커밋 컨벤션 적용
ex) style/issue-01
- develop 브랜치에서 브랜치를 따서 작업 후 충분히 테스트 한 뒤 main브랜치로 병합하여 출시

### 📌 폴더구조

Expand Down
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 ./FE/* ./output
cp -R ./output ./FE/
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/baseball.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/cake.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/camera.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/coffee.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/icon/sticker/display_board.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/giftbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/heart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/light_stick.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/money.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/musical_note.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/shining.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icon/sticker/ticket.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/archive/ArchiveHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,4 @@ const ArchiveHeader = ({
);
};

export default ArchiveHeader;
export default ArchiveHeader;
2 changes: 1 addition & 1 deletion src/components/calendar/Calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -605,4 +605,4 @@ const Calendar = ({
);
};

export default Calendar;
export default Calendar;
2 changes: 1 addition & 1 deletion src/components/calendar/modal/Event.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ const Event = ({ onClose, startDate, editData, onSubmit }: EventProps) => {
);
};

export default Event;
export default Event;
2 changes: 1 addition & 1 deletion src/components/calendar/modal/EventListModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,4 +219,4 @@ const EventListModal = ({
);
};

export default EventListModal;
export default EventListModal;
2 changes: 1 addition & 1 deletion src/components/calendar/modal/EventModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,4 @@ const EventModal = ({
);
};

export default EventModal;
export default EventModal;
8 changes: 5 additions & 3 deletions src/pages/Archive/ArchiveDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ import {
} from "@/apis/mutations/archive/archive";
import { Visibility, type ArchiveResponse, type UpdateArchiveRequest } from "@/types/archive";
import { useFileUpload } from "@/hooks/useFileUpload";
import { useAuthStore } from "@/store/useAuthStore";
import { MediaRole } from "@/enums/mediaRole";
import { useRef, useState } from "react";
import ConfirmModal from "@/components/common/ConfirmModal";
import { getMonthlyEvents, getMonthlyStickers } from "@/apis/queries/calendar/Calendar";

const ArchiveDetail = () => {
const navigate = useNavigate();
const currentUser = useAuthStore((state) => state.user);

const urlParams = useParams();
const archiveId = urlParams.archiveId;
Expand Down Expand Up @@ -208,7 +210,7 @@ const ArchiveDetail = () => {
/>
<div className="flex flex-col items-start justify-between gap-[60px] my-[60px]">
{/* 덕질 일기 */}
<DiaryList archiveId={archiveId} limit={3} isOwner={false} />
<DiaryList archiveId={archiveId} limit={3} isOwner={archive?.createdBy === currentUser?.id} />
{/* 덕질 갤러리 */}
<ArchiveTitle
title="덕질 갤러리"
Expand Down Expand Up @@ -236,7 +238,7 @@ const ArchiveDetail = () => {
<TicketList
archiveId={archiveId}
limit={3}
isOwner={false}
isOwner={archive?.createdBy === currentUser?.id}
/>
{/* 덕질 리포스트 */}
<ArchiveTitle
Expand Down Expand Up @@ -289,4 +291,4 @@ const ArchiveDetail = () => {
);
};

export default ArchiveDetail;
export default ArchiveDetail;
2 changes: 1 addition & 1 deletion src/pages/Community/Community.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,4 @@ const Community = () => {
);
};

export default Community;
export default Community;
2 changes: 1 addition & 1 deletion src/pages/Feed/Feed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ const Feed = () => {
);
};

export default Feed;
export default Feed;
2 changes: 1 addition & 1 deletion src/pages/Feed/FeedDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ const FeedDetail = () => {
);
};

export default FeedDetail;
export default FeedDetail;
8 changes: 8 additions & 0 deletions vercel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"rewrites": [
{
"source": "/(.*)",
"destination": "/index.html"
}
]
}