diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml new file mode 100644 index 0000000..4ffa5f1 --- /dev/null +++ b/.github/workflows/deploy-main.yml @@ -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 diff --git a/GEMINI.md b/GEMINI.md new file mode 100644 index 0000000..e69de29 diff --git a/README.md b/README.md index 992f5a6..2e5551d 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,11 @@ | `rename` | ๐Ÿ”„ ํŒŒ์ผ ๊ฒฝ๋กœ ๋ณ€๊ฒฝ ํ˜น์€ ํŒŒ์ผ ์ด๋ฆ„ ๋ณ€๊ฒฝ | ### ๐Ÿ“Œ Branch ์ปจ๋ฒค์…˜ - - feature/issue-์ด์Šˆ๋ฒˆํ˜ธ - feat -> feature๋กœ ์ž‘์„ฑ - ๋‚˜๋จธ์ง€๋Š” ์ปค๋ฐ‹ ์ปจ๋ฒค์…˜ ์ ์šฉ ex) style/issue-01 +- develop ๋ธŒ๋žœ์น˜์—์„œ ๋ธŒ๋žœ์น˜๋ฅผ ๋”ฐ์„œ ์ž‘์—… ํ›„ ์ถฉ๋ถ„ํžˆ ํ…Œ์ŠคํŠธ ํ•œ ๋’ค main๋ธŒ๋žœ์น˜๋กœ ๋ณ‘ํ•ฉํ•˜์—ฌ ์ถœ์‹œ ### ๐Ÿ“Œ ํด๋”๊ตฌ์กฐ diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..56907aa --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd ../ +mkdir output +cp -R ./FE/* ./output +cp -R ./output ./FE/ \ No newline at end of file diff --git a/src/assets/icon/sticker/baseball.svg b/src/assets/icon/sticker/baseball.svg index 8f05f55..f5cbb63 100644 --- a/src/assets/icon/sticker/baseball.svg +++ b/src/assets/icon/sticker/baseball.svg @@ -109,4 +109,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/cake.svg b/src/assets/icon/sticker/cake.svg index 860ba98..e8b68ce 100644 --- a/src/assets/icon/sticker/cake.svg +++ b/src/assets/icon/sticker/cake.svg @@ -16,4 +16,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/camera.svg b/src/assets/icon/sticker/camera.svg index 9c8be95..8554877 100644 --- a/src/assets/icon/sticker/camera.svg +++ b/src/assets/icon/sticker/camera.svg @@ -13,4 +13,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/coffee.svg b/src/assets/icon/sticker/coffee.svg index dcd4843..410b866 100644 --- a/src/assets/icon/sticker/coffee.svg +++ b/src/assets/icon/sticker/coffee.svg @@ -24,4 +24,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/display_board.svg b/src/assets/icon/sticker/display_board.svg index 217b008..ce60151 100644 --- a/src/assets/icon/sticker/display_board.svg +++ b/src/assets/icon/sticker/display_board.svg @@ -1,4 +1,5 @@ + diff --git a/src/assets/icon/sticker/giftbox.svg b/src/assets/icon/sticker/giftbox.svg index 6f003cf..65513d7 100644 --- a/src/assets/icon/sticker/giftbox.svg +++ b/src/assets/icon/sticker/giftbox.svg @@ -7,4 +7,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/heart.svg b/src/assets/icon/sticker/heart.svg index 492e865..73aa273 100644 --- a/src/assets/icon/sticker/heart.svg +++ b/src/assets/icon/sticker/heart.svg @@ -79,4 +79,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/light_stick.svg b/src/assets/icon/sticker/light_stick.svg index 6ca0ab9..58abcbb 100644 --- a/src/assets/icon/sticker/light_stick.svg +++ b/src/assets/icon/sticker/light_stick.svg @@ -14,4 +14,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/money.svg b/src/assets/icon/sticker/money.svg index 44fc23e..a6b0228 100644 --- a/src/assets/icon/sticker/money.svg +++ b/src/assets/icon/sticker/money.svg @@ -8,4 +8,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/musical_note.svg b/src/assets/icon/sticker/musical_note.svg index 1e187df..fc84d36 100644 --- a/src/assets/icon/sticker/musical_note.svg +++ b/src/assets/icon/sticker/musical_note.svg @@ -5,4 +5,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/shining.svg b/src/assets/icon/sticker/shining.svg index 26d2831..5dc8088 100644 --- a/src/assets/icon/sticker/shining.svg +++ b/src/assets/icon/sticker/shining.svg @@ -4,4 +4,4 @@ - + \ No newline at end of file diff --git a/src/assets/icon/sticker/ticket.svg b/src/assets/icon/sticker/ticket.svg index 289ae4b..7207dcb 100644 --- a/src/assets/icon/sticker/ticket.svg +++ b/src/assets/icon/sticker/ticket.svg @@ -13,4 +13,4 @@ - + \ No newline at end of file diff --git a/src/components/archive/ArchiveHeader.tsx b/src/components/archive/ArchiveHeader.tsx index 8351f81..7c115d5 100644 --- a/src/components/archive/ArchiveHeader.tsx +++ b/src/components/archive/ArchiveHeader.tsx @@ -150,4 +150,4 @@ const ArchiveHeader = ({ ); }; -export default ArchiveHeader; +export default ArchiveHeader; \ No newline at end of file diff --git a/src/components/calendar/Calendar.tsx b/src/components/calendar/Calendar.tsx index 03c0a05..172d70d 100644 --- a/src/components/calendar/Calendar.tsx +++ b/src/components/calendar/Calendar.tsx @@ -605,4 +605,4 @@ const Calendar = ({ ); }; -export default Calendar; +export default Calendar; \ No newline at end of file diff --git a/src/components/calendar/modal/Event.tsx b/src/components/calendar/modal/Event.tsx index 4c4696f..3a4a902 100644 --- a/src/components/calendar/modal/Event.tsx +++ b/src/components/calendar/modal/Event.tsx @@ -115,4 +115,4 @@ const Event = ({ onClose, startDate, editData, onSubmit }: EventProps) => { ); }; -export default Event; +export default Event; \ No newline at end of file diff --git a/src/components/calendar/modal/EventListModal.tsx b/src/components/calendar/modal/EventListModal.tsx index 5084dc0..af76473 100644 --- a/src/components/calendar/modal/EventListModal.tsx +++ b/src/components/calendar/modal/EventListModal.tsx @@ -219,4 +219,4 @@ const EventListModal = ({ ); }; -export default EventListModal; +export default EventListModal; \ No newline at end of file diff --git a/src/components/calendar/modal/EventModal.tsx b/src/components/calendar/modal/EventModal.tsx index a70048c..9ca2867 100644 --- a/src/components/calendar/modal/EventModal.tsx +++ b/src/components/calendar/modal/EventModal.tsx @@ -180,4 +180,4 @@ const EventModal = ({ ); }; -export default EventModal; +export default EventModal; \ No newline at end of file diff --git a/src/pages/Archive/ArchiveDetail.tsx b/src/pages/Archive/ArchiveDetail.tsx index 7d8c8b1..a595ab8 100644 --- a/src/pages/Archive/ArchiveDetail.tsx +++ b/src/pages/Archive/ArchiveDetail.tsx @@ -21,6 +21,7 @@ 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"; @@ -28,6 +29,7 @@ import { getMonthlyEvents, getMonthlyStickers } from "@/apis/queries/calendar/Ca const ArchiveDetail = () => { const navigate = useNavigate(); + const currentUser = useAuthStore((state) => state.user); const urlParams = useParams(); const archiveId = urlParams.archiveId; @@ -208,7 +210,7 @@ const ArchiveDetail = () => { />
{/* ๋•์งˆ ์ผ๊ธฐ */} - + {/* ๋•์งˆ ๊ฐค๋Ÿฌ๋ฆฌ */} { {/* ๋•์งˆ ๋ฆฌํฌ์ŠคํŠธ */} { ); }; -export default ArchiveDetail; +export default ArchiveDetail; \ No newline at end of file diff --git a/src/pages/Community/Community.tsx b/src/pages/Community/Community.tsx index 606155c..81153f7 100644 --- a/src/pages/Community/Community.tsx +++ b/src/pages/Community/Community.tsx @@ -178,4 +178,4 @@ const Community = () => { ); }; -export default Community; +export default Community; \ No newline at end of file diff --git a/src/pages/Feed/Feed.tsx b/src/pages/Feed/Feed.tsx index 920055f..414a32f 100644 --- a/src/pages/Feed/Feed.tsx +++ b/src/pages/Feed/Feed.tsx @@ -77,4 +77,4 @@ const Feed = () => { ); }; -export default Feed; +export default Feed; \ No newline at end of file diff --git a/src/pages/Feed/FeedDetail.tsx b/src/pages/Feed/FeedDetail.tsx index c74ad9a..336aa8f 100644 --- a/src/pages/Feed/FeedDetail.tsx +++ b/src/pages/Feed/FeedDetail.tsx @@ -152,4 +152,4 @@ const FeedDetail = () => { ); }; -export default FeedDetail; +export default FeedDetail; \ No newline at end of file diff --git a/vercel.json b/vercel.json new file mode 100644 index 0000000..1323cda --- /dev/null +++ b/vercel.json @@ -0,0 +1,8 @@ +{ + "rewrites": [ + { + "source": "/(.*)", + "destination": "/index.html" + } + ] +}