Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] 미팅룸 QA #39

Merged
merged 7 commits into from
Jun 9, 2024
Merged

[fix] 미팅룸 QA #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05a20c0
fix: 예약하기 버튼 고정
jiohjung98 Jun 9, 2024
d8d1038
fix: 예약버튼 색상
jiohjung98 Jun 9, 2024
794a80f
fix: 긴급공지 텍스트 사이즈
jiohjung98 Jun 9, 2024
ae8779c
fix: overflow-y-auto
jiohjung98 Jun 9, 2024
361dc46
오피스 상세 페이지 본문 text-gray-900
jiohjung98 Jun 9, 2024
14330ee
fix: 공지사항 border
jiohjung98 Jun 9, 2024
4301fee
fix: 마커 아이콘 변경
jiohjung98 Jun 9, 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
42 changes: 21 additions & 21 deletions public/map/OfficeActive.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 21 additions & 21 deletions public/map/OfficeInActive.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 21 additions & 21 deletions src/components/map/BranchInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ const BranchInfo: React.FC = () => {
</header>
<div className="">
{urgentNotice && (
<div className="absolute top-[90px] left-1/2 px-4 py-2 transform -translate-x-1/2 w-[340px] bg-white bg-opacity-80 rounded shadow border border-neutral-200 z-[9999]">
<div className="absolute top-[90px] left-1/2 px-4 py-2 transform -translate-x-1/2 w-[350px] bg-white bg-opacity-80 rounded shadow border border-neutral-200 z-[9999]">
<div className="flex items-center mb-2">
<div className='p-1 bg-yellow-400 rounded-sm justify-center items-center gap-2.5 inline-flex'>
<span className="text-neutral-700 text-xs font-medium font-['Pretendard']">긴급</span>
</div>
<p className="text-black/opacity-20 text-base font-semibold font-['Pretendard'] ml-[7px] mt-[3px]">{urgentNotice.title}</p>
<p className="text-black/opacity-20 text-sm font-semibold font-['Pretendard'] ml-[7px] mt-[3px]">{urgentNotice.title}</p>
<button className='ml-auto my-auto' onClick={() => setUrgentNotice(null)}>X</button>
</div>
<p className="text-neutral-700 text-sm font-normal font-['Pretendard']">{truncateText(urgentNotice.content, 28)}</p>
Expand Down Expand Up @@ -197,7 +197,7 @@ const BranchInfo: React.FC = () => {
height={16}
/>
<div className="flex flex-col">
<p className="text-sm text-gray-600 ml-[8px] mb-[5px]">{address}</p>
<p className="text-sm text-gray-900 ml-[8px] mb-[5px]">{address}</p>
<div className="flex ml-[8px] space-x-[4px] items-center">
{stationToBranch &&
stationToBranch.split(',').map((line) => {
Expand All @@ -216,7 +216,7 @@ const BranchInfo: React.FC = () => {
</div>
);
})}
<p className="text-sm text-gray-600 ml-[8px]">{roadFromStation}</p>
<p className="text-sm text-gray-900 ml-[8px]">{roadFromStation}</p>
</div>
</div>
</div>
Expand All @@ -228,7 +228,7 @@ const BranchInfo: React.FC = () => {
width={12}
height={16}
/>
<p className="text-sm text-gray-600 ml-[8px]">{branchPhoneNumber}</p>
<p className="text-sm text-gray-900 ml-[8px]">{branchPhoneNumber}</p>
</div>
<div className="flex py-[10px]">
<Image
Expand All @@ -238,7 +238,7 @@ const BranchInfo: React.FC = () => {
width={12}
height={16}
/>
<p className="text-sm text-gray-600 ml-[8px]">
<p className="text-sm text-gray-900 ml-[8px]">
출차 전 2층 데스크에서 1시간 무료 적용,
<br />
이후 10분당 800원 비용 발생
Expand Down Expand Up @@ -266,7 +266,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">라운지</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">라운지</p>
</div>
<div className="flex flex-col items-center">
<Image
Expand All @@ -276,7 +276,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">리차징룸</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">리차징룸</p>
</div>
<div className="flex flex-col items-center">
<Image
Expand All @@ -286,7 +286,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">무인택배</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">무인택배</p>
</div>
<div className="flex flex-col items-center">
<Image
Expand All @@ -296,7 +296,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">폰부스</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">폰부스</p>
</div>
<div className="flex flex-col items-center">
<Image
Expand All @@ -306,7 +306,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">복합기</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">복합기</p>
</div>
<div className="flex flex-col items-center">
<Image
Expand All @@ -316,7 +316,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">스낵바</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">스낵바</p>
</div>
<div className="flex flex-col items-center">
<Image
Expand All @@ -326,7 +326,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">사무용품</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">사무용품</p>
</div>
<div className="flex flex-col items-center">
<Image
Expand All @@ -336,7 +336,7 @@ const BranchInfo: React.FC = () => {
height={16}
className="w-[40px] h-[40px] my-auto"
/>
<p className="mt-2 text-center text-black/opacity-20 text-sm font-medium font-['Pretendard'] leading-[21px]">무제한 커피</p>
<p className="mt-2 text-center text-gray-900 text-sm font-medium font-['Pretendard'] leading-[21px]">무제한 커피</p>
</div>
</div>
</div>
Expand All @@ -345,13 +345,13 @@ const BranchInfo: React.FC = () => {
<div className="text-black/opacity-20 text-lg font-extrabold">공지사항</div>
</div>
<BranchOffice branchName={branchName} setUrgentNotice={setUrgentNotice} />
<footer className="w-full text-center py-[30px]">
<button
className="w-[90%] h-12 bg-indigo-700 rounded-lg border border-indigo-700 text-center text-stone-50 text-[15px] font-semibold"
onClick={handleGoToReservation}>
예약하기
</button>
</footer>
<footer className="fixed bottom-0 w-full text-center pb-[30px] bg-white no-box-shadow">
<button
className="reserveBtn w-[90%] h-12 rounded-lg border border-indigo-700 text-center text-stone-50 text-[15px] font-semibold"
onClick={handleGoToReservation}>
예약하기
</button>
</footer>
</article>
<style jsx global>{`
.swiper-pagination-bullet {
Expand Down
Loading
Loading