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
10 changes: 8 additions & 2 deletions .github/workflows/cinebox_fe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ jobs:

- name: Make .env file
run: |
touch ./.env
echo "${{ secrets.ENV }}" > ./.env
if [[ "${{ github.ref }}" == "refs/heads/develop" ]]; then
echo "${{ secrets.ENV_DEV }}" > .env
elif [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
echo "${{ secrets.ENV }}" > .env
fi
cat .env # 디버깅을 위해 출력
shell: bash

- name: Verify .env file
Expand All @@ -41,6 +45,8 @@ jobs:
- name: Build with npm
run: |
CI=false npm run build || { echo "Build failed!"; exit 1; }
env:
REACT_APP_NODE_ENV: ${{ github.ref == 'refs/heads/develop' && 'development' || 'production' }}

- name: Verify build output
run: du -sh ./build
Expand Down
1 change: 0 additions & 1 deletion src/components/booking/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const Calendar = ({ currentDate, changeMonth, calendarDays, handleDateSelect, se

const daysOfWeek = ['일', '월', '화', '수', '목', '금', '토'];


const formatDate = (date) => {
// 'YYYY-MM-DD' 형식으로 변환
const dateObj = (date instanceof Date) ? date : new Date(date);
Expand Down
4 changes: 2 additions & 2 deletions src/templates/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const Header = () => {
<Box className="header">
<Box className="top-header">
<Box>
{context.userId && <a href='/mypage' id="myPage">마이페이지</a>}
{context.userId && <a href='/mypage' id="myPage">마이페이지dev</a>}
{context.role == 'ADMIN' && <a href='/admin' id="moveAdmin">어드민 페이지</a>}
</Box>
<Box>
Expand All @@ -49,4 +49,4 @@ const Header = () => {
</>;
};

export default Header;
export default Header;