Skip to content

Commit

Permalink
Merge pull request #109 from HongikUnivFestival/develop
Browse files Browse the repository at this point in the history
핫픽스 2
  • Loading branch information
yongun2 authored Sep 7, 2023
2 parents 3f09e2c + ac9585d commit bd6d0c2
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 2 deletions.
Binary file added public/img/stage/d-day-wrist.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/stage/prev-wrist.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/booth/FoodTruckCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function FoodTruckCard({ data }) {
}

const CardWrapper = styled.div`
background: rgba(29, 29, 29, 0.6);
background: ${(props) => props.theme.colors.background};
backdrop-filter: blur(6px);
width: 100%;
height: ${(props) => (props.isAuth ? '24.6rem' : '15.6rem')};
Expand All @@ -55,7 +55,7 @@ const BoothText = styled.div`
const BoothName = styled.div`
margin-bottom: 0.8rem;
span {
color: ${(props) => props.theme.colors.white};
color: ${(props) => props.theme.colors.green};
${(props) => props.theme.fontStyles.head5}
}
`;
Expand Down
41 changes: 41 additions & 0 deletions src/pages/CentralStage.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import BlackBoothCard from '@/components/booth/BlackBoothCard';
import FoodTruckCard from '@/components/booth/FoodTruckCard';
import { DaySelector, TimeTable } from '@/components/stage';
import CelabLineUp from '@/components/stage/CelabLineUp';
import { pageState } from '@/libs/store';
Expand Down Expand Up @@ -99,6 +101,27 @@ function CentralStage() {
<MainSection>
<Title>중앙무대</Title>
<Map />
<Title>팔찌부스 안내</Title>
<PrevWrist />
<BlackBoothCard
variant="secondary"
data={{
number: 1,
boothName: '사전 배부 일시',
hosted: '2023년 09월 12일',
intro: '11:00 ~ 13:00 / 14:00 ~ 18:00',
}}
/>
<DDayWrist />
<BlackBoothCard
variant="secondary"
data={{
number: 2,
boothName: '현장 배부 일시',
hosted: '2023년 09월 13일 ~ 15일',
intro: '09:00 ~ 13:00 / 14:00 ~ 18:00',
}}
/>

<Title>라인업</Title>
{festivalDays.map((day) => (
Expand Down Expand Up @@ -187,6 +210,24 @@ const ScheduleWrapper = styled.div`
margin-top: 22rem;
`;

const PrevWrist = styled.div`
width: 33.5rem;
height: 20rem;
background-size: contain;
background-position: center;
background-repeat: no-repeat;
background-image: url('/img/stage/prev-wrist.jpg');
`;

const DDayWrist = styled.div`
width: 33.5rem;
height: 20rem;
background-size: contain;
background-position: center;
background-repeat: no-repeat;
background-image: url('/img/stage/d-day-wrist.jpg');
`;

const Title = styled.header`
width: 100%;
Expand Down
3 changes: 3 additions & 0 deletions src/pages/booth/FoodTruck.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ const FoodTruckPageWrapper = styled.div`
align-items: center;
padding: 0 2rem;
padding-top: 6rem;
background-image: url('/img/booth/profit/profit-background.png');
background-repeat: no-repeat;
background-size: cover;
`;

const FoodTruckPageTitle = styled.div`
Expand Down

0 comments on commit bd6d0c2

Please sign in to comment.